Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Extending G-API onnx::Params to pass arbitrary session options #25791

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
merged 8 commits into from
Jun 21, 2024
Merged

Extending G-API onnx::Params to pass arbitrary session options #25791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ce66849
Extend G-API onnx::Params to pass arbitrary session options
Jun 20, 2024
8ecb4da
Addressed comments and corrected build error
Jun 20, 2024
afcfba6
Corrected a formatting error
Jun 20, 2024
d03320b
Corrected a formatting error
Jun 20, 2024
3386df5
Addressed some docstring comments
Jun 20, 2024
d6801e9
Modified the docstring
Jun 20, 2024
51ecf1b
Reverted back to the train constructor
Jun 20, 2024
bb5d50e
Added cfgSessionOptions to generic Params and made python related
Jun 20, 2024
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
3 changes: 3 additions & 0 deletions modules/gapi/include/opencv2/gapi/infer/bindings_onnx.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ class GAPI_EXPORTS_W_SIMPLE PyParams {
GAPI_WRAP
PyParams& cfgDisableMemPattern();

GAPI_WRAP
PyParams& cfgSessionOptions(const std::map<std::string, std::string>& options);

GBackend backend() const;
std::string tag() const;
cv::util::any params() const;
Expand Down
21 changes: 20 additions & 1 deletion modules/gapi/include/opencv2/gapi/infer/onnx.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ struct ParamDesc {
std::unordered_map<std::string, std::pair<cv::Scalar, cv::Scalar> > generic_mstd;
std::unordered_map<std::string, bool> generic_norm;

std::map<std::string, std::string> session_options;
std::vector<cv::gapi::onnx::ep::EP> execution_providers;
bool disable_mem_pattern;
};
Expand Down Expand Up @@ -634,6 +635,19 @@ template<typename Net> class Params {
return *this;
}

/** @brief Configures session options for ONNX Runtime.

This function is used to set various session options for the ONNX Runtime
session by accepting a map of key-value pairs.

@param options A map of session option to be applied to the ONNX Runtime session.
@return the reference on modified object.
*/
Params<Net>& cfgSessionOptions(const std::map<std::string, std::string>& options) {
desc.session_options.insert(options.begin(), options.end());
return *this;
}

// BEGIN(G-API's network parametrization API)
GBackend backend() const { return cv::gapi::onnx::backend(); }
std::string tag() const { return Net::tag(); }
Expand Down Expand Up @@ -661,7 +675,7 @@ class Params<cv::gapi::Generic> {
@param model_path path to model file (.onnx file).
*/
Params(const std::string& tag, const std::string& model_path)
: desc{model_path, 0u, 0u, {}, {}, {}, {}, {}, {}, {}, {}, {}, true, {}, {}, {}, false }, m_tag(tag) {}
: desc{model_path, 0u, 0u, {}, {}, {}, {}, {}, {}, {}, {}, {}, true, {}, {}, {}, {}, false}, m_tag(tag) {}
Copy link
Contributor

@TolyaTalamanov TolyaTalamanov Jun 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚋🚋🚋


/** @see onnx::Params::cfgMeanStdDev. */
void cfgMeanStdDev(const std::string &layer,
Expand Down Expand Up @@ -705,6 +719,11 @@ class Params<cv::gapi::Generic> {
desc.disable_mem_pattern = true;
}

/** @see onnx::Params::cfgSessionOptions. */
void cfgSessionOptions(const std::map<std::string, std::string>& options) {
desc.session_options.insert(options.begin(), options.end());
}

// BEGIN(G-API's network parametrization API)
GBackend backend() const { return cv::gapi::onnx::backend(); }
std::string tag() const { return m_tag; }
Expand Down
6 changes: 6 additions & 0 deletions modules/gapi/src/backends/onnx/bindings_onnx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ cv::gapi::onnx::PyParams::cfgDisableMemPattern() {
return *this;
}

cv::gapi::onnx::PyParams&
cv::gapi::onnx::PyParams::cfgSessionOptions(const std::map<std::string, std::string>& options) {
m_priv->cfgSessionOptions(options);
return *this;
}

cv::gapi::GBackend cv::gapi::onnx::PyParams::backend() const {
return m_priv->backend();
}
Expand Down
4 changes: 4 additions & 0 deletions modules/gapi/src/backends/onnx/gonnxbackend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,10 @@ ONNXCompiled::ONNXCompiled(const gapi::onnx::detail::ParamDesc &pp)
cv::gimpl::onnx::addExecutionProvider(&session_options, ep);
}

for (const auto &option : pp.session_options) {
session_options.AddConfigEntry(option.first.c_str(), option.second.c_str());
}

if (pp.disable_mem_pattern) {
session_options.DisableMemPattern();
}
Expand Down