From 6b7b115d8a8926a50841d9283e9fe63d30cf520a Mon Sep 17 00:00:00 2001 From: Eugene Brevdo Date: Thu, 12 Mar 2020 14:52:08 -0700 Subject: [PATCH] [TF] alwayslink=1 to a bunch of targets used when creating pywrap_tensorflow_internal. Without this, tensorflow_serving doesn't build due to dynamic linking errors. Does not change the size of the CPU TF wheel when created with rbe/linux/py3 config. PiperOrigin-RevId: 300629656 Change-Id: Ib9064f59e1bb6750d1efedd6ab16a8ea0e0e89a9 --- tensorflow/c/BUILD | 1 + tensorflow/c/eager/BUILD | 1 + tensorflow/core/grappler/clusters/BUILD | 4 ++-- tensorflow/core/grappler/costs/BUILD | 8 +++++++- tensorflow/core/platform/BUILD | 1 + tensorflow/core/platform/default/BUILD | 1 + tensorflow/core/util/BUILD | 1 + tensorflow/python/BUILD | 7 +++++-- 8 files changed, 19 insertions(+), 5 deletions(-) diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD index 0b31ca33d20..a5f03b0901a 100644 --- a/tensorflow/c/BUILD +++ b/tensorflow/c/BUILD @@ -698,4 +698,5 @@ tf_cuda_library( # TODO(b/74620627): remove when _USE_C_SHAPES is removed "//tensorflow/python:cpp_shape_inference_proto_cc", ], + alwayslink = 1, ) diff --git a/tensorflow/c/eager/BUILD b/tensorflow/c/eager/BUILD index 2749724d039..c25cb264ce7 100644 --- a/tensorflow/c/eager/BUILD +++ b/tensorflow/c/eager/BUILD @@ -354,6 +354,7 @@ cc_library( "//tensorflow/core:lib", "@dlpack", ], + alwayslink = 1, ) # TODO(karllessard): only used by //tensorflow/core:mobile_srcs_only_runtime diff --git a/tensorflow/core/grappler/clusters/BUILD b/tensorflow/core/grappler/clusters/BUILD index 74c8837313b..ab1c36010e9 100644 --- a/tensorflow/core/grappler/clusters/BUILD +++ b/tensorflow/core/grappler/clusters/BUILD @@ -1,6 +1,5 @@ load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda") -load("//tensorflow:tensorflow.bzl", "tf_cc_test") -load("//tensorflow:tensorflow.bzl", "tf_cuda_library") +load("//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_cuda_library") load( "//tensorflow/core/platform:build_config_root.bzl", "tf_cuda_tests_tags", @@ -138,6 +137,7 @@ cc_library( "//tensorflow/core/grappler:utils", "//tensorflow/core/kernels:ops_util", ], + alwayslink = 1, ) tf_cc_test( diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD index 2d547b968fc..9104cea896d 100644 --- a/tensorflow/core/grappler/costs/BUILD +++ b/tensorflow/core/grappler/costs/BUILD @@ -1,4 +1,8 @@ -load("//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_cuda_library") +load( + "//tensorflow:tensorflow.bzl", + "tf_cc_test", + "tf_cuda_library", +) load( "//tensorflow/core/platform:build_config.bzl", "tf_additional_all_protos", @@ -303,6 +307,7 @@ cc_library( "//tensorflow/core/grappler/costs:cost_estimator", "//tensorflow/core/kernels:ops_util", ], + alwayslink = 1, ) cc_library( @@ -353,6 +358,7 @@ cc_library( "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", ] + tf_protos_grappler(), + alwayslink = 1, ) tf_cc_test( diff --git a/tensorflow/core/platform/BUILD b/tensorflow/core/platform/BUILD index 424de81a066..31ccf875114 100644 --- a/tensorflow/core/platform/BUILD +++ b/tensorflow/core/platform/BUILD @@ -595,6 +595,7 @@ cc_library( name = "stacktrace_handler", textual_hdrs = ["stacktrace_handler.h"], deps = tf_windows_aware_platform_deps("stacktrace_handler"), + alwayslink = 1, ) cc_library( diff --git a/tensorflow/core/platform/default/BUILD b/tensorflow/core/platform/default/BUILD index 88f033983b5..029d5312239 100644 --- a/tensorflow/core/platform/default/BUILD +++ b/tensorflow/core/platform/default/BUILD @@ -365,6 +365,7 @@ cc_library( "//tensorflow/core/platform", "//tensorflow/core/platform:stacktrace", ], + alwayslink = 1, ) cc_library( diff --git a/tensorflow/core/util/BUILD b/tensorflow/core/util/BUILD index ca5ec3423d9..9cda09e1625 100644 --- a/tensorflow/core/util/BUILD +++ b/tensorflow/core/util/BUILD @@ -444,6 +444,7 @@ cc_library( srcs = ["version_info.cc"], hdrs = ["//tensorflow/core/public:version.h"], copts = tf_copts(), + alwayslink = 1, ) cc_library( diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD index 4442745d462..8f39c12fd7d 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -349,14 +349,15 @@ cc_library( hdrs = ["grappler/cost_analyzer.h"], deps = [ "//tensorflow/core:lib", + "//tensorflow/core/grappler/costs:analytical_cost_estimator", + "//tensorflow/core/grappler/costs:measuring_cost_estimator", "//tensorflow/core:protos_all_cc", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler/clusters:cluster", - "//tensorflow/core/grappler/costs:analytical_cost_estimator", "//tensorflow/core/grappler/costs:cost_estimator", - "//tensorflow/core/grappler/costs:measuring_cost_estimator", "//tensorflow/core/grappler/costs:utils", ] + tf_protos_grappler(), + alwayslink = 1, ) # Necessary for the pywrap inclusion below. Combining targets does not work @@ -509,6 +510,7 @@ cc_library( "//tensorflow/core:protos_all_cc", "//third_party/python_runtime:headers", ], + alwayslink = 1, ) cc_library( @@ -5740,6 +5742,7 @@ tf_cuda_library( "//third_party/py/numpy:headers", "//third_party/python_runtime:headers", ], + alwayslink = 1, ) py_library(