From: Yifei Feng Date: Tue, 29 May 2018 20:39:54 +0000 (-0700) Subject: Fix merge error. X-Git-Tag: upstream/v1.9.0_rc1~38^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1210643b50d8b5aca1f078ab1cd910d6d24253c;p=platform%2Fupstream%2Ftensorflow.git Fix merge error. --- diff --git a/tensorflow/contrib/tensorrt/BUILD b/tensorflow/contrib/tensorrt/BUILD index 15811ce..a5d8b06 100644 --- a/tensorflow/contrib/tensorrt/BUILD +++ b/tensorflow/contrib/tensorrt/BUILD @@ -192,7 +192,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/workspace.bzl b/tensorflow/workspace.bzl index 2dc73ca..86c2b50 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -820,7 +820,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