Remove tensorboard/lib/python.

Change: 150712190

14 files changed, 56 insertions, 96 deletions

diff --git a/tensorflow/BUILD b/tensorflow/BUILD
index f8fe394938..56d9c598ff 100644
--- a/tensorflow/BUILD
+++ b/tensorflow/BUILD
@@ -261,7 +261,6 @@ filegroup(
         "//tensorflow/tensorboard/components/vz_sorting:all_files",
         "//tensorflow/tensorboard/components/vz_sorting/test:all_files",
         "//tensorflow/tensorboard/lib:all_files",
-        "//tensorflow/tensorboard/lib/python:all_files",
         "//tensorflow/tensorboard/scripts:all_files",
         "//tensorflow/tools/common:all_files",
         "//tensorflow/tools/compatibility:all_files",
diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake
index 93479f0919..dc838f3426 100644
--- a/tensorflow/contrib/cmake/tf_python.cmake
+++ b/tensorflow/contrib/cmake/tf_python.cmake
@@ -209,7 +209,6 @@ add_python_module("tensorflow/python/util/protobuf")
 add_python_module("tensorflow/tensorboard")
 add_python_module("tensorflow/tensorboard/backend")
 add_python_module("tensorflow/tensorboard/backend/event_processing")
-add_python_module("tensorflow/tensorboard/lib/python")
 add_python_module("tensorflow/tensorboard/plugins")
 add_python_module("tensorflow/tensorboard/plugins/debugger")
 add_python_module("tensorflow/tensorboard/plugins/projector")
@@ -522,7 +521,7 @@ function(GENERATE_PYTHON_OP_LIB tf_python_op_lib_name)
     else()
       set(require_shape_fn 1)
     endif()
-    
+
     # Create a C++ executable that links in the appropriate op
     # registrations and generates Python wrapper code based on the
     # registered ops.
@@ -737,7 +736,7 @@ add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
 add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy ${tensorflow_source_dir}/tensorflow/contrib/learn/python/learn/datasets/data/text_train.csv
                                    ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/learn/python/learn/datasets/data/)
-					   
+
 if(${tensorflow_ENABLE_GPU})
   add_custom_command(TARGET tf_python_build_pip_package POST_BUILD
     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/tf_python/setup.py bdist_wheel --project_name tensorflow_gpu
diff --git a/tensorflow/tensorboard/backend/BUILD b/tensorflow/tensorboard/backend/BUILD
index 8e8f437271..779f8c9e5c 100644
--- a/tensorflow/tensorboard/backend/BUILD
+++ b/tensorflow/tensorboard/backend/BUILD
@@ -10,16 +10,61 @@ exports_files(["LICENSE"])
 load("//tensorflow:tensorflow.bzl", "py_test")
 
 py_library(
+    name = "http_util",
+    srcs = ["http_util.py"],
+    srcs_version = "PY2AND3",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":json_util",
+        "//tensorflow/python:util",
+        "@org_pocoo_werkzeug//:werkzeug",
+        "@six_archive//:six",
+    ],
+)
+
+py_test(
+    name = "http_util_test",
+    size = "small",
+    srcs = ["http_util_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":http_util",
+        "//tensorflow/python:client_testlib",
+        "@org_pocoo_werkzeug//:werkzeug",
+        "@six_archive//:six",
+    ],
+)
+
+py_library(
+    name = "json_util",
+    srcs = ["json_util.py"],
+    srcs_version = "PY2AND3",
+    visibility = ["//visibility:public"],
+    deps = ["//tensorflow/python:util"],
+)
+
+py_test(
+    name = "json_util_test",
+    size = "small",
+    srcs = ["json_util_test.py"],
+    srcs_version = "PY2AND3",
+    deps = [
+        ":json_util",
+        "//tensorflow/python:platform_test",
+    ],
+)
+
+py_library(
     name = "application",
     srcs = ["application.py"],
     data = ["//tensorflow/tensorboard:frontend"],
     srcs_version = "PY2AND3",
     deps = [
+        ":http_util",
         ":process_graph",
         "//tensorflow/python:platform",
         "//tensorflow/tensorboard/backend/event_processing:event_accumulator",
         "//tensorflow/tensorboard/backend/event_processing:event_multiplexer",
-        "//tensorflow/tensorboard/lib/python:http_util",
         "//tensorflow/tensorboard/plugins/debugger:debugger_plugin",
         "//tensorflow/tensorboard/plugins/projector:projector_plugin",
         "@org_pocoo_werkzeug//:werkzeug",
diff --git a/tensorflow/tensorboard/backend/application.py b/tensorflow/tensorboard/backend/application.py
index 2dc044f098..76c2e099c4 100644
--- a/tensorflow/tensorboard/backend/application.py
+++ b/tensorflow/tensorboard/backend/application.py
@@ -39,10 +39,10 @@ from werkzeug import wrappers
 
 from tensorflow.python.platform import resource_loader
 from tensorflow.python.platform import tf_logging as logging
+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.lib.python import http_util
 from tensorflow.tensorboard.plugins.debugger import debugger_plugin
 from tensorflow.tensorboard.plugins.projector import projector_plugin
 
diff --git a/tensorflow/tensorboard/lib/python/http_util.py b/tensorflow/tensorboard/backend/http_util.py
index 7110178bbc..1c62dd7865 100644
--- a/tensorflow/tensorboard/lib/python/http_util.py
+++ b/tensorflow/tensorboard/backend/http_util.py
@@ -30,7 +30,7 @@ import six
 from werkzeug import wrappers
 
 from tensorflow.python.util import compat
-from tensorflow.tensorboard.lib.python import json_util
+from tensorflow.tensorboard.backend import json_util
 
 
 _EXTRACT_MIMETYPE_PATTERN = re.compile(r'^[^;\s]*')
diff --git a/tensorflow/tensorboard/lib/python/http_util_test.py b/tensorflow/tensorboard/backend/http_util_test.py
index a2a7a1b3d2..67bbe749ea 100644
--- a/tensorflow/tensorboard/lib/python/http_util_test.py
+++ b/tensorflow/tensorboard/backend/http_util_test.py
@@ -26,7 +26,7 @@ import six
 from werkzeug import test as wtest
 from werkzeug import wrappers
 from tensorflow.python.platform import test
-from tensorflow.tensorboard.lib.python import http_util
+from tensorflow.tensorboard.backend import http_util
 
 
 class RespondTest(test.TestCase):
diff --git a/tensorflow/tensorboard/lib/python/json_util.py b/tensorflow/tensorboard/backend/json_util.py
index f837852fdf..f837852fdf 100644
--- a/tensorflow/tensorboard/lib/python/json_util.py
+++ b/tensorflow/tensorboard/backend/json_util.py
diff --git a/tensorflow/tensorboard/lib/python/json_util_test.py b/tensorflow/tensorboard/backend/json_util_test.py
index 26cb9fb677..4a1d061153 100644
--- a/tensorflow/tensorboard/lib/python/json_util_test.py
+++ b/tensorflow/tensorboard/backend/json_util_test.py
@@ -18,7 +18,7 @@ from __future__ import division
 from __future__ import print_function
 
 from tensorflow.python.platform import googletest
-from tensorflow.tensorboard.lib.python import json_util
+from tensorflow.tensorboard.backend import json_util
 
 _INFINITY = float('inf')
 
diff --git a/tensorflow/tensorboard/lib/python/BUILD b/tensorflow/tensorboard/lib/python/BUILD
deleted file mode 100644
index 7ddb8384af..0000000000
--- a/tensorflow/tensorboard/lib/python/BUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Description:
-# Public utilities from TensorBoard, a dashboard for investigating TensorFlow
-
-package(default_visibility = ["//tensorflow:internal"])
-
-licenses(["notice"])  # Apache 2.0
-
-exports_files(["LICENSE"])
-
-load("//tensorflow:tensorflow.bzl", "py_test")
-
-py_library(
-    name = "http_util",
-    srcs = ["http_util.py"],
-    srcs_version = "PY2AND3",
-    visibility = ["//visibility:public"],
-    deps = [
-        ":json_util",
-        "//tensorflow/python:util",
-        "@org_pocoo_werkzeug//:werkzeug",
-        "@six_archive//:six",
-    ],
-)
-
-py_test(
-    name = "http_util_test",
-    size = "small",
-    srcs = ["http_util_test.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":http_util",
-        "//tensorflow/python:client_testlib",
-        "@org_pocoo_werkzeug//:werkzeug",
-        "@six_archive//:six",
-    ],
-)
-
-py_library(
-    name = "json_util",
-    srcs = ["json_util.py"],
-    srcs_version = "PY2AND3",
-    visibility = ["//visibility:public"],
-    deps = ["//tensorflow/python:util"],
-)
-
-py_test(
-    name = "json_util_test",
-    size = "small",
-    srcs = ["json_util_test.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":json_util",
-        "//tensorflow/python:platform_test",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(
-        [
-            "*",
-        ],
-    ),
-    visibility = ["//tensorflow:__subpackages__"],
-)
diff --git a/tensorflow/tensorboard/lib/python/__init__.py b/tensorflow/tensorboard/lib/python/__init__.py
deleted file mode 100644
index 1aa2ec9e03..0000000000
--- a/tensorflow/tensorboard/lib/python/__init__.py
+++ /dev/null
@@ -1,18 +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.
-# ==============================================================================
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
diff --git a/tensorflow/tensorboard/plugins/debugger/BUILD b/tensorflow/tensorboard/plugins/debugger/BUILD
index 130a5a7107..3955e3a487 100644
--- a/tensorflow/tensorboard/plugins/debugger/BUILD
+++ b/tensorflow/tensorboard/plugins/debugger/BUILD
@@ -17,9 +17,9 @@ py_library(
     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/lib/python:http_util",
         "//tensorflow/tensorboard/plugins:base_plugin",
     ],
 )
diff --git a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
index 0b390d8b78..43902efe24 100644
--- a/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
+++ b/tensorflow/tensorboard/plugins/debugger/debugger_plugin.py
@@ -28,9 +28,9 @@ 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.lib.python import http_util
 from tensorflow.tensorboard.plugins import base_plugin
 
 # The prefix of routes provided by this plugin.
diff --git a/tensorflow/tensorboard/plugins/projector/BUILD b/tensorflow/tensorboard/plugins/projector/BUILD
index d0f6c37ea5..2a3c028027 100644
--- a/tensorflow/tensorboard/plugins/projector/BUILD
+++ b/tensorflow/tensorboard/plugins/projector/BUILD
@@ -25,7 +25,7 @@ py_library(
         "//tensorflow/python:lib",
         "//tensorflow/python:platform",
         "//tensorflow/python:training",
-        "//tensorflow/tensorboard/lib/python:http_util",
+        "//tensorflow/tensorboard/backend:http_util",
         "//tensorflow/tensorboard/plugins:base_plugin",
         "//third_party/py/numpy",
         "@org_pocoo_werkzeug//:werkzeug",
diff --git a/tensorflow/tensorboard/plugins/projector/projector_plugin.py b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
index 8e6f4c3768..6ecd5972fc 100644
--- a/tensorflow/tensorboard/plugins/projector/projector_plugin.py
+++ b/tensorflow/tensorboard/plugins/projector/projector_plugin.py
@@ -33,7 +33,7 @@ from tensorflow.python.platform import tf_logging as logging
 from tensorflow.python.pywrap_tensorflow import NewCheckpointReader
 from tensorflow.python.training.saver import checkpoint_exists
 from tensorflow.python.training.saver import latest_checkpoint
-from tensorflow.tensorboard.lib.python.http_util import Respond
+from tensorflow.tensorboard.backend.http_util import Respond
 from tensorflow.tensorboard.plugins.base_plugin import TBPlugin
 
 # The prefix of routes provided by this plugin.