experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the newly introduced 'allocator' and 'gpu_bfc_allocator' targets.

Browse Source 
- Explicitly add required headers in order to avoid layering violations
 - Remove allocator source files from 'framework' target,
   to avoid ODR violations when linking in both 'framework' and 'allocator'.

PiperOrigin-RevId: 247778314
This commit is contained in:
George Karpenkov 2019-05-11 15:15:28 -07:00 committed by TensorFlower Gardener
parent 96d69ba0ee
commit ebe312e2de
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tensorflow/core/BUILD
View File

@ -1002,14 +1002,20 @@ cc_library(
"framework/allocator.cc", "framework/allocator.cc",
"framework/allocator_registry.cc", "framework/allocator_registry.cc",
"framework/allocator_registry.h", "framework/allocator_registry.h",
"framework/numeric_types.h",
"framework/tracking_allocator.cc", "framework/tracking_allocator.cc",
"framework/tracking_allocator.h", "framework/tracking_allocator.h",
"framework/type_traits.h",
],
hdrs = [
"framework/allocator.h",
], ],
hdrs = ["framework/allocator.h"],
features = ["parse_headers"], features = ["parse_headers"],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
":lib", ":lib",
"//third_party/eigen3",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:optional", "@com_google_absl//absl/types:optional",
], ],
) )
@ -2865,6 +2871,9 @@ tf_cuda_library(
exclude = [ exclude = [
"**/*test*", "**/*test*",
"**/*main.cc", "**/*main.cc",
"framework/allocator.cc",
"framework/allocator_registry.cc",
"framework/tracking_allocator.cc",
"example/example_parser_configuration.*", "example/example_parser_configuration.*",
"example/feature_util.cc", "example/feature_util.cc",
"util/reporter.cc", "util/reporter.cc",
@ -2896,6 +2905,7 @@ tf_cuda_library(
], ],
}), }),
deps = [ deps = [
":allocator",
":feature_util", ":feature_util",
":lib", ":lib",
":lib_internal", ":lib_internal",
@ -3519,6 +3529,7 @@ tf_cuda_library(
":bfc_allocator", ":bfc_allocator",
":lib", ":lib",
":lib_internal", ":lib_internal",
":protos_all_cc",
":stream_executor", ":stream_executor",
], ],
) )

1
tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.h
View File

@ -21,7 +21,6 @@ limitations under the License.
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "tensorflow/core/common_runtime/allocator_retry.h"
#include "tensorflow/core/common_runtime/bfc_allocator.h" #include "tensorflow/core/common_runtime/bfc_allocator.h"
#include "tensorflow/core/common_runtime/gpu/gpu_id.h" #include "tensorflow/core/common_runtime/gpu/gpu_id.h"
#include "tensorflow/core/platform/stream_executor.h" #include "tensorflow/core/platform/stream_executor.h"