Skip to content

Avoid adding providers if not requested #1464

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
Baiju Meswani (baijumeswani) merged 3 commits into from
May 8, 2025
Merged

Avoid adding providers if not requested #1464

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7925b6
Avoid adding providers if not requested
baijumeswani May 8, 2025
9038ca9
Address PR comments
baijumeswani May 8, 2025
a97bc57
typo
baijumeswani May 8, 2025
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
25 changes: 14 additions & 11 deletions src/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ struct ProviderOptionsObject_Element : JSON::Element {
};

struct ProviderOptionsArray_Element : JSON::Element {
explicit ProviderOptionsArray_Element(std::vector<Config::ProviderOptions>& v, std::vector<std::string>& providers)
: v_{v}, providers_{providers} {}
explicit ProviderOptionsArray_Element(std::vector<Config::ProviderOptions>& v) : v_{v} {}

JSON::Element& OnObject(std::string_view name) override { return object_; }

Expand All @@ -69,18 +68,11 @@ struct ProviderOptionsArray_Element : JSON::Element {
} else if (v.name == "dml") {
v.name = "DML";
}

if (std::find(providers_.begin(), providers_.end(), v.name) == providers_.end()) {
// The providers array determines the which execution provider is picked for the session..
// It also determines the order of the providers.
providers_.push_back(v.name);
}
}
}

private:
std::vector<Config::ProviderOptions>& v_;
std::vector<std::string>& providers_;
ProviderOptionsObject_Element object_{v_};
};

Expand Down Expand Up @@ -151,7 +143,7 @@ struct SessionOptions_Element : JSON::Element {

private:
Config::SessionOptions& v_;
ProviderOptionsArray_Element provider_options_{v_.provider_options, v_.providers};
ProviderOptionsArray_Element provider_options_{v_.provider_options};
NamedStrings_Element config_entries_{v_.config_entries};
};

Expand Down Expand Up @@ -723,13 +715,20 @@ void ClearProviders(Config& config) {
}

void SetProviderOption(Config& config, std::string_view provider_name, std::string_view option_name, std::string_view option_value) {
if (std::find(config.model.decoder.session_options.providers.begin(),
config.model.decoder.session_options.providers.end(), provider_name) ==
config.model.decoder.session_options.providers.end()) {
config.model.decoder.session_options.providers.push_back(std::string(provider_name));
}

std::ostringstream json;
json << R"({")" << provider_name << R"(":{)";
if (!option_name.empty()) {
json << R"(")" << option_name << R"(":")" << option_value << R"(")";
}
json << R"(}})";
ProviderOptionsArray_Element element{config.model.decoder.session_options.provider_options, config.model.decoder.session_options.providers};

ProviderOptionsArray_Element element{config.model.decoder.session_options.provider_options};
JSON::Parse(element, json.str());
}

Expand Down Expand Up @@ -830,6 +829,10 @@ Config::Config(const fs::path& path, std::string_view json_overlay) : config_pat

if (search.max_length == 0)
search.max_length = model.context_length;

for (const auto& provider_option : model.decoder.session_options.provider_options) {
model.decoder.session_options.providers.push_back(provider_option.name);
}
}

void Config::AddMapping(const std::string& nominal_name, const std::string& graph_name) {
Expand Down