From a9c09d46dec3ab1de464074fa5810e573c35c6dc Mon Sep 17 00:00:00 2001 From: Yujing Zhang Date: Fri, 14 Aug 2020 16:20:42 -0700 Subject: [PATCH] Temporarily revert the WaitReady change for handles with unknown devices. PiperOrigin-RevId: 326750064 Change-Id: Iccd79411c595b78ec1b8d2a47c3cf6fd80552b18 --- tensorflow/c/eager/c_api_remote_function_test.cc | 5 +++-- .../core/common_runtime/eager/tensor_handle.cc | 15 ++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tensorflow/c/eager/c_api_remote_function_test.cc b/tensorflow/c/eager/c_api_remote_function_test.cc index a9bbd5b694f..52488e62c37 100644 --- a/tensorflow/c/eager/c_api_remote_function_test.cc +++ b/tensorflow/c/eager/c_api_remote_function_test.cc @@ -30,12 +30,13 @@ TEST(CAPI, RemoteExecuteSilentCopiesAsyncFunc) { TestRemoteExecuteSilentCopiesFunc(/*async=*/true, /*remote=*/true, /*heavy_load_on_streaming_rpc=*/false); } -TEST(CAPI, RemoteExecuteSilentCopiesFuncRemoteOutputs) { +// TODO(b/164506563): Re-enable after the fix. +TEST(CAPI, DISABLED_RemoteExecuteSilentCopiesFuncRemoteOutputs) { TestRemoteExecuteSilentCopiesFunc(/*async=*/false, /*remote=*/true, /*heavy_load_on_streaming_rpc=*/false, /*remote_func_outputs=*/true); } -TEST(CAPI, RemoteExecuteSilentCopiesAsyncFuncRemoteOutputs) { +TEST(CAPI, DISABLED_RemoteExecuteSilentCopiesAsyncFuncRemoteOutputs) { TestRemoteExecuteSilentCopiesFunc(/*async=*/true, /*remote=*/true, /*heavy_load_on_streaming_rpc=*/false, /*remote_func_outputs=*/true); diff --git a/tensorflow/core/common_runtime/eager/tensor_handle.cc b/tensorflow/core/common_runtime/eager/tensor_handle.cc index 620685ea3c1..adf1b5568c1 100644 --- a/tensorflow/core/common_runtime/eager/tensor_handle.cc +++ b/tensorflow/core/common_runtime/eager/tensor_handle.cc @@ -539,13 +539,14 @@ Status TensorHandle::TensorValue(const Device* d, tensorflow::TensorValue* t) { } Status TensorHandle::WaitUnknownDevice() const { - if (unknown_device_) { - TF_RETURN_IF_ERROR(absl::visit( - [](auto& data) { - return data.WaitReady("TensorHandle::UnknownDevice"); - }, - data_)); - } + // TODO(b/164506563): uncomment this when b/164506563 is fixed. + // if (unknown_device_) { + // TF_RETURN_IF_ERROR(absl::visit( + // [](auto& data) { + // return data.WaitReady("TensorHandle::UnknownDevice"); + // }, + // data_)); + // } return Status::OK(); }