Skip to content

[onert] Make model-types optional in MANIFEST #16255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hseok-oh merged 1 commit into from
Oct 30, 2025
Merged

[onert] Make model-types optional in MANIFEST #16255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion runtime/onert/api/nnfw/src/nnfw_session.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@ std::string trim(std::string_view value)
return std::string(value.substr(begin, end - begin + 1));
}

std::string inferModelType(const std::string &filename)
{
std::filesystem::path file_path(filename);
std::string ext = file_path.extension().string();
return ext.empty() ? "" : ext.substr(1);
}

bool loadConfigure(const std::string cfgfile, onert::util::CfgKeyValues &keyValues)
{
std::ifstream ifs(cfgfile);
Expand Down Expand Up @@ -377,7 +384,21 @@ NNFW_STATUS nnfw_session::load_model_from_path(const char *path)
for (uint16_t i = 0; i < num_models; ++i)
{
const auto model_file_path = package_dir / models[i].asString();
const auto model_type = model_types[i].asString();
std::string model_type;

// Use model-types if available and not empty, otherwise infer from file extension
if (!model_types.empty() && i < model_types.size())
model_type = model_types[i].asString();
else
model_type = inferModelType(models[i].asString());
if (model_type.empty())
{
std::cerr << "Error: Cannot determine model type for '" << models[i].asString() << "'."
<< "Please specify model-types in MANIFEST or use a file with valid extension."
<< std::endl;
return NNFW_STATUS_ERROR;
}

auto model = loadModel(model_file_path.string(), model_type);
if (model == nullptr)
return NNFW_STATUS_ERROR;
Expand Down