saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-13 18:08:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix compiler error

Browse source
This commit is contained in:
Chi Lo 2025-02-06 16:47:44 -08:00
parent 3360dfd422
commit 5f7da9f7f4
7 changed files with 65 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
onnxruntime/core/framework/compute_capability.h
View file

@ -30,6 +30,9 @@ struct ComputeCapability {
// Optimization: std::function<Status(const Graph& graph, const ComputeCapability& this_optimization, ComputeCapability& cc_to_update)>
std::function<Status(Graph&, const ComputeCapability&, ComputeCapability&)> optimization_func;
// Optional key/value strings to configure an optimizer
std::unordered_map<std::string, std::string> optimization_configs;
// optional ComputeCapability instances for sets of nodes within this ComputeCapability that should be optimized.
// when an optimization is applied, ORT will update this ComputeCapability to reflect the changes made.
// IndexedSubGraph.nodes:

69
onnxruntime/core/optimizer/graph_optimizer_registry.cc
View file

@ -15,6 +15,34 @@ GraphOptimizerRegistry::GraphOptimizerRegistry() {
logger_ = &logging::LoggingManager::DefaultLogger();
}
common::Status GraphOptimizerRegistry::AddPredefinedOptimizerNames(std::vector<std::string>& optimizer_names) {
for (auto name : optimizer_names) {
if (name_to_transformer_map_.find(name) != name_to_transformer_map_.end()) {
LOGS(*logger_, WARNING) << "This transformer name is already added " << name;
return Status::OK();
}
name_to_transformer_map_[name] = nullptr; // The transformer will be instantizted only when EP requests it
if (name == kCONSTANT_FOLDING_DQ) {
transformer_name_to_selection_func_[name] = ConstantFoldingDQ_selection;
}
}
return Status::OK();
}
common::Status GraphOptimizerRegistry::CreateOptimizer(std::string& name, std::unordered_map<std::string, std::string>& key_value_configs) {
if (name == kCONSTANT_FOLDING_DQ) {
const InlinedHashSet<NodeIndex> node_index_set = {};
auto transformer = std::make_unique<ConstantFoldingDQ>(*cpu_ep_, false /*skip_dequantize_linear*/,
session_options_->config_options, node_index_set);
Get()->Register(std::move(transformer));
return Status::OK();
}
LOGS(*logger_, WARNING) << "Can't create optimizer for " << name << ". It's not in the predefined optimizer list.";
return Status::OK();
}
common::Status GraphOptimizerRegistry::Register(std::unique_ptr<GraphTransformer> transformer) {
const auto& name = transformer->Name();
if (name_to_transformer_map_.find(name) != name_to_transformer_map_.end() &&
@ -26,52 +54,15 @@ common::Status GraphOptimizerRegistry::Register(std::unique_ptr<GraphTransformer
name_to_transformer_map_[name] = transformer.get();
transformer_list_.push_back(std::move(transformer));
if (name == kCONSTANT_FOLDING_DQ) {
transformer_name_to_selection_func_[name] = ConstantFoldingDQ_selection;
}
return Status::OK();
}
common::Status GraphOptimizerRegistry::AddPredefinedOptimizerNames(std::vector<std::string>& optimizer_names) {
for (auto name : optimizer_names) {
if (name_to_transformer_map_.find(name) != name_to_transformer_map_.end()) {
LOGS(*logger_, WARNING) << "This transformer name is already added " << name;
return Status::OK();
}
name_to_transformer_map_[name] = nullptr; // The transformer will be instantizted only when EP requests it
}
return Status::OK();
}
std::unique_ptr<GraphTransformer> GraphOptimizerRegistry::CreateOptimizer(std::string& name, std::unordered_map<std::string, std::string>& key_value_configs) {
std::unique_ptr<GraphTransformer> transformer;
if (name == kCONSTANT_FOLDING_DQ) {
const InlinedHashSet<NodeIndex> node_index_set = {};
return std::make_unique<ConstantFoldingDQ>(*cpu_ep_, false /*skip_dequantize_linear*/,
session_options_->config_options, node_index_set);
}
LOGS(*logger_, WARNING) << "Can't create optimizer " << name;
return transformer;
}
std::optional<std::function<std::vector<std::unique_ptr<ComputeCapability>>(const GraphViewer&)>> GraphOptimizerRegistry::GetSelectionFunc(std::string& name,
std::unordered_map<std::string, std::string>& key_value_configs) const {
if (name_to_transformer_map_.find(name) == name_to_transformer_map_.end()) {
LOGS(*logger_, WARNING) << "Can't find optimizer " << name;
return std::nullopt;
}
// Create and register if the transformer instance is not created.
if (!name_to_transformer_map_.at(name)) {
auto new_transformer = Get()->CreateOptimizer(name, key_value_configs);
Get()->Register(std::move(new_transformer));
}
std::optional<std::function<std::vector<std::unique_ptr<ComputeCapability>>(const GraphViewer&)>> GraphOptimizerRegistry::GetSelectionFunc(std::string& name) const {
auto lookup = transformer_name_to_selection_func_.find(name);
if (lookup != transformer_name_to_selection_func_.end()) {
return transformer_name_to_selection_func_.at(name);
}
LOGS(*logger_, WARNING) << "Can't find selection function of " << name;
return std::nullopt;
}

23
onnxruntime/core/optimizer/graph_optimizer_registry.h
View file

@ -46,9 +46,9 @@ class GraphOptimizerRegistry {
const logging::Logger& logger);
/**
* Create optimizer instance.
* Create and register optimizer.
*/
std::unique_ptr<GraphTransformer> CreateOptimizer(std::string& name, std::unordered_map<std::string, std::string>& key_value_configs);
common::Status GraphOptimizerRegistry::CreateOptimizer(std::string& name, std::unordered_map<std::string, std::string>& key_value_configs);
/**
* Get optimizer by name.
@ -67,12 +67,9 @@ class GraphOptimizerRegistry {
common::Status Register(std::unique_ptr<GraphTransformer> transformer);
/**
* Get optimizer selection function requested by EP. If the optimizer name can't be found, return nullopt.
*
* Please note that this function also creates and registers the optimizer if its instance is not existed.
* Get optimizer selection function. If the optimizer name can't be found, return nullopt.
*/
std::optional<std::function<std::vector<std::unique_ptr<ComputeCapability>>(const GraphViewer&)>> GraphOptimizerRegistry::GetSelectionFunc(std::string& name,
std::unordered_map<std::string, std::string>& key_value_configs) const;
std::optional<std::function<std::vector<std::unique_ptr<ComputeCapability>>(const GraphViewer&)>> GraphOptimizerRegistry::GetSelectionFunc(std::string& name) const;
/**
* Add CPU EP reference from InferenceSession as it's needed for some optimizers, ex: ConstantFoldingDQ.
@ -80,10 +77,20 @@ class GraphOptimizerRegistry {
common::Status AddCpuEpReference(onnxruntime::IExecutionProvider* cpu_ep);
/**
* Add Session Options reference from InferenceSession as it's needed for some optimizers, ex: ConstantFoldingDQ.
* Get CPU EP reference.
*/
onnxruntime::IExecutionProvider* GetCpuEpReference() const { return cpu_ep_; }
/**
* Add session options reference from InferenceSession as it's needed for some optimizers, ex: ConstantFoldingDQ.
*/
common::Status AddSessionOptionsReference(onnxruntime::SessionOptions* session_options);
/**
* Get Session Options reference.
*/
onnxruntime::SessionOptions* GetSessionOptionsReference() const { return session_options_; }
private:
InlinedVector<std::unique_ptr<GraphTransformer>> transformer_list_;
InlinedHashMap<std::string, GraphTransformer*> name_to_transformer_map_;

17
onnxruntime/core/optimizer/selection_and_optimization_func.cc
View file

@ -57,9 +57,22 @@ Status ConstantFoldingDQ_optimization(Graph& graph, const ComputeCapability& opt
}
auto optimizer_registry = onnxruntime::GraphOptimizerRegistry::Get();
// ConstantFoldingDQ optimizer doesn't need the key/value strings.
std::unordered_map<std::string, std::string> key_value_configs = optimization_cc.optimization_configs;
// Don't use CreateOptimizer as ConstantFoldingDQ needs dq_node_index_set for instantiation.
// optimizer_registry->CreateOptimizer(optimizer_name, key_value_configs);
ConstantFoldingDQ* transformer = static_cast<ConstantFoldingDQ*>(optimizer_registry->GetTransformerByName(optimizer_name));
transformer->UpdateNodeIndexSet(dq_node_index_set);
// Create ConstantFoldingDQ optimizer if it's not existed.
if (!optimizer_registry->GetTransformerByName(optimizer_name)) {
auto transformer = std::make_unique<ConstantFoldingDQ>(*optimizer_registry->GetCpuEpReference(),
false /*skip_dequantize_linear*/,
optimizer_registry->GetSessionOptionsReference()->config_options,
dq_node_index_set);
optimizer_registry->Register(std::move(transformer));
}
// apply constant folding on DQ nodes
optimizer_registry->ApplyTransformer(graph, optimizer_name, *logger);

1
onnxruntime/core/providers/shared_library/provider_interfaces.h
View file

@ -143,7 +143,6 @@ struct ProviderHost {
virtual const OrtApiBase* OrtGetApiBase() = 0;
virtual Status GetOptimizerByName(const std::string& name,
std::unordered_map<std::string, std::string>& key_value_configs,
std::function<std::vector<std::unique_ptr<ComputeCapability>>(const GraphViewer&)>& selection_func) = 0;
virtual void* HeapAllocate(size_t size) = 0;

3
onnxruntime/core/providers/tensorrt/tensorrt_execution_provider.cc
View file

@ -2670,8 +2670,7 @@ TensorrtExecutionProvider::GetCapability(const GraphViewer& graph,
*/
std::function<std::vector<std::unique_ptr<ComputeCapability>>(const GraphViewer&)> selection_func;
std::unordered_map<std::string, std::string> key_value_configs = {};
auto status = g_host->GetOptimizerByName("ConstantFoldingDQ", key_value_configs, selection_func);
auto status = g_host->GetOptimizerByName("ConstantFoldingDQ", selection_func);
std::vector<std::unique_ptr<ComputeCapability>> selection_cc;
if (selection_func) {
selection_cc = selection_func(graph);

3
onnxruntime/core/session/provider_bridge_ort.cc
View file

@ -214,12 +214,11 @@ struct ProviderHostImpl : ProviderHost {
const OrtApiBase* OrtGetApiBase() override { return ::OrtGetApiBase(); }
Status GetOptimizerByName(const std::string& name,
std::unordered_map<std::string, std::string>& key_value_configs,
std::function<std::vector<std::unique_ptr<ComputeCapability>>(const GraphViewer&)>& selection_func) override {
std::string optimizer_name(name);
auto optimizer_registry = onnxruntime::GraphOptimizerRegistry::Get();
auto func = optimizer_registry->GetSelectionFunc(optimizer_name, key_value_configs);
auto func = optimizer_registry->GetSelectionFunc(optimizer_name);
if (func.has_value()) {
selection_func = func.value();