-
Notifications
You must be signed in to change notification settings - Fork 57
CVS-175736 - [OVEP] Optimize Stateful Path: use output-to-input strategy to get the pairs of KV name #845
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.
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
base: ovep-develop
Are you sure you want to change the base?
CVS-175736 - [OVEP] Optimize Stateful Path: use output-to-input strategy to get the pairs of KV name #845
Changes from 2 commits
d44a556
1634684
f6b3c63
165a7cd
8565e29
a873e7b
5d5d1f2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |||
| // Licensed under the MIT License | ||||
|
|
||||
| #include "core/providers/openvino/ov_stateful_patch_utils.h" | ||||
| #include "regex" | ||||
Kotomi-Du marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||
|
|
||||
| namespace onnxruntime { | ||||
| namespace openvino_ep { | ||||
|
|
@@ -134,44 +135,100 @@ | |||
|
|
||||
| // Converted to C++ from below reference URL: | ||||
| // https://github.com/huggingface/optimum-intel/blob/main/optimum/exporters/openvino/stateful.py#L281 | ||||
| void PatchStatefulDecoder(std::shared_ptr<ov::Model> model) { | ||||
| // Helper function to extract KV patterns from output names dynamically | ||||
| std::pair<std::vector<std::string>, std::vector<std::string>> ExtractKVPatternsFromOutputs(const std::shared_ptr<ov::Model>& model) { | ||||
|
||||
| std::set<std::string> unique_patterns; | ||||
|
||||
| std::vector<std::string> key_value_output_names; | ||||
|
|
||||
| // Regex to match "present_" prefix and numeric suffix | ||||
| std::regex present_pattern(R"(present_(.+)_(\d+))"); | ||||
|
|
||||
| // Scan all outputs with "present" in the name | ||||
| for (const ov::Output<ov::Node>& output : model->outputs()) { | ||||
| const auto& names = output.get_names(); | ||||
| for (const auto& name : names) { | ||||
| if (name.starts_with("present")) { | ||||
| key_value_output_names.push_back(name); | ||||
| std::smatch match; | ||||
| if (std::regex_match(name, match, present_pattern)) { | ||||
|
||||
| // Extract the middle part (between "present_" and "_number") | ||||
|
||||
| std::string pattern = match[1].str(); | ||||
| unique_patterns.insert(pattern); | ||||
Kotomi-Du marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||
| } | ||||
| break; | ||||
| } | ||||
| } | ||||
| } | ||||
|
|
||||
| std::vector<std::string> extracted_patterns(unique_patterns.begin(), unique_patterns.end()); | ||||
|
||||
|
|
||||
| return std::make_pair(key_value_output_names, extracted_patterns); | ||||
| } | ||||
|
|
||||
| // Main function to extract KV tensors using dynamic pattern matching | ||||
| std::pair<std::vector<std::string>, std::vector<std::string>> ExtractInputKVTensors( | ||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The same here, consider switching to
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Each element in |
||||
| const std::shared_ptr<ov::Model>& model, const std::vector<std::string>& patterns) { | ||||
|
|
||||
| std::vector<std::string> key_value_input_names; | ||||
| std::vector<std::string> not_kv_inputs; | ||||
|
|
||||
| if (patterns.empty()) { | ||||
| // Fallback: use original substring matching | ||||
| for (const ov::Output<ov::Node>& input : model->inputs()) { | ||||
| const auto& names = input.get_names(); | ||||
| const std::string input_name = input.get_any_name(); | ||||
|
|
||||
| bool is_kv_input = false; | ||||
| for (const auto& name : names) { | ||||
| if (name.find("key_values") != std::string::npos || | ||||
| name.find("keys") != std::string::npos || | ||||
| name.find("values") != std::string::npos) { | ||||
| key_value_input_names.push_back(name); | ||||
| is_kv_input = true; | ||||
| break; | ||||
| } | ||||
| } | ||||
|
|
||||
| if (!is_kv_input) { | ||||
| not_kv_inputs.push_back(input_name); | ||||
| } | ||||
| } | ||||
|
|
||||
| return std::make_pair(key_value_input_names, not_kv_inputs); | ||||
| } | ||||
|
|
||||
| std::set<std::string> found_kv_inputs; | ||||
|
Check warning on line 200 in onnxruntime/core/providers/openvino/ov_stateful_patch_utils.cc
|
||||
|
||||
| std::set<std::string> found_kv_inputs; |
Kotomi-Du marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This logic contradicts the comment above. If we find a pattern in the name, we won't check other names. Is that an expected behavior?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, it is expected behavior. I rephrased the comment.
RyanMetcalfeInt8 marked this conversation as resolved.
Show resolved
Hide resolved
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same for here as below -- I think there should be a runtime exception thrown here. I don't think we'd ever intend for the stateful flow to get enabled, and not identify pairs of tensors to perform a make_stateful transformation on.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated
Uh oh!
There was an error while loading. Please reload this page.