From b559a319411e2d3f2a42f466c18737edd527bb10 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Thu, 22 Mar 2018 05:46:07 -0700
Subject: [PATCH] Update file due to changes in Bazel (PACKAGE_NAME is
deprecated)
PiperOrigin-RevId: 190051589
---
tensorflow/compiler/aot/tfcompile.bzl | 2 +-
tensorflow/tensorflow.bzl | 4 ++--
tensorflow/tools/test/performance.bzl | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tensorflow/compiler/aot/tfcompile.bzl b/tensorflow/compiler/aot/tfcompile.bzl
index 9dff1be09fe..3a877c5337f 100644
--- a/tensorflow/compiler/aot/tfcompile.bzl
+++ b/tensorflow/compiler/aot/tfcompile.bzl
@@ -132,7 +132,7 @@ def tf_library(name, graph, config,
header_file = name + ".h"
metadata_object_file = name + "_tfcompile_metadata.o"
function_object_file = name + "_tfcompile_function.o"
- ep = ("__" + PACKAGE_NAME + "__" + name).replace("/", "_")
+ ep = ("__" + native.package_name() + "__" + name).replace("/", "_")
if type(tfcompile_flags) == type(""):
flags = tfcompile_flags
else:
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 9b0db8a1129..2d3cb415fe8 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -34,7 +34,7 @@ def src_to_test_name(src):
return src.replace("/", "_").split(".")[0]
def full_path(relative_paths):
- return [PACKAGE_NAME + "/" + relative for relative in relative_paths]
+ return [native.package_name() + "/" + relative for relative in relative_paths]
# List of proto files for android builds
def tf_android_core_proto_sources(core_proto_sources_relative):
@@ -265,7 +265,7 @@ def _rpath_linkopts(name):
# deployed. Other shared object dependencies (e.g. shared between contrib/
# ops) are picked up as long as they are in either the same or a parent
# directory in the tensorflow/ tree.
- levels_to_root = PACKAGE_NAME.count("/") + name.count("/")
+ levels_to_root = native.package_name().count("/") + name.count("/")
return select({
clean_dep("//tensorflow:darwin"): [
"-Wl,%s" % (_make_search_paths("@loader_path", levels_to_root),),
diff --git a/tensorflow/tools/test/performance.bzl b/tensorflow/tools/test/performance.bzl
index cee53dd5b61..3486871080c 100644
--- a/tensorflow/tools/test/performance.bzl
+++ b/tensorflow/tools/test/performance.bzl
@@ -31,7 +31,7 @@ def tf_cc_logged_benchmark(
size = "large",
srcs = ["//tensorflow/tools/test:run_and_gather_logs"],
args = [
- "--name=//%s:%s" % (PACKAGE_NAME, name),
+ "--name=//%s:%s" % (native.package_name(), name),
"--test_name=" + target,
"--test_args=--benchmarks=%s" % benchmarks,
"--benchmark_type=%s" % benchmark_type,