diff options
| author |  Martin Wicke <wicke@google.com> | 2017-09-02 19:21:45 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-09-02 19:25:56 -0700 |
| commit | d57572e996dce24abf4d9cf6ea04e7104b3d743b (patch) | |
| tree | ec8f6620e0f3231a8b739a2b6574a2db813e85b3 /tensorflow/contrib/gdr | |
| parent | ddba1e0aadabe26063a28c5d1c48e2cfce44e30f (diff) | |
Merge changes from github.
PiperOrigin-RevId: 167401527
Diffstat (limited to 'tensorflow/contrib/gdr')
| -rw-r--r-- | tensorflow/contrib/gdr/BUILD | 1 | ||||
| -rw-r--r-- | tensorflow/contrib/gdr/gdr_memory_manager.h | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tensorflow/contrib/gdr/BUILD b/tensorflow/contrib/gdr/BUILD index 645e364d19..bebcf079ba 100644 --- a/tensorflow/contrib/gdr/BUILD +++ b/tensorflow/contrib/gdr/BUILD @@ -62,6 +62,7 @@ tf_cuda_library( }), deps = [ ":gdr_proto_cc", + "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:gpu_runtime", "//tensorflow/core:lib", diff --git a/tensorflow/contrib/gdr/gdr_memory_manager.h b/tensorflow/contrib/gdr/gdr_memory_manager.h index 7e9fe01e97..e0e2a3f624 100644 --- a/tensorflow/contrib/gdr/gdr_memory_manager.h +++ b/tensorflow/contrib/gdr/gdr_memory_manager.h @@ -16,14 +16,9 @@ limitations under the License. #ifndef GDR_MEMORY_MANAGER_H_ #define GDR_MEMORY_MANAGER_H_ +#include "google/protobuf/any.pb.h" #include "tensorflow/core/lib/core/status.h" -namespace google { -namespace protobuf { -class Any; -} -} - namespace tensorflow { class Device; |