From e971a25b8d17619bc5443f1a3527506c12cc9b6e Mon Sep 17 00:00:00 2001
From: Haoyu Zhang <haoyuzhang@google.com>
Date: Fri, 20 Nov 2020 18:47:08 -0800
Subject: [PATCH] Do not access ResourceManager of remote devices in clearing
 resource container.

PiperOrigin-RevId: 343604092
Change-Id: I2c1bd34e643233d0564b914c1175670499245fe7
---
 tensorflow/core/common_runtime/eager/context.cc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tensorflow/core/common_runtime/eager/context.cc b/tensorflow/core/common_runtime/eager/context.cc
index b9fda0d4048..1922cdf0937 100644
--- a/tensorflow/core/common_runtime/eager/context.cc
+++ b/tensorflow/core/common_runtime/eager/context.cc
@@ -993,12 +993,6 @@ void EagerContext::ClearResourceContainer(const string& name) {
     // Only ignore container not found errors.
     device->resource_manager()->Cleanup(name).IgnoreError();
   }
-  if (remote_device_mgr() != nullptr) {
-    auto remote_devices = remote_device_mgr()->ListDevices();
-    for (Device* device : remote_devices) {
-      device->resource_manager()->Cleanup(name).IgnoreError();
-    }
-  }
 }
 
 namespace {