From 5735726ed62ef6787a159bf57d9366ba550e0fa2 Mon Sep 17 00:00:00 2001
From: George Karpenkov <cheshire@google.com>
Date: Fri, 24 May 2019 09:51:18 -0700
Subject: [PATCH] Fix up the gpu_bfc_allocator target:

 - Avoid duplicate symbols by establishing proper dependency
 - Avoid error about gpu_id.h header by dropping the include

PiperOrigin-RevId: 249849197
---
 tensorflow/core/BUILD                                   | 2 +-
 tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.cc | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 357d0795ff8..5b0e1bc5a64 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -3494,7 +3494,6 @@ GPU_RUNTIME_HEADERS = [
 tf_cuda_library(
     name = "gpu_runtime_impl",
     srcs = [
-        "common_runtime/gpu/gpu_bfc_allocator.cc",
         "common_runtime/gpu/gpu_cudamalloc_allocator.cc",
         "common_runtime/gpu/gpu_debug_allocator.cc",
         "common_runtime/gpu/gpu_device.cc",
@@ -3512,6 +3511,7 @@ tf_cuda_library(
         ":core_cpu_lib",
         ":framework",
         ":framework_internal",
+        ":gpu_bfc_allocator",
         ":gpu_id_impl",
         ":gpu_init_impl",
         ":gpu_lib",
diff --git a/tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.cc b/tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.cc
index 06b97073929..c284958ee9f 100644
--- a/tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.cc
+++ b/tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.cc
@@ -15,7 +15,6 @@ limitations under the License.
 
 #include "tensorflow/core/common_runtime/gpu/gpu_bfc_allocator.h"
 
-#include "tensorflow/core/common_runtime/gpu/gpu_id.h"
 #include "tensorflow/core/lib/strings/strcat.h"
 
 namespace tensorflow {