Fix destruction logic in presence of delegates and add error handling.

- Destroy interpreter before delegate by providing __del__ - Make sure we do not double destroy the delegate in py Delegate. - Allow reporting errors that propagate to a ValueError on delegate construct. PiperOrigin-RevId: 255995852
2019-07-01 11:27:11 -07:00 · 2019-07-01 11:27:11 -07:00 · f408c2744d
commit f408c2744d
parent f043da3605
4 changed files with 344 additions and 266 deletions
--- a/tensorflow/lite/python/interpreter.py
+++ b/tensorflow/lite/python/interpreter.py
@ -18,6 +18,7 @@ from __future__ import division
 from __future__ import print_function

 import ctypes
+import platform
 import sys
 import numpy as np

@ -52,11 +53,13 @@ class Delegate(object):
  """Python wrapper class to manage TfLiteDelegate objects.

  The shared library is expected to have two functions:
-    TfLiteDelegate* tflite_plugin_create_delegate(char**, char**, size_t)
+    TfLiteDelegate* tflite_plugin_create_delegate(
+        char**, char**, size_t, void (*report_error)(const char *))
    void tflite_plugin_destroy_delegate(TfLiteDelegate*)

  The first one creates a delegate object. It may return NULL to indicate an
-  error. The second one destroys delegate object and must be called for every
+  error (with a suitable error message reported by calling report_error()).
+  The second one destroys delegate object and must be called for every
  created delegate object. Passing NULL as argument value is allowed, i.e.

    tflite_plugin_destroy_delegate(tflite_plugin_create_delegate(...))
@ -73,7 +76,16 @@ class Delegate(object):
        keys and values in the dictionary should be serializable. Consult the
        documentation of the specific delegate for required and legal options.
        (default None)
+    Raises:
+      RuntimeError: This is raised if the Python implementation is not CPython.
    """
+
+    # TODO(b/136468453): Remove need for __del__ ordering needs of CPython
+    # by using explicit closes(). See implementation of Interpreter __del__.
+    if platform.python_implementation() != 'CPython':
+      raise RuntimeError('Delegates are currently only supported into CPython'
+                         'due to missing immediate reference counting.')
+
    self._library = ctypes.pydll.LoadLibrary(library)
    self._library.tflite_plugin_create_delegate.argtypes = [
        ctypes.POINTER(ctypes.c_char_p),
@ -89,13 +101,29 @@ class Delegate(object):
      options_keys[idx] = str(key)
      options_values[idx] = str(value)

+    class ErrorMessageCapture(object):
+
+      def __init__(self):
+        self.message = ''
+
+      def report(self, x):
+        self.message += x
+
+    capture = ErrorMessageCapture()
+    error_capturer_cb = ctypes.CFUNCTYPE(None, ctypes.c_char_p)(capture.report)
    # Do not make a copy of _delegate_ptr. It is freed by Delegate's finalizer.
    self._delegate_ptr = self._library.tflite_plugin_create_delegate(
-        options_keys, options_values, len(options))
+        options_keys, options_values, len(options), error_capturer_cb)
+    if self._delegate_ptr is None:
+      raise ValueError(capture.message)

  def __del__(self):
-    self._library.tflite_plugin_destroy_delegate.argtypes = [ctypes.c_void_p]
-    self._library.tflite_plugin_destroy_delegate(self._delegate_ptr)
+    # __del__ can be called multiple times, so if the delegate is destroyed.
+    # don't try to destroy it twice.
+    if self._library is not None:
+      self._library.tflite_plugin_destroy_delegate.argtypes = [ctypes.c_void_p]
+      self._library.tflite_plugin_destroy_delegate(self._delegate_ptr)
+      self._library = None

  def _get_native_delegate_pointer(self):
    """Returns the native TfLiteDelegate pointer.
@ -126,9 +154,11 @@ def load_delegate(library, options=None):
  Raises:
    ValueError: Delegate failed to load.
  """
-  delegate = Delegate(library, options)
-  if not delegate._get_native_delegate_pointer():  # pylint: disable=protected-access
-    raise ValueError('Failed to load delegate from {}'.format(library))
+  try:
+    delegate = Delegate(library, options)
+  except ValueError as e:
+    raise ValueError('Failed to load delegate from {}\n{}'.format(
+        library, str(e)))
  return delegate


@ -193,6 +223,15 @@ class Interpreter(object):
        self._interpreter.ModifyGraphWithDelegate(
            delegate._get_native_delegate_pointer())  # pylint: disable=protected-access

+  def __del__(self):
+    # Must make sure the interpreter is destroyed before things that
+    # are used by it like the delegates. NOTE this only works on CPython
+    # probably.
+    # TODO(b/136468453): Remove need for __del__ ordering needs of CPython
+    # by using explicit closes(). See implementation of Interpreter __del__.
+    self._interpreter = None
+    self._delegates = None
+
  def allocate_tensors(self):
    self._ensure_safe()
    return self._interpreter.AllocateTensors()
--- a/tensorflow/lite/python/interpreter_test.py
+++ b/tensorflow/lite/python/interpreter_test.py
@ -289,6 +289,35 @@ class InterpreterDelegateTest(test_util.TensorFlowTestCase):
    self.assertEqual(lib.get_num_delegates_destroyed(), 1)
    self.assertEqual(lib.get_num_delegates_invoked(), 2)

+  def testDestructionOrder(self):
+    """Make sure internal _interpreter object is destroyed before delegate."""
+    # Track which order destructions were doned in
+    destructions = []
+    def register_destruction(x):
+      destructions.append(x)
+      return 0
+    # Make a wrapper for the callback so we can send this to ctypes
+    delegate = interpreter_wrapper.load_delegate(self._delegate_file)
+    prototype = ctypes.CFUNCTYPE(ctypes.c_int, (ctypes.c_char_p))
+    destroy_callback = prototype(register_destruction)
+    delegate._library.set_destroy_callback(destroy_callback)
+    # Make an interpreter with the delegate
+    interpreter = interpreter_wrapper.Interpreter(
+        model_path=resource_loader.get_path_to_datafile(
+            'testdata/permute_float.tflite'), experimental_delegates=[delegate])
+
+    class InterpreterDestroyCallback(object):
+
+      def __del__(self):
+        register_destruction('interpreter')
+
+    interpreter._interpreter.stuff = InterpreterDestroyCallback()
+    # Destroy both delegate and interpreter
+    del delegate
+    del interpreter
+    # check the interpreter was destroyed before the delegate
+    self.assertEqual(destructions, ['interpreter', 'test_delegate'])
+
  def testOptions(self):
    delegate_a = interpreter_wrapper.load_delegate(self._delegate_file)
    lib = delegate_a._library
@ -319,7 +348,8 @@ class InterpreterDelegateTest(test_util.TensorFlowTestCase):
    self.assertEqual(lib.get_options_counter(), 2)

  def testFail(self):
-    with self.assertRaisesRegexp(ValueError, 'Failed to load delegate from .*'):
+    with self.assertRaisesRegexp(
+        ValueError, 'Failed to load delegate from .*\nFail argument sent.'):
      interpreter_wrapper.load_delegate(
          self._delegate_file, options={'fail': 'fail'})

--- a/tensorflow/lite/python/testdata/test_delegate.cc
+++ b/tensorflow/lite/python/testdata/test_delegate.cc
@ -26,13 +26,16 @@ int num_delegates_created = 0;
 int num_delegates_destroyed = 0;
 int num_delegates_invoked = 0;
 int options_counter = 0;
+int (*destruction_callback)(const char* s) = nullptr;
+typedef void (*ErrorHandler)(const char*);

 }  // namespace

 extern "C" {
 TfLiteDelegate* tflite_plugin_create_delegate(char** options_keys,
                                              char** options_values,
-                                              size_t num_options) {
+                                              size_t num_options,
+                                              ErrorHandler error_handler) {
  num_delegates_created++;

  for (int idx = 0; idx < num_options; idx++) {
@ -42,6 +45,7 @@ TfLiteDelegate* tflite_plugin_create_delegate(char** options_keys,
        options_counter += int_value;
      }
    } else if (std::strcmp("fail", options_keys[idx]) == 0) {
+      if (error_handler) error_handler("Fail argument sent.");
      return nullptr;
    }
  }
@ -55,9 +59,14 @@ TfLiteDelegate* tflite_plugin_create_delegate(char** options_keys,
  return ptr;
 }

+void set_destroy_callback(int (*callback)(const char* s)) {
+  destruction_callback = callback;
+}
+
 void tflite_plugin_destroy_delegate(TfLiteDelegate* delegate) {
  num_delegates_destroyed++;
  delete delegate;
+  if (destruction_callback) destruction_callback("test_delegate");
 }

 void initialize_counters() {
--- a/tensorflow/opensource_only.files
+++ b/tensorflow/opensource_only.files
@ -1,282 +1,282 @@
-tensorflow/contrib/tpu/profiler/pip_package/BUILD
-tensorflow/contrib/tpu/profiler/pip_package/setup.py
-tensorflow/contrib/tpu/profiler/pip_package/README
-tensorflow/contrib/tpu/profiler/pip_package/build_pip_package.sh
-tensorflow/contrib/tpu/profiler/pip_package/cloud_tpu_profiler/main.py
-tensorflow/contrib/tpu/profiler/pip_package/cloud_tpu_profiler/__init__.py
-tensorflow/contrib/mpi/BUILD
-tensorflow/stream_executor/build_defs.bzl
-tensorflow/python/autograph/core/config.py
-tensorflow/tools/ci_build/remote/BUILD
-tensorflow/tools/pip_package/README
-tensorflow/tools/pip_package/MANIFEST.in
-tensorflow/tools/pip_package/simple_console.py
-tensorflow/tools/pip_package/build_pip_package.sh
-tensorflow/tools/pip_package/check_load_py_test.py
-tensorflow/tools/pip_package/pip_smoke_test.py
-tensorflow/tools/pip_package/simple_console_for_windows.py
-tensorflow/tools/pip_package/setup.py
-tensorflow/tools/pip_package/BUILD
-tensorflow/tools/lib_package/concat_licenses.sh
-tensorflow/tools/lib_package/libtensorflow_test.c
-tensorflow/tools/lib_package/LibTensorFlowTest.java
-tensorflow/tools/lib_package/BUILD
-tensorflow/tools/lib_package/libtensorflow_test.sh
-tensorflow/tools/lib_package/README.md
-tensorflow/tools/lib_package/libtensorflow_java_test.sh
-tensorflow/tools/def_file_filter/def_file_filter_configure.bzl
-tensorflow/tools/def_file_filter/BUILD
-tensorflow/tools/def_file_filter/BUILD.tpl
-tensorflow/tools/def_file_filter/def_file_filter.py.tpl
-tensorflow/third_party/mkl/MKL_LICENSE
-tensorflow/third_party/mkl/LICENSE
-tensorflow/third_party/mkl/BUILD
-tensorflow/third_party/mkl/mkl.BUILD
-tensorflow/third_party/mkl/build_defs.bzl
-tensorflow/third_party/backports_weakref.BUILD
-tensorflow/third_party/toolchains/clang6/BUILD
-tensorflow/third_party/toolchains/clang6/README.md
-tensorflow/third_party/toolchains/clang6/repo.bzl
-tensorflow/third_party/toolchains/clang6/CROSSTOOL.tpl
-tensorflow/third_party/toolchains/clang6/clang.BUILD
-tensorflow/third_party/toolchains/preconfig/centos6/cuda10.1-cudnn7/cuda/build_defs.bzl
-tensorflow/third_party/toolchains/preconfig/centos6/cuda10.1-cudnn7/cuda/BUILD
-tensorflow/third_party/toolchains/preconfig/centos6/gcc7-nvcc-cuda10.1/BUILD
-tensorflow/third_party/toolchains/preconfig/centos6/gcc7-nvcc-cuda10.1/cc_toolchain_config.bzl
-tensorflow/third_party/toolchains/preconfig/centos6/py/BUILD
-tensorflow/third_party/toolchains/preconfig/centos6/cuda10.0-cudnn7/cuda/BUILD
-tensorflow/third_party/toolchains/preconfig/centos6/cuda10.0-cudnn7/cuda/build_defs.bzl
-tensorflow/third_party/toolchains/preconfig/centos6/gcc7-nvcc-cuda10.0/BUILD
-tensorflow/third_party/toolchains/preconfig/centos6/gcc7-nvcc-cuda10.0/cc_toolchain_config.bzl
-tensorflow/third_party/toolchains/preconfig/centos6/tensorrt5/build_defs.bzl
-tensorflow/third_party/toolchains/preconfig/centos6/tensorrt5/BUILD
-tensorflow/third_party/toolchains/preconfig/centos6/gcc7/cc_toolchain_config.bzl
-tensorflow/third_party/toolchains/preconfig/centos6/gcc7/dummy_toolchain.bzl
-tensorflow/third_party/toolchains/preconfig/centos6/gcc7/BUILD
-tensorflow/third_party/toolchains/preconfig/centos6/py3/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/tensorrt5/build_defs.bzl
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/tensorrt5/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/clang/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/clang/cc_toolchain_config.bzl
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/clang/dummy_toolchain.bzl
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/cc_toolchain_config.bzl
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/rocm/rocm/build_defs.bzl
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/rocm/rocm/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/cuda10.0-cudnn7/cuda/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/cuda10.0-cudnn7/cuda/build_defs.bzl
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/py3/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/gcc5-rocm/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/gcc5-rocm/cc_toolchain_config.bzl
-tensorflow/third_party/toolchains/preconfig/ubuntu16.04/py3_opt/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu14.04/tensorrt5/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu14.04/tensorrt5/build_defs.bzl
-tensorflow/third_party/toolchains/preconfig/ubuntu14.04/py3/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu14.04/cuda10.0-cudnn7/cuda/build_defs.bzl
-tensorflow/third_party/toolchains/preconfig/ubuntu14.04/cuda10.0-cudnn7/cuda/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda10.0/BUILD
-tensorflow/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda10.0/cc_toolchain_config.bzl
-tensorflow/third_party/toolchains/preconfig/generate/workspace.bzl
-tensorflow/third_party/toolchains/preconfig/generate/containers.bzl
-tensorflow/third_party/toolchains/preconfig/generate/generate.bzl
-tensorflow/third_party/toolchains/preconfig/generate/archives.bzl
-tensorflow/third_party/toolchains/preconfig/generate/BUILD
-tensorflow/third_party/toolchains/preconfig/win_1803/bazel_025/BUILD
-tensorflow/third_party/toolchains/preconfig/win_1803/py36/BUILD
-tensorflow/third_party/toolchains/preconfig/win_1803/BUILD
+tensorflow/third_party/systemlibs/nsync.BUILD
+tensorflow/third_party/systemlibs/absl_py.absl.flags.BUILD
+tensorflow/third_party/systemlibs/google_cloud_cpp.google.cloud.bigtable.BUILD
+tensorflow/third_party/systemlibs/build_defs.bzl.tpl
+tensorflow/third_party/systemlibs/curl.BUILD
+tensorflow/third_party/systemlibs/cython.BUILD
+tensorflow/third_party/systemlibs/astor.BUILD
+tensorflow/third_party/systemlibs/jsoncpp.BUILD
+tensorflow/third_party/systemlibs/png.BUILD
+tensorflow/third_party/systemlibs/pcre.BUILD
+tensorflow/third_party/systemlibs/grpc.BUILD
+tensorflow/third_party/systemlibs/protobuf.BUILD
+tensorflow/third_party/systemlibs/double_conversion.BUILD
+tensorflow/third_party/systemlibs/six.BUILD
+tensorflow/third_party/systemlibs/zlib.BUILD
+tensorflow/third_party/systemlibs/lmdb.BUILD
+tensorflow/third_party/systemlibs/sqlite.BUILD
+tensorflow/third_party/systemlibs/gast.BUILD
+tensorflow/third_party/systemlibs/absl_py.BUILD
+tensorflow/third_party/systemlibs/boringssl.BUILD
+tensorflow/third_party/systemlibs/BUILD.tpl
+tensorflow/third_party/systemlibs/BUILD
+tensorflow/third_party/systemlibs/termcolor.BUILD
+tensorflow/third_party/systemlibs/gif.BUILD
+tensorflow/third_party/systemlibs/protobuf.bzl
+tensorflow/third_party/systemlibs/snappy.BUILD
+tensorflow/third_party/systemlibs/googleapis.BUILD
+tensorflow/third_party/systemlibs/opt_einsum.BUILD
+tensorflow/third_party/systemlibs/google_cloud_cpp.BUILD
+tensorflow/third_party/systemlibs/re2.BUILD
+tensorflow/third_party/systemlibs/swig.BUILD
+tensorflow/third_party/systemlibs/syslibs_configure.bzl
+tensorflow/third_party/systemlibs/absl_py.absl.testing.BUILD
+tensorflow/third_party/pprof.BUILD
+tensorflow/third_party/toolchains/remote/execution.bzl.tpl
+tensorflow/third_party/toolchains/remote/BUILD.tpl
+tensorflow/third_party/toolchains/remote/BUILD
+tensorflow/third_party/toolchains/remote/configure.bzl
+tensorflow/third_party/toolchains/cpus/py3/BUILD
+tensorflow/third_party/toolchains/cpus/py/BUILD
 tensorflow/third_party/toolchains/cpus/arm/arm_compiler_configure.bzl
 tensorflow/third_party/toolchains/cpus/arm/CROSSTOOL.tpl
 tensorflow/third_party/toolchains/cpus/arm/BUILD
-tensorflow/third_party/toolchains/cpus/py3/BUILD
-tensorflow/third_party/toolchains/cpus/py/BUILD
-tensorflow/third_party/toolchains/remote/configure.bzl
-tensorflow/third_party/toolchains/remote/BUILD.tpl
-tensorflow/third_party/toolchains/remote/BUILD
-tensorflow/third_party/toolchains/remote/execution.bzl.tpl
 tensorflow/third_party/toolchains/BUILD
-tensorflow/third_party/gpus/BUILD
-tensorflow/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_rocm.tpl
-tensorflow/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/rocm/rocm/build_defs.bzl
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/rocm/rocm/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/py3/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/clang/cc_toolchain_config.bzl
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/clang/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/clang/dummy_toolchain.bzl
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/gcc5-rocm/cc_toolchain_config.bzl
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/gcc5-rocm/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/py3_opt/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/cc_toolchain_config.bzl
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/cuda10.0-cudnn7/cuda/build_defs.bzl
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/cuda10.0-cudnn7/cuda/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/tensorrt5/build_defs.bzl
+tensorflow/third_party/toolchains/preconfig/ubuntu16.04/tensorrt5/BUILD
+tensorflow/third_party/toolchains/preconfig/win_1803/bazel_025/BUILD
+tensorflow/third_party/toolchains/preconfig/win_1803/BUILD
+tensorflow/third_party/toolchains/preconfig/win_1803/py36/BUILD
+tensorflow/third_party/toolchains/preconfig/generate/containers.bzl
+tensorflow/third_party/toolchains/preconfig/generate/workspace.bzl
+tensorflow/third_party/toolchains/preconfig/generate/archives.bzl
+tensorflow/third_party/toolchains/preconfig/generate/generate.bzl
+tensorflow/third_party/toolchains/preconfig/generate/BUILD
+tensorflow/third_party/toolchains/preconfig/centos6/py3/BUILD
+tensorflow/third_party/toolchains/preconfig/centos6/gcc7-nvcc-cuda10.1/cc_toolchain_config.bzl
+tensorflow/third_party/toolchains/preconfig/centos6/gcc7-nvcc-cuda10.1/BUILD
+tensorflow/third_party/toolchains/preconfig/centos6/py/BUILD
+tensorflow/third_party/toolchains/preconfig/centos6/gcc7/cc_toolchain_config.bzl
+tensorflow/third_party/toolchains/preconfig/centos6/gcc7/BUILD
+tensorflow/third_party/toolchains/preconfig/centos6/gcc7/dummy_toolchain.bzl
+tensorflow/third_party/toolchains/preconfig/centos6/gcc7-nvcc-cuda10.0/cc_toolchain_config.bzl
+tensorflow/third_party/toolchains/preconfig/centos6/gcc7-nvcc-cuda10.0/BUILD
+tensorflow/third_party/toolchains/preconfig/centos6/cuda10.0-cudnn7/cuda/build_defs.bzl
+tensorflow/third_party/toolchains/preconfig/centos6/cuda10.0-cudnn7/cuda/BUILD
+tensorflow/third_party/toolchains/preconfig/centos6/tensorrt5/build_defs.bzl
+tensorflow/third_party/toolchains/preconfig/centos6/tensorrt5/BUILD
+tensorflow/third_party/toolchains/preconfig/centos6/cuda10.1-cudnn7/cuda/build_defs.bzl
+tensorflow/third_party/toolchains/preconfig/centos6/cuda10.1-cudnn7/cuda/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu14.04/py3/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda10.0/cc_toolchain_config.bzl
+tensorflow/third_party/toolchains/preconfig/ubuntu14.04/gcc-nvcc-cuda10.0/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu14.04/cuda10.0-cudnn7/cuda/build_defs.bzl
+tensorflow/third_party/toolchains/preconfig/ubuntu14.04/cuda10.0-cudnn7/cuda/BUILD
+tensorflow/third_party/toolchains/preconfig/ubuntu14.04/tensorrt5/build_defs.bzl
+tensorflow/third_party/toolchains/preconfig/ubuntu14.04/tensorrt5/BUILD
+tensorflow/third_party/toolchains/clang6/repo.bzl
+tensorflow/third_party/toolchains/clang6/CROSSTOOL.tpl
+tensorflow/third_party/toolchains/clang6/BUILD
+tensorflow/third_party/toolchains/clang6/clang.BUILD
+tensorflow/third_party/toolchains/clang6/README.md
+tensorflow/third_party/farmhash.BUILD
+tensorflow/third_party/git/BUILD.tpl
+tensorflow/third_party/git/git_configure.bzl
+tensorflow/third_party/git/BUILD
+tensorflow/third_party/cub.BUILD
+tensorflow/third_party/gpus/cuda_configure.bzl
+tensorflow/third_party/gpus/rocm/build_defs.bzl.tpl
+tensorflow/third_party/gpus/rocm/BUILD.tpl
+tensorflow/third_party/gpus/rocm/BUILD
+tensorflow/third_party/gpus/rocm/rocm_config.h.tpl
+tensorflow/third_party/gpus/rocm_configure.bzl
+tensorflow/third_party/gpus/find_cuda_config.py
 tensorflow/third_party/gpus/crosstool/LICENSE
 tensorflow/third_party/gpus/crosstool/windows/msvc_wrapper_for_nvcc.py.tpl
+tensorflow/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
+tensorflow/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_rocm.tpl
 tensorflow/third_party/gpus/crosstool/BUILD.tpl
 tensorflow/third_party/gpus/crosstool/BUILD
+tensorflow/third_party/gpus/cuda/build_defs.bzl.tpl
 tensorflow/third_party/gpus/cuda/LICENSE
-tensorflow/third_party/gpus/cuda/BUILD.tpl
 tensorflow/third_party/gpus/cuda/BUILD.windows.tpl
 tensorflow/third_party/gpus/cuda/cuda_config.h.tpl
+tensorflow/third_party/gpus/cuda/BUILD.tpl
 tensorflow/third_party/gpus/cuda/BUILD
-tensorflow/third_party/gpus/cuda/build_defs.bzl.tpl
-tensorflow/third_party/gpus/rocm/rocm_config.h.tpl
-tensorflow/third_party/gpus/rocm/BUILD
-tensorflow/third_party/gpus/rocm/BUILD.tpl
-tensorflow/third_party/gpus/rocm/build_defs.bzl.tpl
-tensorflow/third_party/gpus/cuda_configure.bzl
-tensorflow/third_party/gpus/find_cuda_config.py
-tensorflow/third_party/gpus/rocm_configure.bzl
-tensorflow/third_party/snappy.BUILD
-tensorflow/third_party/cython.BUILD
-tensorflow/third_party/farmhash.BUILD
-tensorflow/third_party/eigen3/Eigen/Cholesky
-tensorflow/third_party/eigen3/Eigen/QR
-tensorflow/third_party/eigen3/Eigen/LU
-tensorflow/third_party/eigen3/Eigen/Core
-tensorflow/third_party/eigen3/Eigen/SVD
-tensorflow/third_party/eigen3/Eigen/Eigenvalues
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/Tensor
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/PacketMathAVX512.h
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/TypeCastingAVX512.h
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/PacketMathAVX2.h
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatMatProduct.h
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/FixedPointTypes.h
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatVecProduct.h
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatMatProductNEON.h
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/TypeCastingAVX2.h
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatMatProductAVX2.h
-tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/ThreadPool
-tensorflow/third_party/eigen3/unsupported/Eigen/SpecialFunctions
-tensorflow/third_party/eigen3/unsupported/Eigen/MatrixFunctions
-tensorflow/third_party/eigen3/gpu_packet_math.patch
-tensorflow/third_party/eigen3/LICENSE
-tensorflow/third_party/eigen3/BUILD
-tensorflow/third_party/systemlibs/build_defs.bzl.tpl
-tensorflow/third_party/systemlibs/absl_py.BUILD
-tensorflow/third_party/systemlibs/curl.BUILD
-tensorflow/third_party/systemlibs/termcolor.BUILD
-tensorflow/third_party/systemlibs/absl_py.absl.flags.BUILD
-tensorflow/third_party/systemlibs/grpc.BUILD
-tensorflow/third_party/systemlibs/swig.BUILD
-tensorflow/third_party/systemlibs/protobuf.bzl
-tensorflow/third_party/systemlibs/protobuf.BUILD
-tensorflow/third_party/systemlibs/BUILD
-tensorflow/third_party/systemlibs/google_cloud_cpp.BUILD
-tensorflow/third_party/systemlibs/astor.BUILD
-tensorflow/third_party/systemlibs/six.BUILD
-tensorflow/third_party/systemlibs/opt_einsum.BUILD
-tensorflow/third_party/systemlibs/absl_py.absl.testing.BUILD
-tensorflow/third_party/systemlibs/boringssl.BUILD
-tensorflow/third_party/systemlibs/nsync.BUILD
-tensorflow/third_party/systemlibs/google_cloud_cpp.google.cloud.bigtable.BUILD
-tensorflow/third_party/systemlibs/gif.BUILD
-tensorflow/third_party/systemlibs/pcre.BUILD
-tensorflow/third_party/systemlibs/BUILD.tpl
-tensorflow/third_party/systemlibs/snappy.BUILD
-tensorflow/third_party/systemlibs/gast.BUILD
-tensorflow/third_party/systemlibs/cython.BUILD
-tensorflow/third_party/systemlibs/double_conversion.BUILD
-tensorflow/third_party/systemlibs/zlib.BUILD
-tensorflow/third_party/systemlibs/jsoncpp.BUILD
-tensorflow/third_party/systemlibs/re2.BUILD
-tensorflow/third_party/systemlibs/lmdb.BUILD
-tensorflow/third_party/systemlibs/googleapis.BUILD
-tensorflow/third_party/systemlibs/png.BUILD
-tensorflow/third_party/systemlibs/syslibs_configure.bzl
-tensorflow/third_party/systemlibs/sqlite.BUILD
-tensorflow/third_party/python_runtime/BUILD
-tensorflow/third_party/sycl/crosstool/BUILD
-tensorflow/third_party/ngraph/LICENSE
-tensorflow/third_party/ngraph/tbb.BUILD
-tensorflow/third_party/ngraph/BUILD
-tensorflow/third_party/ngraph/ngraph.BUILD
-tensorflow/third_party/ngraph/build_defs.bzl
-tensorflow/third_party/ngraph/NGRAPH_LICENSE
-tensorflow/third_party/ngraph/ngraph_tf.BUILD
-tensorflow/third_party/ngraph/nlohmann_json.BUILD
-tensorflow/third_party/clang_toolchain/download_clang.bzl
-tensorflow/third_party/clang_toolchain/BUILD
-tensorflow/third_party/clang_toolchain/cc_configure_clang.bzl
+tensorflow/third_party/gpus/BUILD
+tensorflow/third_party/common.bzl
+tensorflow/third_party/mlir/tblgen.bzl
+tensorflow/third_party/mlir/bindings/python/BUILD
 tensorflow/third_party/mlir/BUILD
 tensorflow/third_party/mlir/mlir_configure.bzl
-tensorflow/third_party/mlir/bindings/python/BUILD
 tensorflow/third_party/mlir/test/BUILD
-tensorflow/third_party/mlir/tblgen.bzl
-tensorflow/third_party/gast.BUILD
-tensorflow/third_party/llvm/BUILD
-tensorflow/third_party/llvm/expand_cmake_vars.py
-tensorflow/third_party/llvm/llvm.autogenerated.BUILD
-tensorflow/third_party/llvm/llvm.bzl
-tensorflow/third_party/icu/udata.patch
-tensorflow/third_party/fft2d/fft2d.h
-tensorflow/third_party/fft2d/BUILD
-tensorflow/third_party/fft2d/fft.h
-tensorflow/third_party/fft2d/LICENSE
-tensorflow/third_party/fft2d/fft2d.BUILD
-tensorflow/third_party/nccl/archive.BUILD
-tensorflow/third_party/nccl/LICENSE
-tensorflow/third_party/nccl/system.BUILD.tpl
-tensorflow/third_party/nccl/nccl_configure.bzl
-tensorflow/third_party/nccl/build_defs.bzl.tpl
-tensorflow/third_party/nccl/archive.patch
-tensorflow/third_party/nccl/BUILD
-tensorflow/third_party/boringssl/BUILD
-tensorflow/third_party/mpi/.gitignore
-tensorflow/third_party/mpi/BUILD
-tensorflow/third_party/tensorrt/LICENSE
-tensorflow/third_party/tensorrt/BUILD
-tensorflow/third_party/tensorrt/build_defs.bzl.tpl
-tensorflow/third_party/tensorrt/BUILD.tpl
-tensorflow/third_party/tensorrt/tensorrt_configure.bzl
-tensorflow/third_party/tensorrt/tensorrt/include/tensorrt_config.h.tpl
-tensorflow/third_party/kafka/config.patch
-tensorflow/third_party/kafka/BUILD
-tensorflow/third_party/android/BUILD
-tensorflow/third_party/android/android.bzl.tpl
-tensorflow/third_party/android/android_configure.bzl
-tensorflow/third_party/android/android_configure.BUILD.tpl
-tensorflow/third_party/tflite_smartreply.BUILD
+tensorflow/third_party/tflite_mobilenet_quant.BUILD
+tensorflow/third_party/linenoise.BUILD
+tensorflow/third_party/curl.BUILD
 tensorflow/third_party/mkl_dnn/LICENSE
 tensorflow/third_party/mkl_dnn/mkldnn.BUILD
-tensorflow/third_party/pcre.BUILD
-tensorflow/third_party/pybind11.BUILD
-tensorflow/third_party/opt_einsum.BUILD
-tensorflow/third_party/linenoise.BUILD
-tensorflow/third_party/sqlite.BUILD
-tensorflow/third_party/common.bzl
-tensorflow/third_party/com_google_absl.BUILD
-tensorflow/third_party/pprof.BUILD
-tensorflow/third_party/BUILD
-tensorflow/third_party/tflite_mobilenet_quant.BUILD
-tensorflow/third_party/wrapt.BUILD
-tensorflow/third_party/lmdb.BUILD
-tensorflow/third_party/git/BUILD.tpl
-tensorflow/third_party/git/BUILD
-tensorflow/third_party/git/git_configure.bzl
-tensorflow/third_party/protobuf/BUILD
-tensorflow/third_party/enum34.BUILD
-tensorflow/third_party/tflite_mobilenet.BUILD
-tensorflow/third_party/py/BUILD
-tensorflow/third_party/py/BUILD.tpl
-tensorflow/third_party/py/numpy/BUILD
-tensorflow/third_party/py/python_configure.bzl
-tensorflow/third_party/termcolor.BUILD
-tensorflow/third_party/png_fix_rpi.patch
-tensorflow/third_party/swig.BUILD
-tensorflow/third_party/astor.BUILD
+tensorflow/third_party/fft2d/LICENSE
+tensorflow/third_party/fft2d/fft2d.BUILD
+tensorflow/third_party/fft2d/fft2d.h
+tensorflow/third_party/fft2d/fft.h
+tensorflow/third_party/fft2d/BUILD
+tensorflow/third_party/ngraph/LICENSE
+tensorflow/third_party/ngraph/build_defs.bzl
+tensorflow/third_party/ngraph/tbb.BUILD
+tensorflow/third_party/ngraph/ngraph.BUILD
+tensorflow/third_party/ngraph/nlohmann_json.BUILD
+tensorflow/third_party/ngraph/BUILD
+tensorflow/third_party/ngraph/ngraph_tf.BUILD
+tensorflow/third_party/ngraph/NGRAPH_LICENSE
 tensorflow/third_party/grpc/BUILD
-tensorflow/third_party/curl.BUILD
-tensorflow/third_party/arm_neon_2_x86_sse.BUILD
+tensorflow/third_party/cython.BUILD
+tensorflow/third_party/icu/udata.patch
+tensorflow/third_party/astor.BUILD
+tensorflow/third_party/jsoncpp.BUILD
+tensorflow/third_party/sycl/crosstool/BUILD
+tensorflow/third_party/llvm/llvm.autogenerated.BUILD
+tensorflow/third_party/llvm/expand_cmake_vars.py
+tensorflow/third_party/llvm/llvm.bzl
+tensorflow/third_party/llvm/BUILD
 tensorflow/third_party/png.BUILD
-tensorflow/third_party/googleapis.BUILD
-tensorflow/third_party/mpi_collectives/BUILD
-tensorflow/third_party/nanopb.BUILD
-tensorflow/third_party/gif.BUILD
+tensorflow/third_party/arm_neon_2_x86_sse.BUILD
+tensorflow/third_party/codegen.BUILD
+tensorflow/third_party/enum34.BUILD
+tensorflow/third_party/kafka/config.patch
+tensorflow/third_party/kafka/BUILD
+tensorflow/third_party/pcre.BUILD
+tensorflow/third_party/mpi/BUILD
+tensorflow/third_party/mpi/.gitignore
+tensorflow/third_party/clang_toolchain/BUILD
+tensorflow/third_party/clang_toolchain/download_clang.bzl
+tensorflow/third_party/clang_toolchain/cc_configure_clang.bzl
+tensorflow/third_party/tflite_ovic_testdata.BUILD
+tensorflow/third_party/repo.bzl
+tensorflow/third_party/png_fix_rpi.patch
+tensorflow/third_party/py/python_configure.bzl
+tensorflow/third_party/py/BUILD.tpl
+tensorflow/third_party/py/BUILD
+tensorflow/third_party/py/numpy/BUILD
 tensorflow/third_party/double_conversion.BUILD
 tensorflow/third_party/six.BUILD
-tensorflow/third_party/tflite_mobilenet_float.BUILD
-tensorflow/third_party/repo.bzl
-tensorflow/third_party/codegen.BUILD
-tensorflow/third_party/cub.BUILD
-tensorflow/third_party/jsoncpp.BUILD
-tensorflow/third_party/tflite_ovic_testdata.BUILD
-tensorflow/third_party/__init__.py
-tensorflow/third_party/libxsmm.BUILD
 tensorflow/third_party/zlib.BUILD
+tensorflow/third_party/lmdb.BUILD
+tensorflow/third_party/nanopb.BUILD
+tensorflow/third_party/pybind11.BUILD
+tensorflow/third_party/android/android.bzl.tpl
+tensorflow/third_party/android/BUILD
+tensorflow/third_party/android/android_configure.BUILD.tpl
+tensorflow/third_party/android/android_configure.bzl
+tensorflow/third_party/tflite_mobilenet_float.BUILD
+tensorflow/third_party/sqlite.BUILD
+tensorflow/third_party/tensorrt/build_defs.bzl.tpl
+tensorflow/third_party/tensorrt/LICENSE
+tensorflow/third_party/tensorrt/tensorrt_configure.bzl
+tensorflow/third_party/tensorrt/tensorrt/include/tensorrt_config.h.tpl
+tensorflow/third_party/tensorrt/BUILD.tpl
+tensorflow/third_party/tensorrt/BUILD
+tensorflow/third_party/gast.BUILD
+tensorflow/third_party/mpi_collectives/BUILD
+tensorflow/third_party/libxsmm.BUILD
 tensorflow/third_party/eigen.BUILD
+tensorflow/third_party/com_google_absl.BUILD
+tensorflow/third_party/eigen3/LICENSE
+tensorflow/third_party/eigen3/gpu_packet_math.patch
+tensorflow/third_party/eigen3/BUILD
+tensorflow/third_party/eigen3/unsupported/Eigen/MatrixFunctions
+tensorflow/third_party/eigen3/unsupported/Eigen/SpecialFunctions
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/Tensor
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/PacketMathAVX512.h
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatMatProduct.h
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatMatProductAVX2.h
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/TypeCastingAVX512.h
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/PacketMathAVX2.h
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/TypeCastingAVX2.h
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatMatProductNEON.h
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/FixedPointTypes.h
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/src/FixedPoint/MatVecProduct.h
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/FixedPoint
+tensorflow/third_party/eigen3/unsupported/Eigen/CXX11/ThreadPool
+tensorflow/third_party/eigen3/Eigen/QR
+tensorflow/third_party/eigen3/Eigen/SVD
+tensorflow/third_party/eigen3/Eigen/LU
+tensorflow/third_party/eigen3/Eigen/Cholesky
+tensorflow/third_party/eigen3/Eigen/Eigenvalues
+tensorflow/third_party/eigen3/Eigen/Core
+tensorflow/third_party/BUILD
+tensorflow/third_party/termcolor.BUILD
+tensorflow/third_party/gif.BUILD
+tensorflow/third_party/tflite_mobilenet.BUILD
+tensorflow/third_party/__init__.py
+tensorflow/third_party/mkl/LICENSE
+tensorflow/third_party/mkl/build_defs.bzl
+tensorflow/third_party/mkl/mkl.BUILD
+tensorflow/third_party/mkl/MKL_LICENSE
+tensorflow/third_party/mkl/BUILD
+tensorflow/third_party/nccl/build_defs.bzl.tpl
+tensorflow/third_party/nccl/LICENSE
+tensorflow/third_party/nccl/archive.patch
+tensorflow/third_party/nccl/nccl_configure.bzl
+tensorflow/third_party/nccl/archive.BUILD
+tensorflow/third_party/nccl/BUILD
+tensorflow/third_party/nccl/system.BUILD.tpl
+tensorflow/third_party/snappy.BUILD
+tensorflow/third_party/python_runtime/BUILD
+tensorflow/third_party/googleapis.BUILD
+tensorflow/third_party/opt_einsum.BUILD
+tensorflow/third_party/wrapt.BUILD
+tensorflow/third_party/boringssl/BUILD
+tensorflow/third_party/protobuf/BUILD
+tensorflow/third_party/backports_weakref.BUILD
+tensorflow/third_party/tflite_smartreply.BUILD
+tensorflow/third_party/swig.BUILD
+tensorflow/compat_template.__init__.py
+tensorflow/tools/lib_package/libtensorflow_test.sh
+tensorflow/tools/lib_package/libtensorflow_java_test.sh
+tensorflow/tools/lib_package/libtensorflow_test.c
+tensorflow/tools/lib_package/concat_licenses.sh
+tensorflow/tools/lib_package/LibTensorFlowTest.java
+tensorflow/tools/lib_package/BUILD
+tensorflow/tools/lib_package/README.md
+tensorflow/tools/pip_package/check_load_py_test.py
+tensorflow/tools/pip_package/simple_console.py
+tensorflow/tools/pip_package/pip_smoke_test.py
+tensorflow/tools/pip_package/BUILD
+tensorflow/tools/pip_package/simple_console_for_windows.py
+tensorflow/tools/pip_package/build_pip_package.sh
+tensorflow/tools/pip_package/README
+tensorflow/tools/pip_package/setup.py
+tensorflow/tools/pip_package/MANIFEST.in
+tensorflow/tools/ci_build/remote/BUILD
+tensorflow/tools/def_file_filter/def_file_filter.py.tpl
+tensorflow/tools/def_file_filter/BUILD.tpl
+tensorflow/tools/def_file_filter/BUILD
+tensorflow/tools/def_file_filter/def_file_filter_configure.bzl
+tensorflow/api_template.__init__.py
+tensorflow/contrib/tpu/profiler/pip_package/BUILD
+tensorflow/contrib/tpu/profiler/pip_package/cloud_tpu_profiler/__init__.py
+tensorflow/contrib/tpu/profiler/pip_package/cloud_tpu_profiler/main.py
+tensorflow/contrib/tpu/profiler/pip_package/build_pip_package.sh
+tensorflow/contrib/tpu/profiler/pip_package/README
+tensorflow/contrib/tpu/profiler/pip_package/setup.py
+tensorflow/contrib/mpi/BUILD
+tensorflow/python/autograph/core/config.py
+tensorflow/virtual_root_template_v2.__init__.py
+tensorflow/__init__.py
+tensorflow/stream_executor/build_defs.bzl
 tensorflow/api_template_v1.__init__.py
 tensorflow/compat_template_v1.__init__.py
-tensorflow/compat_template.__init__.py
-tensorflow/api_template.__init__.py
-tensorflow/__init__.py
-tensorflow/virtual_root_template_v2.__init__.py
 tensorflow/virtual_root_template_v1.__init__.py