cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow specifying tag_suffix in the templated CreateModelResources method.

Browse Source 
PiperOrigin-RevId: 493375701
This commit is contained in:
Jiuqiang Tang 2022-12-06 12:07:51 -08:00 committed by Copybara-Service
parent c6e6f9e0b9
commit 6deef1a5f1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediapipe/tasks/cc/core/model_task_graph.cc
View File

@ -186,7 +186,7 @@ absl::StatusOr<const ModelResources*> ModelTaskGraph::CreateModelResources(
absl::StatusOr<const ModelAssetBundleResources*> absl::StatusOr<const ModelAssetBundleResources*>
ModelTaskGraph::CreateModelAssetBundleResources( ModelTaskGraph::CreateModelAssetBundleResources(
SubgraphContext* sc, std::unique_ptr<proto::ExternalFile> external_file, SubgraphContext* sc, std::unique_ptr<proto::ExternalFile> external_file,
const std::string tag_suffix) { std::string tag_suffix) {
auto model_resources_cache_service = sc->Service(kModelResourcesCacheService); auto model_resources_cache_service = sc->Service(kModelResourcesCacheService);
bool has_file_pointer_meta = external_file->has_file_pointer_meta(); bool has_file_pointer_meta = external_file->has_file_pointer_meta();
// if external file is set by file pointer, no need to add the model asset // if external file is set by file pointer, no need to add the model asset

8
mediapipe/tasks/cc/core/model_task_graph.h
View File

@ -59,14 +59,16 @@ class ModelTaskGraph : public Subgraph {
// creates a local model resources object that can only be used in the graph // creates a local model resources object that can only be used in the graph
// construction stage. The returned model resources pointer will provide graph // construction stage. The returned model resources pointer will provide graph
// authors with the access to the metadata extractor and the tflite model. // authors with the access to the metadata extractor and the tflite model.
// If more than one model resources are created in a graph, the model
// resources graph service add the tag_suffix to support multiple resources.
template <typename Options> template <typename Options>
absl::StatusOr<const ModelResources*> CreateModelResources( absl::StatusOr<const ModelResources*> CreateModelResources(
SubgraphContext* sc) { SubgraphContext* sc, std::string tag_suffix = "") {
auto external_file = std::make_unique<proto::ExternalFile>(); auto external_file = std::make_unique<proto::ExternalFile>();
external_file->Swap(sc->MutableOptions<Options>() external_file->Swap(sc->MutableOptions<Options>()
->mutable_base_options() ->mutable_base_options()
->mutable_model_asset()); ->mutable_model_asset());
return CreateModelResources(sc, std::move(external_file)); return CreateModelResources(sc, std::move(external_file), tag_suffix);
} }
// If the model resources graph service is available, creates a model // If the model resources graph service is available, creates a model
@ -83,7 +85,7 @@ class ModelTaskGraph : public Subgraph {
// resources. // resources.
absl::StatusOr<const ModelResources*> CreateModelResources( absl::StatusOr<const ModelResources*> CreateModelResources(
SubgraphContext* sc, std::unique_ptr<proto::ExternalFile> external_file, SubgraphContext* sc, std::unique_ptr<proto::ExternalFile> external_file,
const std::string tag_suffix = ""); std::string tag_suffix = "");
// If the model resources graph service is available, creates a model asset // If the model resources graph service is available, creates a model asset
// bundle resources object from the subgraph context, and caches the created // bundle resources object from the subgraph context, and caches the created