Temporarily revert the WaitReady change for handles with unknown devices.

PiperOrigin-RevId: 326750064
Change-Id: Iccd79411c595b78ec1b8d2a47c3cf6fd80552b18
This commit is contained in:
Yujing Zhang 2020-08-14 16:20:42 -07:00 committed by TensorFlower Gardener
parent 108b0edc94
commit a9c09d46de
2 changed files with 11 additions and 9 deletions

View File

@ -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);

View File

@ -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();
}