Automated Code Change

PiperOrigin-RevId: 685173649
tensorflow · Oct 12, 2024 · de3fcd4 · de3fcd4
1 parent d35f71f
commit de3fcd4
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 25 deletions.
diff --git a/tensorflow_serving/resources/resource_tracker.cc b/tensorflow_serving/resources/resource_tracker.cc
@@ -28,9 +28,10 @@ limitations under the License.
 namespace tensorflow {
 namespace serving {
 
-Status ResourceTracker::Create(const ResourceAllocation& total_resources,
-                               std::unique_ptr<ResourceUtil> util,
-                               std::unique_ptr<ResourceTracker>* tracker) {
+absl::Status ResourceTracker::Create(
+    const ResourceAllocation& total_resources,
+    std::unique_ptr<ResourceUtil> util,
+    std::unique_ptr<ResourceTracker>* tracker) {
   TF_RETURN_IF_ERROR(util->VerifyValidity(total_resources));
   const ResourceAllocation normalized_total_resources =
       util->Normalize(total_resources);
@@ -40,11 +41,11 @@ Status ResourceTracker::Create(const ResourceAllocation& total_resources,
   }
   tracker->reset(
       new ResourceTracker(normalized_total_resources, std::move(util)));
-  return Status();
+  return absl::Status();
 }
 
-Status ResourceTracker::ReserveResources(const Loader& servable,
-                                         bool* success) {
+absl::Status ResourceTracker::ReserveResources(const Loader& servable,
+                                               bool* success) {
   ResourceAllocation servable_resources;
   TF_RETURN_IF_ERROR(servable.EstimateResources(&servable_resources));
   TF_RETURN_IF_ERROR(util_->VerifyValidity(servable_resources));
@@ -68,10 +69,10 @@ Status ResourceTracker::ReserveResources(const Loader& servable,
     *success = false;
   }
 
-  return Status();
+  return absl::Status();
 }
 
-Status ResourceTracker::RecomputeUsedResources(
+absl::Status ResourceTracker::RecomputeUsedResources(
     const std::vector<const Loader*>& servables) {
   used_resources_.Clear();
   for (const Loader* servable : servables) {
@@ -80,7 +81,7 @@ Status ResourceTracker::RecomputeUsedResources(
     TF_RETURN_IF_ERROR(util_->VerifyValidity(servable_resources));
     util_->Add(servable_resources, &used_resources_);
   }
-  return Status();
+  return absl::Status();
 }
 
 ResourceTracker::ResourceTracker(const ResourceAllocation& total_resources,

diff --git a/tensorflow_serving/resources/resource_tracker_test.cc b/tensorflow_serving/resources/resource_tracker_test.cc
@@ -92,7 +92,7 @@ class ResourceTrackerTest : public ::testing::Test {
               "  } "
               "  quantity: 3 "
               "} ");
-          return Status();
+          return absl::Status();
         }));
 
     loader_1_.reset(new NiceMock<test_util::MockLoader>);
@@ -114,7 +114,7 @@ class ResourceTrackerTest : public ::testing::Test {
               "  } "
               "  quantity: 7 "
               "} ");
-          return Status();
+          return absl::Status();
         }));
 
     loader_2_.reset(new NiceMock<test_util::MockLoader>);
@@ -128,7 +128,7 @@ class ResourceTrackerTest : public ::testing::Test {
               "  } "
               "  quantity: 15 "
               "} ");
-          return Status();
+          return absl::Status();
         }));
 
     loader_3_.reset(new NiceMock<test_util::MockLoader>);
@@ -142,7 +142,7 @@ class ResourceTrackerTest : public ::testing::Test {
               "  } "
               "  quantity: 12 "
               "} ");
-          return Status();
+          return absl::Status();
         }));
 
     invalid_resources_loader_.reset(new NiceMock<test_util::MockLoader>);
@@ -157,7 +157,7 @@ class ResourceTrackerTest : public ::testing::Test {
               "  } "
               "  quantity: 4 "
               "} ");
-          return Status();
+          return absl::Status();
         }));
 
     // Disallow calls to Load()/Unload().

diff --git a/tensorflow_serving/resources/resource_util.cc b/tensorflow_serving/resources/resource_util.cc
@@ -96,9 +96,9 @@ ResourceAllocation::Entry* FindOrInsertMutableEntry(
 ResourceUtil::ResourceUtil(const Options& options)
     : devices_(StripDevicesWithZeroInstances(options.devices)) {}
 
-Status ResourceUtil::VerifyValidity(
+absl::Status ResourceUtil::VerifyValidity(
     const ResourceAllocation& allocation) const {
-  const Status result = [this, &allocation]() -> Status {
+  const absl::Status result = [this, &allocation]() -> absl::Status {
     // We use 'validated_entries' to look for duplicates.
     ResourceAllocation validated_entries;
     for (const auto& entry : allocation.resource_quantities()) {
@@ -115,7 +115,7 @@ Status ResourceUtil::VerifyValidity(
 
       *validated_entries.add_resource_quantities() = entry;
     }
-    return Status();
+    return absl::Status();
   }();
   if (!result.ok()) {
     LOG(ERROR) << result;
@@ -124,8 +124,9 @@ Status ResourceUtil::VerifyValidity(
   return result;
 }
 
-Status ResourceUtil::VerifyResourceValidity(const Resource& resource) const {
-  const Status result = [this, &resource]() -> Status {
+absl::Status ResourceUtil::VerifyResourceValidity(
+    const Resource& resource) const {
+  const absl::Status result = [this, &resource]() -> absl::Status {
     auto it = devices_.find(resource.device());
     if (it == devices_.end()) {
       return errors::InvalidArgument(
@@ -138,7 +139,7 @@ Status ResourceUtil::VerifyResourceValidity(const Resource& resource) const {
           "Invalid resource allocation: Invalid device instance ",
           resource.device(), ":", resource.device_instance().value());
     }
-    return Status();
+    return absl::Status();
   }();
   if (!result.ok()) {
     LOG(ERROR) << result;
@@ -147,7 +148,7 @@ Status ResourceUtil::VerifyResourceValidity(const Resource& resource) const {
   return result;
 }
 
-Status ResourceUtil::VerifyOverrideDeviceValidity(
+absl::Status ResourceUtil::VerifyOverrideDeviceValidity(
     const ResourceAllocation& base_allocation,
     const ResourceAllocation& override_allocation) const {
   absl::flat_hash_set<std::pair<std::string, std::string>>
@@ -166,7 +167,7 @@ Status ResourceUtil::VerifyOverrideDeviceValidity(
           entry.resource().DebugString());
     }
   }
-  return Status();
+  return absl::Status();
 }
 
 ResourceAllocation ResourceUtil::Normalize(
@@ -323,9 +324,10 @@ bool ResourceUtil::IsBoundNormalized(
   return true;
 }
 
-Status ResourceUtil::VerifyFunctionInternal(
-    std::function<Status()> fn, DCHECKFailOption dcheck_fail_option) const {
-  const Status result = fn();
+absl::Status ResourceUtil::VerifyFunctionInternal(
+    std::function<absl::Status()> fn,
+    DCHECKFailOption dcheck_fail_option) const {
+  const absl::Status result = fn();
 
   if (dcheck_fail_option == DCHECKFailOption::kDoDCHECKFail) {
     TF_DCHECK_OK(result);