Merge remote-tracking branch 'upstream/master' into develop-upstream-…

…sync-220711 [merge conflicts resolved]
fsx950223 · Jul 11, 2022 · 45d7533 · 45d7533
1 parent bb08c1f
commit 45d7533
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/tensorflow/core/tfrt/saved_model/BUILD b/tensorflow/core/tfrt/saved_model/BUILD
@@ -35,10 +35,6 @@ cc_library(
     tags = ["no_oss"],
     deps = [
         "@com_google_absl//absl/container:flat_hash_map",
-<<<<<<< HEAD
-#        "@com_google_absl//absl/log:check",
-=======
->>>>>>> upstream/master
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/types:span",

diff --git a/tensorflow/stream_executor/multi_platform_manager.cc b/tensorflow/stream_executor/multi_platform_manager.cc
@@ -127,24 +127,19 @@ port::StatusOr<Platform*> MultiPlatformManagerImpl::PlatformWithId(
 port::StatusOr<Platform*> MultiPlatformManagerImpl::PlatformWithName(
     absl::string_view target, bool initialize_platform) {
   absl::MutexLock lock(&mu_);
-<<<<<<< HEAD
   Platform * platform = 0;
   if(target == "cuda" || target == "CUDA") {
     port::StatusOr<Platform*> lookup = LookupByNameLocked("cuda");
     if(lookup.ok())
       platform = lookup.value();
     else {
-      SE_ASSIGN_OR_RETURN(platform, LookupByNameLocked("rocm"));
+      TF_ASSIGN_OR_RETURN(platform, LookupByNameLocked("rocm"));
     }
   } else {
     if(target == "cuda_only")
       target = "cuda";
-    SE_ASSIGN_OR_RETURN(platform, LookupByNameLocked(target));
+    TF_ASSIGN_OR_RETURN(platform, LookupByNameLocked(target));
   }
-=======
-
-  TF_ASSIGN_OR_RETURN(Platform * platform, LookupByNameLocked(target));
->>>>>>> upstream/master
   if (initialize_platform && !platform->Initialized()) {
     TF_RETURN_IF_ERROR(platform->Initialize({}));
   }