diff --git a/tensorflow/contrib/lite/python/interpreter_wrapper/BUILD b/tensorflow/contrib/lite/python/interpreter_wrapper/BUILD
index 453eda6e734..12ab38847dc 100644
--- a/tensorflow/contrib/lite/python/interpreter_wrapper/BUILD
+++ b/tensorflow/contrib/lite/python/interpreter_wrapper/BUILD
@@ -15,7 +15,7 @@ cc_library(
"//tensorflow/contrib/lite/kernels:builtin_ops",
"//tensorflow/core:lib",
"//tensorflow/python:numpy_lib",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
"@com_google_absl//absl/memory",
],
)
@@ -27,6 +27,6 @@ tf_py_wrap_cc(
],
deps = [
":interpreter_wrapper_lib",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
diff --git a/tensorflow/contrib/lite/toco/python/BUILD b/tensorflow/contrib/lite/toco/python/BUILD
index 6c4f8e12cdd..8cac568bd7a 100644
--- a/tensorflow/contrib/lite/toco/python/BUILD
+++ b/tensorflow/contrib/lite/toco/python/BUILD
@@ -15,7 +15,7 @@ cc_library(
"//tensorflow/contrib/lite/toco:toco_port",
"//tensorflow/contrib/lite/toco:toco_tooling",
"//tensorflow/core:lib",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
@@ -26,7 +26,7 @@ tf_py_wrap_cc(
":toco_python_api",
"//tensorflow/contrib/lite/toco:model_flags_proto_cc",
"//tensorflow/contrib/lite/toco:toco_flags_proto_cc",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
"@com_google_absl//absl/strings",
],
)
diff --git a/tensorflow/contrib/lite/toco/python/toco_python_api.h b/tensorflow/contrib/lite/toco/python/toco_python_api.h
index 9af38e937c2..7e8ad9c1daf 100644
--- a/tensorflow/contrib/lite/toco/python/toco_python_api.h
+++ b/tensorflow/contrib/lite/toco/python/toco_python_api.h
@@ -15,8 +15,8 @@ limitations under the License.
#ifndef _THIRD_PARTY_TENSORFLOW_CONTRIB_LITE_TOCO_PYTHON_TOCO_PYTHON_API_H_
#define _THIRD_PARTY_TENSORFLOW_CONTRIB_LITE_TOCO_PYTHON_TOCO_PYTHON_API_H_
-#include <string>
#include <Python.h>
+#include <string>
namespace toco {
diff --git a/tensorflow/contrib/tensorrt/BUILD b/tensorflow/contrib/tensorrt/BUILD
index 742be7baf0b..6d6feb3c399 100644
--- a/tensorflow/contrib/tensorrt/BUILD
+++ b/tensorflow/contrib/tensorrt/BUILD
@@ -190,7 +190,7 @@ tf_py_wrap_cc(
":trt_conversion",
":trt_engine_op_kernel",
"//tensorflow/core:framework_lite",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
index 284581b41c6..23c594d90db 100644
--- a/tensorflow/core/platform/default/build_config.bzl
+++ b/tensorflow/core/platform/default/build_config.bzl
@@ -82,7 +82,7 @@ def pyx_library(
native.cc_binary(
name=shared_object_name,
srcs=[stem + ".cpp"],
- deps=deps + ["//util/python:python_headers"],
+ deps=deps + ["//third_party/python_runtime:headers"],
linkshared = 1,
)
shared_objects.append(shared_object_name)
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 539e5d310e3..679ef93229a 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -256,7 +256,7 @@ cc_library(
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//third_party/py/numpy:headers",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
@@ -269,7 +269,7 @@ cc_library(
":safe_ptr",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
@@ -293,7 +293,7 @@ cc_library(
deps = [
"//tensorflow/c:c_api",
"//tensorflow/core:lib",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
@@ -316,7 +316,7 @@ cc_library(
":safe_ptr",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
@@ -338,7 +338,7 @@ cc_library(
"//tensorflow/core:script_ops_op_lib",
"//tensorflow/python/eager:pywrap_tfe_lib",
"//third_party/py/numpy:headers",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
@@ -349,7 +349,7 @@ cc_library(
deps = [
"//tensorflow/c:c_api",
"//tensorflow/c/eager:c_api",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
@@ -379,7 +379,7 @@ cc_library(
":safe_ptr",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
@@ -390,7 +390,7 @@ cc_library(
deps = [
"//tensorflow/core:lib",
"//tensorflow/core:script_ops_op_lib",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
@@ -3437,7 +3437,7 @@ tf_cuda_library(
"//tensorflow/core:lib",
"//tensorflow/core:protos_all_cc",
"//third_party/py/numpy:headers",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
@@ -3508,6 +3508,7 @@ tf_py_wrap_cc(
":py_record_writer_lib",
":python_op_gen",
":tf_session_helper",
+ "//third_party/python_runtime:headers",
"//tensorflow/c:c_api",
"//tensorflow/c:checkpoint_reader",
"//tensorflow/c:python_api",
@@ -3530,7 +3531,6 @@ tf_py_wrap_cc(
"//tensorflow/core/profiler/internal:print_model_analysis",
"//tensorflow/tools/graph_transforms:transform_graph_lib",
"//tensorflow/python/eager:pywrap_tfe_lib",
- "//util/python:python_headers",
] + (tf_additional_lib_deps() +
tf_additional_plugin_deps() +
tf_additional_verbs_deps() +
diff --git a/tensorflow/python/eager/BUILD b/tensorflow/python/eager/BUILD
index 5530193d4e1..8dbb53211f7 100644
--- a/tensorflow/python/eager/BUILD
+++ b/tensorflow/python/eager/BUILD
@@ -31,7 +31,7 @@ cc_library(
"//tensorflow/python:numpy_lib",
"//tensorflow/python:py_seq_tensor",
"//tensorflow/python:safe_ptr",
- "//util/python:python_headers",
+ "//third_party/python_runtime:headers",
],
)
diff --git a/tensorflow/python/eager/pywrap_tfe.h b/tensorflow/python/eager/pywrap_tfe.h
index 9bc8b9bc726..626c33be150 100644
--- a/tensorflow/python/eager/pywrap_tfe.h
+++ b/tensorflow/python/eager/pywrap_tfe.h
@@ -16,10 +16,11 @@ limitations under the License.
#ifndef TENSORFLOW_PYTHON_EAGER_PYWRAP_TFE_H_
#define TENSORFLOW_PYTHON_EAGER_PYWRAP_TFE_H_
+#include <Python.h>
+
#include "tensorflow/c/eager/c_api.h"
#include "tensorflow/core/lib/core/status.h"
#include "tensorflow/core/lib/gtl/inlined_vector.h"
-#include <Python.h>
typedef tensorflow::gtl::InlinedVector<TFE_TensorHandle*, 4>
TFE_InputTensorHandles;
diff --git a/tensorflow/python/lib/core/py_exception_registry.cc b/tensorflow/python/lib/core/py_exception_registry.cc
index 6637de632b4..d03cf8930b9 100644
--- a/tensorflow/python/lib/core/py_exception_registry.cc
+++ b/tensorflow/python/lib/core/py_exception_registry.cc
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
-#include "tensorflow/python/lib/core/py_exception_registry.h"
-
#include <Python.h>
+#include "tensorflow/python/lib/core/py_exception_registry.h"
+
namespace tensorflow {
PyExceptionRegistry* PyExceptionRegistry::singleton_ = nullptr;
diff --git a/tensorflow/python/lib/core/py_func.cc b/tensorflow/python/lib/core/py_func.cc
index 8c6bb7955a4..30c1a9c7598 100644
--- a/tensorflow/python/lib/core/py_func.cc
+++ b/tensorflow/python/lib/core/py_func.cc
@@ -17,6 +17,8 @@ limitations under the License.
#include <array>
+#include <Python.h>
+
#include "numpy/arrayobject.h"
#include "tensorflow/c/eager/c_api.h"
#include "tensorflow/c/eager/c_api_internal.h"
@@ -33,8 +35,6 @@ limitations under the License.
#include "tensorflow/python/lib/core/py_util.h"
#include "tensorflow/python/lib/core/safe_ptr.h"
-#include <Python.h>
-
namespace tensorflow {
namespace {
diff --git a/tensorflow/python/lib/core/py_util.cc b/tensorflow/python/lib/core/py_util.cc
index 00cbf0c532c..dcda1f4a446 100644
--- a/tensorflow/python/lib/core/py_util.cc
+++ b/tensorflow/python/lib/core/py_util.cc
@@ -15,9 +15,10 @@ limitations under the License.
#include "tensorflow/python/lib/core/py_util.h"
+#include <Python.h>
+
#include "tensorflow/core/lib/core/errors.h"
#include "tensorflow/core/lib/strings/strcat.h"
-#include <Python.h>
namespace tensorflow {
namespace {
diff --git a/tensorflow/python/lib/core/safe_ptr.h b/tensorflow/python/lib/core/safe_ptr.h
index 32d28688866..35d71f7629e 100644
--- a/tensorflow/python/lib/core/safe_ptr.h
+++ b/tensorflow/python/lib/core/safe_ptr.h
@@ -19,6 +19,7 @@ limitations under the License.
#include <memory>
#include <Python.h>
+
#include "tensorflow/c/c_api.h"
#include "tensorflow/c/eager/c_api.h"
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 758e87b09d1..5d6fa6655cf 100644
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -821,7 +821,7 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
# Needed by Protobuf
native.bind(
name = "python_headers",
- actual = clean_dep("//util/python:python_headers"),
+ actual = clean_dep("//third_party/python_runtime:headers"),
)
# Needed by Protobuf
diff --git a/util/python/BUILD b/third_party/python_runtime/BUILD
similarity index 86%
rename from util/python/BUILD
rename to third_party/python_runtime/BUILD
index f5fa0c6d29c..2a1609191fe 100644
--- a/util/python/BUILD
+++ b/third_party/python_runtime/BUILD
@@ -3,6 +3,6 @@ licenses(["notice"]) # New BSD, Python Software Foundation
package(default_visibility = ["//visibility:public"])
alias(
- name = "python_headers",
+ name = "headers",
actual = "@local_config_python//:python_headers",
)