Skip to content

[VitisAI] Enable ort::logger usage in compile_onnx_model_vitisai_ep_v4 #26487

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
adrianlizarraga merged 3 commits into from
Nov 6, 2025
Merged

[VitisAI] Enable ort::logger usage in compile_onnx_model_vitisai_ep_v4 #26487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1db760e
bugfix: add vaip_get_exection_provider_deletor()
wcy123 May 22, 2025
dba39f5
Enhance Vitis AI EP API: Add support for new model compilation functi…
wcy123 Nov 4, 2025
6c10e59
update onnxruntime/core/providers/vitisai/imp/global_api.cc
wcy123 Nov 4, 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
34 changes: 28 additions & 6 deletions onnxruntime/core/providers/vitisai/imp/global_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@
std::vector<std::unique_ptr<vaip_core::ExecutionProvider>>* (*compile_onnx_model_vitisai_ep_with_error_handling)(
const std::string& model_path, const onnxruntime::Graph& graph, const onnxruntime::ProviderOptions& options, void* status, vaip_core::error_report_func func);
std::vector<std::unique_ptr<vaip_core::ExecutionProvider>>* (*compile_onnx_model_vitisai_ep_v3)(
const std::filesystem::path& model_path, const onnxruntime::Graph& graph, const onnxruntime::ProviderOptions& options, void* status, vaip_core::error_report_func func);
const std::string& model_path, const onnxruntime::Graph& graph, const onnxruntime::ProviderOptions& options, void* status, vaip_core::error_report_func func);
std::vector<std::unique_ptr<vaip_core::ExecutionProvider>>* (*compile_onnx_model_vitisai_ep_v4)(
const std::string& model_path, const onnxruntime::Graph& graph, const onnxruntime::ProviderOptions& options, void* status, vaip_core::error_report_func func, const onnxruntime::logging::Logger& logger);
void (*vaip_execution_provider_deletor)(std::vector<std::unique_ptr<vaip_core::ExecutionProvider>>*) noexcept = [](std::vector<std::unique_ptr<vaip_core::ExecutionProvider>>* p) noexcept { delete p; };
uint32_t (*vaip_get_version)();
void (*create_ep_context_nodes)(
const std::vector<std::unique_ptr<vaip_core::ExecutionProvider>>& eps,
Expand Down Expand Up @@ -126,7 +129,8 @@
auto status1 = env.GetSymbolFromLibrary(handle_, "compile_onnx_model_vitisai_ep_with_error_handling", (void**)&compile_onnx_model_vitisai_ep_with_error_handling);
auto status2 = env.GetSymbolFromLibrary(handle_, "compile_onnx_model_vitisai_ep_with_options", (void**)&compile_onnx_model_with_options);
auto status3 = env.GetSymbolFromLibrary(handle_, "compile_onnx_model_vitisai_ep_v3", (void**)&compile_onnx_model_vitisai_ep_v3);
if ((!status1.IsOK()) && (!status2.IsOK()) && (!status3.IsOK())) {
auto status4 = env.GetSymbolFromLibrary(handle_, "compile_onnx_model_vitisai_ep_v4", (void**)&compile_onnx_model_vitisai_ep_v4);

Check warning on line 132 in onnxruntime/core/providers/vitisai/imp/global_api.cc

View workflow job for this annotation

GitHub Actions / Optional Lint C++ 

[cpplint] reported by reviewdog 🐶
 Using C-style cast.  Use reinterpret_cast<void**>(...) instead  [readability/casting] [4]

Raw Output:
onnxruntime/core/providers/vitisai/imp/global_api.cc:132:  Using C-style cast.  Use reinterpret_cast<void**>(...) instead  [readability/casting] [4]
if ((!status1.IsOK()) && (!status2.IsOK()) && (!status3.IsOK()) && (!status4.IsOK())) {
::onnxruntime::LogRuntimeError(0, status2, __FILE__, static_cast<const char*>(__FUNCTION__), __LINE__);
ORT_THROW(status2);
}
Expand All @@ -137,6 +141,15 @@
ORT_THROW_IF_ERROR(env.GetSymbolFromLibrary(handle_, "vitisai_ep_on_run_start", (void**)&vitisai_ep_on_run_start));
ORT_THROW_IF_ERROR(env.GetSymbolFromLibrary(handle_, "vitisai_ep_set_ep_dynamic_options", (void**)&vitisai_ep_set_ep_dynamic_options));
std::ignore = env.GetSymbolFromLibrary(handle_, "deinitialize_onnxruntime_vitisai_ep", (void**)&deinitialize_onnxruntime_vitisai_ep);
{
typedef void* (*vaip_get_execution_provider_deletor_func_t)();
vaip_get_execution_provider_deletor_func_t vaip_get_execution_provider_deletor = nullptr;
auto status = env.GetSymbolFromLibrary(handle_, "vaip_get_execution_provider_deletor",
(void**)&vaip_get_execution_provider_deletor);

Check warning on line 148 in onnxruntime/core/providers/vitisai/imp/global_api.cc

View workflow job for this annotation

GitHub Actions / Optional Lint C++ 

[cpplint] reported by reviewdog 🐶
 Using C-style cast.  Use reinterpret_cast<void**>(...) instead  [readability/casting] [4]

Raw Output:
onnxruntime/core/providers/vitisai/imp/global_api.cc:148:  Using C-style cast.  Use reinterpret_cast<void**>(...) instead  [readability/casting] [4]
if (status.IsOK()) {
vaip_execution_provider_deletor = reinterpret_cast<decltype(vaip_execution_provider_deletor)>(vaip_get_execution_provider_deletor());
};

Check warning on line 151 in onnxruntime/core/providers/vitisai/imp/global_api.cc

View workflow job for this annotation

GitHub Actions / Optional Lint C++ 

[cpplint] reported by reviewdog 🐶
 You don't need a ; after a }  [readability/braces] [4]

Raw Output:
onnxruntime/core/providers/vitisai/imp/global_api.cc:151:  You don't need a ; after a }  [readability/braces] [4]
}
}
void Clear() {
if (handle_) {
Expand Down Expand Up @@ -174,24 +187,33 @@
vaip_core::DllSafe<std::vector<std::unique_ptr<vaip_core::ExecutionProvider>>> compile_onnx_model(
const onnxruntime::GraphViewer& graph_viewer, const onnxruntime::logging::Logger& logger, const onnxruntime::ProviderOptions& options) {
auto model_path = graph_viewer.ModelPath();
if (s_library_vitisaiep.compile_onnx_model_vitisai_ep_v3) {
auto vaip_execution_provider_deletor = s_library_vitisaiep.vaip_execution_provider_deletor;
if (s_library_vitisaiep.compile_onnx_model_vitisai_ep_v4) {
Status status = Status::OK();
auto status_ptr = reinterpret_cast<void*>(&status);
auto ret = vaip_core::DllSafe(s_library_vitisaiep.compile_onnx_model_vitisai_ep_v4(model_path.u8string(), graph_viewer.GetGraph(), options, status_ptr, change_status_with_error, logger), vaip_execution_provider_deletor);
if (!status.IsOK()) {
ORT_THROW(status);
}
return ret;
} else if (s_library_vitisaiep.compile_onnx_model_vitisai_ep_v3) {
Status status = Status::OK();
auto status_ptr = reinterpret_cast<void*>(&status);
auto ret = vaip_core::DllSafe(s_library_vitisaiep.compile_onnx_model_vitisai_ep_v3(model_path, graph_viewer.GetGraph(), options, status_ptr, change_status_with_error));
auto ret = vaip_core::DllSafe(s_library_vitisaiep.compile_onnx_model_vitisai_ep_v3(model_path.u8string(), graph_viewer.GetGraph(), options, status_ptr, change_status_with_error), vaip_execution_provider_deletor);
if (!status.IsOK()) {
ORT_THROW(status);
}
return ret;
} else if (s_library_vitisaiep.compile_onnx_model_vitisai_ep_with_error_handling) {
Status status = Status::OK();
auto status_ptr = reinterpret_cast<void*>(&status);
auto ret = vaip_core::DllSafe(s_library_vitisaiep.compile_onnx_model_vitisai_ep_with_error_handling(model_path.u8string(), graph_viewer.GetGraph(), options, status_ptr, change_status_with_error));
auto ret = vaip_core::DllSafe(s_library_vitisaiep.compile_onnx_model_vitisai_ep_with_error_handling(model_path.u8string(), graph_viewer.GetGraph(), options, status_ptr, change_status_with_error), vaip_execution_provider_deletor);
if (!status.IsOK()) {
ORT_THROW(status);
}
return ret;
} else {
return vaip_core::DllSafe(s_library_vitisaiep.compile_onnx_model_with_options(model_path.u8string(), graph_viewer.GetGraph(), options));
return vaip_core::DllSafe(s_library_vitisaiep.compile_onnx_model_with_options(model_path.u8string(), graph_viewer.GetGraph(), options), vaip_execution_provider_deletor);
}
}

Expand Down
4 changes: 3 additions & 1 deletion onnxruntime/core/providers/vitisai/include/vaip/dll_safe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
: value_{value}, deleter_{[](T* value) noexcept {
std::default_delete<T>()(value);
}} {}

explicit DllSafe(T* value, void (*deleter)(T*) noexcept)

Check warning on line 20 in onnxruntime/core/providers/vitisai/include/vaip/dll_safe.h

View workflow job for this annotation

GitHub Actions / Optional Lint C++ 

[cpplint] reported by reviewdog 🐶
 Using C-style cast.  Use reinterpret_cast<T*>(...) instead  [readability/casting] [4]

Raw Output:
onnxruntime/core/providers/vitisai/include/vaip/dll_safe.h:20:  Using C-style cast.  Use reinterpret_cast<T*>(...) instead  [readability/casting] [4]
: value_{value}, deleter_{deleter} {
}
explicit DllSafe(T&& value) : DllSafe(new T(std::move(value))) {}
explicit DllSafe(const T& value) : DllSafe(new T(value)) {}

Expand Down
Loading