From cb351388d02cdf93cf2ad9808d2c2ef0ebc8d373 Mon Sep 17 00:00:00 2001 From: Edward Chen <18449977+edgchen1@users.noreply.github.com> Date: Fri, 22 Jul 2022 14:33:49 -0700 Subject: [PATCH] Minor fixes (#12276) * Log message for each node placement so the output won't get truncated. * Use correct variable in ReshapeOpBuilder::CanSkipReshape(). --- onnxruntime/core/framework/session_state.cc | 13 +++++++------ .../nnapi/nnapi_builtin/builders/op_builder.cc | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/onnxruntime/core/framework/session_state.cc b/onnxruntime/core/framework/session_state.cc index 07c43609cd..2352a74883 100644 --- a/onnxruntime/core/framework/session_state.cc +++ b/onnxruntime/core/framework/session_state.cc @@ -195,7 +195,7 @@ Status SessionState::CreateKernels(const KernelRegistryManager& kernel_registry_ return Status::OK(); } -const SequentialExecutionPlan* SessionState::GetExecutionPlan() const { +const SequentialExecutionPlan* SessionState::GetExecutionPlan() const { if (!p_seq_exec_plan_.has_value()) { return nullptr; } @@ -1185,13 +1185,14 @@ static Status VerifyEachNodeIsAssignedToAnEp(const Graph& graph, const logging:: if (is_verbose_mode) { LOGS(logger, VERBOSE) << "Node placements"; if (node_placements.size() == 1) { - LOGS(logger, VERBOSE) << "All nodes have been placed on [" << node_placements.begin()->first << "]."; + const auto& [provider, node_strs] = *node_placements.begin(); + LOGS(logger, VERBOSE) << " All nodes placed on [" << provider << "]. Number of nodes: " << node_strs.size(); } else { for (const auto& [provider, node_strs] : node_placements) { - std::ostringstream all_nodes_str; - std::copy(node_strs.begin(), node_strs.end(), std::ostream_iterator(all_nodes_str, ", ")); - LOGS(logger, VERBOSE) << " Provider: [" << provider << "]" - << ": [" << all_nodes_str.str() << "]"; + LOGS(logger, VERBOSE) << " Node(s) placed on [" << provider << "]. Number of nodes: " << node_strs.size(); + for (const auto& node_str : node_strs) { + LOGS(logger, VERBOSE) << " " << node_str; + } } } } diff --git a/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/op_builder.cc b/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/op_builder.cc index 0b2336b13f..ea9c19e171 100644 --- a/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/op_builder.cc +++ b/onnxruntime/core/providers/nnapi/nnapi_builtin/builders/op_builder.cc @@ -827,7 +827,7 @@ bool ReshapeOpBuilder::IsQuantizedOp(const NodeUnit& node_unit) const { } // Now the dest node is Gemm/Matmul, we want to make sure it is supported - if (!BaseOpBuilder::IsOpSupported(model_builder, node_unit)) { + if (!BaseOpBuilder::IsOpSupported(model_builder, dest_node_unit)) { return false; }