From 317c2b8460d0475ec6707aa3c9eabd515e985e0c Mon Sep 17 00:00:00 2001 From: Cesar Crusius Date: Tue, 3 Nov 2020 16:41:25 -0800 Subject: [PATCH] Remove unused ListFunctions API from experimental C Saved Model interface. PiperOrigin-RevId: 340550186 Change-Id: Ie4197ed3a0c293a6504da90be287308f39453351 --- .../c/experimental/saved_model/core/saved_model_api.h | 2 -- .../experimental/saved_model/core/tf_saved_model_api.cc | 9 --------- .../c/experimental/saved_model/core/tf_saved_model_api.h | 2 -- .../experimental/saved_model/internal/saved_model_api.cc | 5 ----- .../c/experimental/saved_model/public/saved_model_api.h | 5 ----- .../cc/saved_model/experimental/public/saved_model_api.h | 8 -------- 6 files changed, 31 deletions(-) diff --git a/tensorflow/c/experimental/saved_model/core/saved_model_api.h b/tensorflow/c/experimental/saved_model/core/saved_model_api.h index ff891e13ba4..dd06aa89682 100644 --- a/tensorflow/c/experimental/saved_model/core/saved_model_api.h +++ b/tensorflow/c/experimental/saved_model/core/saved_model_api.h @@ -46,8 +46,6 @@ class SavedModelAPI { virtual Status GetSignatureDefFunction(const std::string& signature_def_key, SignatureDefFunction** function) = 0; - virtual std::vector ListFunctions() = 0; - virtual ~SavedModelAPI() = default; }; diff --git a/tensorflow/c/experimental/saved_model/core/tf_saved_model_api.cc b/tensorflow/c/experimental/saved_model/core/tf_saved_model_api.cc index f0990235963..159f41e369e 100644 --- a/tensorflow/c/experimental/saved_model/core/tf_saved_model_api.cc +++ b/tensorflow/c/experimental/saved_model/core/tf_saved_model_api.cc @@ -211,15 +211,6 @@ Status TFSavedModelAPI::GetSignatureDefFunction( return Status(); } -std::vector TFSavedModelAPI::ListFunctions() { - std::vector result; - result.reserve(revived_objects_.concrete_functions.size()); - for (auto& index_and_function : revived_objects_.concrete_functions) { - result.push_back(index_and_function.second.get()); - } - return result; -} - Status TFSavedModelAPI::GetVariable(const std::string& variable_path, Variable** variable) { absl::optional node = diff --git a/tensorflow/c/experimental/saved_model/core/tf_saved_model_api.h b/tensorflow/c/experimental/saved_model/core/tf_saved_model_api.h index bc39a974ad2..45c8673e65f 100644 --- a/tensorflow/c/experimental/saved_model/core/tf_saved_model_api.h +++ b/tensorflow/c/experimental/saved_model/core/tf_saved_model_api.h @@ -66,8 +66,6 @@ class TFSavedModelAPI : public SavedModelAPI { ImmediateExecutionContext* context, std::unique_ptr* out); - std::vector ListFunctions() override; - ~TFSavedModelAPI() override = default; Status GetVariable(const std::string& variable_path, Variable** variable); diff --git a/tensorflow/c/experimental/saved_model/internal/saved_model_api.cc b/tensorflow/c/experimental/saved_model/internal/saved_model_api.cc index b89fb9f6d64..cb2e5751bed 100644 --- a/tensorflow/c/experimental/saved_model/internal/saved_model_api.cc +++ b/tensorflow/c/experimental/saved_model/internal/saved_model_api.cc @@ -122,9 +122,4 @@ TF_GetSavedModelSignatureDefFunction(TF_SavedModel* model, return tensorflow::wrap(result); } -TF_ConcreteFunctionList* TF_ListSavedModelFunctions(TF_SavedModel* model) { - return new TF_ConcreteFunctionList{ - tensorflow::unwrap(model)->ListFunctions()}; -} - } // end extern "C" diff --git a/tensorflow/c/experimental/saved_model/public/saved_model_api.h b/tensorflow/c/experimental/saved_model/public/saved_model_api.h index 80ba37bab26..cef7fe860e5 100644 --- a/tensorflow/c/experimental/saved_model/public/saved_model_api.h +++ b/tensorflow/c/experimental/saved_model/public/saved_model_api.h @@ -100,11 +100,6 @@ TF_GetSavedModelSignatureDefFunction(TF_SavedModel* model, const char* signature_def_key, TF_Status* status); -// Returns a list of all ConcreteFunctions stored in this SavedModel. -// The lifetime of the returned list is bound to `model`. -TF_CAPI_EXPORT extern TF_ConcreteFunctionList* TF_ListSavedModelFunctions( - TF_SavedModel* model); - #ifdef __cplusplus } // end extern "C" #endif // __cplusplus diff --git a/tensorflow/cc/saved_model/experimental/public/saved_model_api.h b/tensorflow/cc/saved_model/experimental/public/saved_model_api.h index 9925f99855d..9d30a4a20ad 100644 --- a/tensorflow/cc/saved_model/experimental/public/saved_model_api.h +++ b/tensorflow/cc/saved_model/experimental/public/saved_model_api.h @@ -84,9 +84,6 @@ class SavedModelAPI { SignatureDefFunction* GetSignatureDefFunction( const std::string& function_path, Status* status); - // Lists all Concrete Functions available from the SavedModel. - std::vector ListFunctions(); - // SavedModelAPI is movable, but not copyable. SavedModelAPI(SavedModelAPI&&) = default; SavedModelAPI& operator=(SavedModelAPI&&) = default; @@ -151,11 +148,6 @@ inline SignatureDefFunction* SavedModelAPI::GetSignatureDefFunction( return SignatureDefFunction::wrap(function); } -inline std::vector SavedModelAPI::ListFunctions() { - ConcreteFunctionList list(TF_ListSavedModelFunctions(saved_model_.get())); - return list.ToVector(); -} - } // namespace cc } // namespace experimental } // namespace tensorflow