From a49fe0366880ec51f452bf3106d342bb586d5e93 Mon Sep 17 00:00:00 2001 From: Suharsh Sivakumar Date: Wed, 26 Jul 2017 20:56:22 -0700 Subject: [PATCH] Remove platform bridge for grpc_response_reader. PiperOrigin-RevId: 163295986 --- tensorflow/core/BUILD | 1 - .../rpc/grpc_remote_worker.cc | 1 - .../platform/default/grpc_response_reader.h | 36 -------------- .../core/platform/grpc_response_reader.h | 47 ------------------- 4 files changed, 85 deletions(-) delete mode 100644 tensorflow/core/platform/default/grpc_response_reader.h delete mode 100644 tensorflow/core/platform/grpc_response_reader.h diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index 02355a7626b..8c475cd2321 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -288,7 +288,6 @@ cc_library( "platform/env_time.h", "platform/file_system.h", "platform/fingerprint.h", - "platform/grpc_response_reader.h", "platform/init_main.h", "platform/logging.h", "platform/macros.h", diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_remote_worker.cc b/tensorflow/core/distributed_runtime/rpc/grpc_remote_worker.cc index e0523baccd9..9ee471b0761 100644 --- a/tensorflow/core/distributed_runtime/rpc/grpc_remote_worker.cc +++ b/tensorflow/core/distributed_runtime/rpc/grpc_remote_worker.cc @@ -30,7 +30,6 @@ limitations under the License. #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/lib/strings/str_util.h" -#include "tensorflow/core/platform/grpc_response_reader.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/tracing.h" #include "tensorflow/core/protobuf/worker.pb.h" diff --git a/tensorflow/core/platform/default/grpc_response_reader.h b/tensorflow/core/platform/default/grpc_response_reader.h deleted file mode 100644 index e2be9d6a65c..00000000000 --- a/tensorflow/core/platform/default/grpc_response_reader.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2017 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#ifndef THIRD_PARTY_TENSORFLOW_CORE_PLATFORM_DEFAULT_GRPC_RESPONSE_READER_H_ -#define THIRD_PARTY_TENSORFLOW_CORE_PLATFORM_DEFAULT_GRPC_RESPONSE_READER_H_ - -#include "grpc++/grpc++.h" - -namespace tensorflow { - -template -::grpc::ClientAsyncResponseReader* -CreateClientAsyncResponseReader(::grpc::ChannelInterface* channel, - ::grpc::CompletionQueue* cq, - const ::grpc::RpcMethod& method, - ::grpc::ClientContext* context, - const RequestMessage& request) { - return new ::grpc::ClientAsyncResponseReader( - channel, cq, method, context, request); -} - -} // namespace tensorflow - -#endif // THIRD_PARTY_TENSORFLOW_CORE_PLATFORM_DEFAULT_GRPC_RESPONSE_READER_H_ diff --git a/tensorflow/core/platform/grpc_response_reader.h b/tensorflow/core/platform/grpc_response_reader.h deleted file mode 100644 index e36eb698f3f..00000000000 --- a/tensorflow/core/platform/grpc_response_reader.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2017 The TensorFlow Authors. All Rights Reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -==============================================================================*/ - -#ifndef TENSORFLOW_CORE_PLATFORM_GRPC_RESPONSE_READER_H_ -#define TENSORFLOW_CORE_PLATFORM_GRPC_RESPONSE_READER_H_ - -#include "grpc++/grpc++.h" -#include "tensorflow/core/platform/platform.h" - -// Include platform-dependent grpc ClientAsyncResponseReader constructors. -// TODO(b/62910646): Remove this level of indirection once this is resolved. -#if defined(PLATFORM_GOOGLE) -#include "tensorflow/core/platform/google/grpc_response_reader.h" -#else -#include "tensorflow/core/platform/default/grpc_response_reader.h" -#endif - -namespace tensorflow { - -// Start a call and write the request out. -// The returned pointer is owned by the caller. -// See -// https://grpc.io/grpc/cpp/classgrpc_1_1_client_async_response_reader.html#ace2c5bae351f67dd7dd603fc39513e0a -// for more information. -template -::grpc::ClientAsyncResponseReader* -CreateClientAsyncResponseReader(::grpc::ChannelInterface* channel, - ::grpc::CompletionQueue* cq, - const ::grpc::RpcMethod& method, - ::grpc::ClientContext* context, - const RequestMessage& request); - -} // namespace tensorflow - -#endif // TENSORFLOW_PLATFORM_MUTEX_H_ -- GitLab