From 8434a67458fe52ffb9f978960bc81e2396ad76d3 Mon Sep 17 00:00:00 2001
From: Andrew Audibert <aaudibert@google.com>
Date: Thu, 2 Apr 2020 15:28:21 -0700
Subject: [PATCH] Move server_lib under tensorflow/python to fix nightly pip
 build.

tf_python_pybind_extension requires that it be used under the tensorflow/python directory.

PiperOrigin-RevId: 304490055
Change-Id: If9e16aa20e4223149f1d1aa7d732db7bae033461
---
 .../{core/data/service/python => python/data/service}/BUILD     | 0
 tensorflow/python/data/service/__init__.py                      | 0
 .../data/service/python => python/data/service}/server_lib.py   | 2 +-
 .../service/python => python/data/service}/server_lib_test.py   | 2 +-
 .../python => python/data/service}/server_lib_wrapper.cc        | 0
 tensorflow/tools/pip_package/BUILD                              | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename tensorflow/{core/data/service/python => python/data/service}/BUILD (100%)
 create mode 100644 tensorflow/python/data/service/__init__.py
 rename tensorflow/{core/data/service/python => python/data/service}/server_lib.py (98%)
 rename tensorflow/{core/data/service/python => python/data/service}/server_lib_test.py (95%)
 rename tensorflow/{core/data/service/python => python/data/service}/server_lib_wrapper.cc (100%)

diff --git a/tensorflow/core/data/service/python/BUILD b/tensorflow/python/data/service/BUILD
similarity index 100%
rename from tensorflow/core/data/service/python/BUILD
rename to tensorflow/python/data/service/BUILD
diff --git a/tensorflow/python/data/service/__init__.py b/tensorflow/python/data/service/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tensorflow/core/data/service/python/server_lib.py b/tensorflow/python/data/service/server_lib.py
similarity index 98%
rename from tensorflow/core/data/service/python/server_lib.py
rename to tensorflow/python/data/service/server_lib.py
index d3636123e0f..45b1924b812 100644
--- a/tensorflow/core/data/service/python/server_lib.py
+++ b/tensorflow/python/data/service/server_lib.py
@@ -20,7 +20,7 @@ from __future__ import print_function
 
 # pylint: disable=invalid-import-order,g-bad-import-order, unused-import
 from tensorflow.python import pywrap_tensorflow
-from tensorflow.core.data.service.python import _pywrap_server_lib
+from tensorflow.python.data.service import _pywrap_server_lib
 
 
 class MasterServer(object):
diff --git a/tensorflow/core/data/service/python/server_lib_test.py b/tensorflow/python/data/service/server_lib_test.py
similarity index 95%
rename from tensorflow/core/data/service/python/server_lib_test.py
rename to tensorflow/python/data/service/server_lib_test.py
index 6e9d6b9c043..b18262bf52b 100644
--- a/tensorflow/core/data/service/python/server_lib_test.py
+++ b/tensorflow/python/data/service/server_lib_test.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from tensorflow.core.data.service.python import server_lib
+from tensorflow.python.data.service import server_lib
 
 from tensorflow.python.platform import test
 
diff --git a/tensorflow/core/data/service/python/server_lib_wrapper.cc b/tensorflow/python/data/service/server_lib_wrapper.cc
similarity index 100%
rename from tensorflow/core/data/service/python/server_lib_wrapper.cc
rename to tensorflow/python/data/service/server_lib_wrapper.cc
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index 991a5742579..e5186bc1f13 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -95,7 +95,6 @@ COMMON_PIP_DEPS = [
     "//tensorflow:tensorflow_py",
     "//tensorflow/compiler/tf2xla:xla_compiled_cpu_runtime_hdrs",
     "//tensorflow/compiler/tf2xla:xla_compiled_cpu_runtime_srcs",
-    "//tensorflow/core/data/service/python:server_lib",
     "//tensorflow/core:protos_all_proto_srcs",
     "//tensorflow/examples/saved_model/integration_tests:mnist_util",
     "//tensorflow/lite/python/testdata:interpreter_test_data",
@@ -107,6 +106,7 @@ COMMON_PIP_DEPS = [
     "//tensorflow/python/autograph/pyct/common_transformers:common_transformers",
     "//tensorflow/python/compiler:compiler",
     "//tensorflow/python:cond_v2",
+    "//tensorflow/python/data/service:server_lib",
     "//tensorflow/python:distributed_framework_test_lib",
     "//tensorflow/python/distribute:distribute_test_lib_pip",
     "//tensorflow/python:loss_scale",