Skip to content

Support workload type for dynamic shaped models #690

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 3 commits into from
May 26, 2025
Merged

Support workload type for dynamic shaped models #690

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
7082dfd
Support workload type for dynamic shaped models
preetha-intel May 12, 2025
0202653
Merge branch 'ovep-develop' into preetha/dynamic_workload_type
preetha-intel May 21, 2025
af7d89b
Merge branch 'ovep-develop' into preetha/dynamic_workload_type
preetha-intel May 26, 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
7 changes: 4 additions & 3 deletions onnxruntime/core/providers/openvino/backend_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ SessionContext& BackendManager::GetSessionContext() {
return session_context_;
}

ov::CompiledModel& BackendManager::GetOVCompiledModel() {
ov::CompiledModel& ov_ptr = concrete_backend_->GetOVCompiledModel();
return (ov_ptr);
ov::CompiledModel BackendManager::GetOVCompiledModel() {
if (concrete_backend_)
return concrete_backend_->GetOVCompiledModel();
return ov::CompiledModel();
}

BackendManager::BackendManager(SessionContext& session_context,
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/openvino/backend_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class BackendManager {
void ShutdownBackendManager();
SessionContext& GetSessionContext();
Status ExportCompiledBlobAsEPCtxNode(const onnxruntime::GraphViewer& subgraph);
ov::CompiledModel& GetOVCompiledModel();
ov::CompiledModel GetOVCompiledModel();

private:
std::unique_ptr<ONNX_NAMESPACE::ModelProto> GetModelProtoFromFusedNode(
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/openvino/backends/basic_backend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class BasicBackend : public IBackend {

void Infer(OrtKernelContext* context) override;
~BasicBackend() override = default;
ov::CompiledModel& GetOVCompiledModel() override {
ov::CompiledModel GetOVCompiledModel() override {
return exe_network_.Get();
}

Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/openvino/ibackend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace openvino_ep {
class IBackend {
public:
virtual void Infer(OrtKernelContext* context) = 0;
virtual ov::CompiledModel& GetOVCompiledModel() = 0;
virtual ov::CompiledModel GetOVCompiledModel() = 0;
virtual ~IBackend() = default;
};
using ptr_stream_t = std::unique_ptr<std::istream>;
Expand Down
16 changes: 13 additions & 3 deletions onnxruntime/core/providers/openvino/openvino_execution_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,20 @@ common::Status OpenVINOExecutionProvider::SetEpDynamicOptions(gsl::span<const ch
LOGS_DEFAULT(WARNING) << "Supported types are 'Efficient' and 'Default' \n";
}
if (workload_type != "") {
LOGS_DEFAULT(INFO) << "SetEpDynamicOptions - modifying: " << key << "/" << value;
LOGS_DEFAULT(VERBOSE) << "SetEpDynamicOptions - modifying: " << key << "/" << value;
for (auto& backend : backend_managers_) {
ov::CompiledModel& ov_compiled_model = backend.GetOVCompiledModel();
ov_compiled_model.set_property(ov::workload_type(workload_type));
ov::CompiledModel ov_compiled_model = backend.GetOVCompiledModel();
if(ov_compiled_model) {
ov_compiled_model.set_property(ov::workload_type(workload_type));
} else {
LOGS_DEFAULT(VERBOSE) << "Model is not compiled in OV as its dynamic";
ov::AnyMap map;
map["WORKLOAD_TYPE"] = workload_type;
if (session_context_.device_type == "NPU")
session_context_.load_config["NPU"] = std::move(map);
else
ORT_THROW(" WORKLOAD_TYPE property is supported only for NPU");
}
}
}
} else {
Expand Down
Loading