From 8a0e81d81f88d49f49af969e9e7fe5807322931d Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Thu, 20 Oct 2016 11:12:53 -0800 Subject: [PATCH] Automated rollback of change 136664737 Change: 136743547 --- tensorflow/core/BUILD | 77 ++++++++++++++++++++++++++++++ tensorflow/tensorflow.bzl | 46 +----------------- tensorflow/tools/pip_package/BUILD | 4 +- 3 files changed, 80 insertions(+), 47 deletions(-) diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index 64e7ee7da6b..7141ddf8040 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -1107,6 +1107,83 @@ cc_header_only_library( ], ) +filegroup( + name = "framework_headers", + srcs = [ + "framework/allocator.h", + "framework/attr_value_util.h", + "framework/bfloat16.h", + "framework/cancellation.h", + "framework/control_flow.h", + "framework/device_base.h", + "framework/function.h", + "framework/kernel_def_builder.h", + "framework/node_def_util.h", + "framework/numeric_types.h", + "framework/op.h", + "framework/op_def_builder.h", + "framework/op_def_util.h", + "framework/op_kernel.h", + "framework/partial_tensor_shape.h", + "framework/register_types.h", + "framework/rendezvous.h", + "framework/selective_registration.h", + "framework/session_state.h", + "framework/shape_inference.h", + "framework/tensor.h", + "framework/tensor_reference.h", + "framework/tensor_shape.h", + "framework/tensor_types.h", + "framework/tracking_allocator.h", + "framework/type_traits.h", + "framework/types.h", + "framework/unique_tensor_references.h", + "lib/core/errors.h", + "lib/core/notification.h", + "lib/core/refcount.h", + "lib/core/status.h", + "lib/core/stringpiece.h", + "lib/core/threadpool.h", + "lib/gtl/array_slice.h", + "lib/gtl/array_slice_internal.h", + "lib/gtl/inlined_vector.h", + "lib/gtl/manual_constructor.h", + "lib/hash/hash.h", + "lib/strings/numbers.h", + "lib/strings/str_util.h", + "lib/strings/strcat.h", + "platform/cpu_info.h", + "platform/default/dynamic_annotations.h", + "platform/default/integral_types.h", + "platform/default/logging.h", + "platform/default/mutex.h", + "platform/default/notification.h", + "platform/default/protobuf.h", + "platform/default/thread_annotations.h", + "platform/dynamic_annotations.h", + "platform/env.h", + "platform/file_statistics.h", + "platform/file_system.h", + "platform/fingerprint.h", + "platform/logging.h", + "platform/macros.h", + "platform/mem.h", + "platform/mutex.h", + "platform/net.h", + "platform/notification.h", + "platform/platform.h", + "platform/prefetch.h", + "platform/protobuf.h", + "platform/strong_hash.h", + "platform/thread_annotations.h", + "platform/types.h", + "public/session.h", + "public/session_options.h", + "public/version.h", + "util/device_name_utils.h", + ], +) + tf_cuda_library( name = "stream_executor", srcs = tf_additional_stream_executor_srcs(), diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 89852768d60..44d75e9ce35 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -630,53 +630,11 @@ def transitive_hdrs(name, deps=[], **kwargs): native.filegroup(name=name, srcs=[":" + name + "_gather"]) -# The following rules and aspects are used to collect the headers of -# the direct dependencies of a target. -def _collect_hdrs_aspect_impl(target, ctx): - allhdrs = set() - for h in getattr(ctx.rule.attr, 'hdrs', []): - allhdrs = allhdrs | h.files - return struct(tf_hdrs=allhdrs) - -collect_hdrs_aspect = aspect( - implementation=_collect_hdrs_aspect_impl, - attr_aspects=["deps"]) - -def _exposed_hdrs_impl(ctx): - all_hdrs = set() - for input_dep in ctx.attr.deps: - if not hasattr(input_dep, "tf_hdrs"): - continue - all_hdrs = all_hdrs | input_dep.tf_hdrs - return struct(files=all_hdrs) - -_exposed_hdrs_rule = rule( - _exposed_hdrs_impl, - attrs = { - "deps": attr.label_list( - aspects=[collect_hdrs_aspect], - mandatory = True, - allow_files = True - ), - } -) - -def _exposed_hdrs(name, deps=[], **kwargs): - _exposed_hdrs_rule(name=name + "_internal", deps=deps) - # Defines a filegroup containing all of the headers exposed by - # each target in 'deps'. - native.filegroup(name=name, srcs=[":" + name + "_internal"]) - - -# Create a header only library that includes all the headers exported -# by the libraries in deps, and exports only the headers of the direct -# dependencies of entries in 'deps' as a filegroup. +# Create a header only library that includes all the headers exported by +# the libraries in deps. def cc_header_only_library(name, deps=[], **kwargs): _transitive_hdrs(name=name + "_gather", deps=deps) - - _exposed_hdrs(name=name + "_headers", deps=deps) - native.cc_library(name=name, hdrs=[":" + name + "_gather"], **kwargs) diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD index 3a7dce036a0..dea9159ce63 100644 --- a/tensorflow/tools/pip_package/BUILD +++ b/tensorflow/tools/pip_package/BUILD @@ -5,8 +5,6 @@ package(default_visibility = ["//visibility:private"]) load("//tensorflow:tensorflow.bzl", "transitive_hdrs") -# Bring in the eigen3 and generated protobuf headers that are not part -# of the direct framework headers lib. transitive_hdrs( name = "other_headers", deps = [ @@ -40,7 +38,7 @@ sh_binary( "//tensorflow/contrib/specs:all_files", "//tensorflow/contrib/tensor_forest:all_files", "//tensorflow/contrib/tensor_forest/hybrid:all_files", - "//tensorflow/core:framework_headers_lib_headers", + "//tensorflow/core:framework_headers", "//tensorflow/examples/tutorials/mnist:package", "//tensorflow/models/embedding:package", "//tensorflow/models/image/alexnet:all_files", -- GitLab