From 0d864630161d9f3b9eaef0b7c6ce7443654df97a Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 22 Sep 2017 13:48:33 -0700
Subject: [PATCH] Move GPU-specific dependencies of core/grappler:devices into
 cuda_deps.

Fix #includes and deps of contrib/verbs:verbs_util, in particular
removing an unnecessary #include of gpu_util.h that relied on a
transitive dependency through :devices.

PiperOrigin-RevId: 169732234
---
 tensorflow/contrib/verbs/BUILD         | 3 ---
 tensorflow/contrib/verbs/verbs_util.cc | 8 ++++++--
 tensorflow/contrib/verbs/verbs_util.h  | 6 +-----
 tensorflow/core/grappler/BUILD         | 6 ++++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/tensorflow/contrib/verbs/BUILD b/tensorflow/contrib/verbs/BUILD
index 173a65a7eb6..746ff38b37f 100644
--- a/tensorflow/contrib/verbs/BUILD
+++ b/tensorflow/contrib/verbs/BUILD
@@ -50,11 +50,8 @@ cc_library(
     srcs = ["verbs_util.cc"],
     hdrs = ["verbs_util.h"],
     deps = [
-        "//tensorflow/core:core_cpu_internal",
         "//tensorflow/core:framework",
-        "//tensorflow/core:gpu_runtime",
         "//tensorflow/core:lib",
-        "//tensorflow/core:lib_internal",
     ],
 )
 
diff --git a/tensorflow/contrib/verbs/verbs_util.cc b/tensorflow/contrib/verbs/verbs_util.cc
index 4f5c731a188..a6333d9f362 100644
--- a/tensorflow/contrib/verbs/verbs_util.cc
+++ b/tensorflow/contrib/verbs/verbs_util.cc
@@ -15,9 +15,13 @@ limitations under the License.
 
 #include "tensorflow/contrib/verbs/verbs_util.h"
 
-#include "tensorflow/core/common_runtime/gpu/gpu_util.h"
-#include "tensorflow/core/lib/core/notification.h"
+#include <vector>
+
+#include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/lib/strings/numbers.h"
 #include "tensorflow/core/lib/strings/str_util.h"
+#include "tensorflow/core/lib/strings/strcat.h"
+
 namespace tensorflow {
 
 // static
diff --git a/tensorflow/contrib/verbs/verbs_util.h b/tensorflow/contrib/verbs/verbs_util.h
index 8b44adaedcb..5cd0a3533af 100644
--- a/tensorflow/contrib/verbs/verbs_util.h
+++ b/tensorflow/contrib/verbs/verbs_util.h
@@ -18,14 +18,10 @@ limitations under the License.
 
 #include <string>
 
-#include "tensorflow/core/common_runtime/device.h"
-#include "tensorflow/core/framework/tensor.h"
-#include "tensorflow/core/lib/core/status.h"
+#include "tensorflow/core/framework/types.h"
 
 namespace tensorflow {
 
-class TensorProto;
-
 class VerbsUtil {
  public:
   static string AppendStepidToKey(const string& key, int64 step_id);
diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD
index 7fa22ef47d9..3f2cd2ddbff 100644
--- a/tensorflow/core/grappler/BUILD
+++ b/tensorflow/core/grappler/BUILD
@@ -55,12 +55,14 @@ tf_cuda_library(
     name = "devices",
     srcs = ["devices.cc"],
     hdrs = ["devices.h"],
+    cuda_deps = [
+        "//tensorflow/core:gpu_init",
+        "//tensorflow/core:stream_executor",
+    ],
     visibility = ["//visibility:public"],
     deps = [
-        "//tensorflow/core:gpu_init",
         "//tensorflow/core:lib",
         "//tensorflow/core:lib_internal",
-        "//tensorflow/core:stream_executor",
     ],
 )