From 6a26a4faa03124b66769580a1342b99cb8585314 Mon Sep 17 00:00:00 2001 From: "River.Li" Date: Thu, 15 Jun 2023 13:00:07 +0800 Subject: [PATCH] Fix Transpose shape issue --- .../transformations/common_optimizations/nop_elimination.cpp | 4 ++++ src/core/src/pass/manager.cpp | 4 +++- src/plugins/intel_cpu/src/infer_request.cpp | 5 ++++- src/plugins/intel_cpu/src/node.cpp | 1 - 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp b/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp index 68d3cf976ca..cc7d412df7d 100644 --- a/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp +++ b/src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp @@ -701,6 +701,10 @@ pass::EliminateTranspose::EliminateTranspose() { } const auto& order_values = order_const->cast_vector(); + // Cannot eliminate Transpose when empty order_value. + if (order_values.size() == 0) + return false; + vector ref_values(order_values.size()); iota(ref_values.begin(), ref_values.end(), 0); if (order_values != ref_values) { diff --git a/src/core/src/pass/manager.cpp b/src/core/src/pass/manager.cpp index 1d9b0c0e129..51a45fab587 100644 --- a/src/core/src/pass/manager.cpp +++ b/src/core/src/pass/manager.cpp @@ -128,7 +128,9 @@ bool ov::pass::Manager::run_passes(shared_ptr func) { const size_t num_digits_in_pass_index = 3; std::string index_str = std::to_string(index); index_str = std::string(num_digits_in_pass_index - index_str.length(), '0') + index_str; - auto base_filename = func->get_name() + std::string("_") + index_str + std::string("_") + pass->get_name(); + static size_t idx = 0; + auto base_filename = func->get_name() + std::string("_") + std::to_string(idx++) + std::string("_") + + index_str + std::string("_") + pass->get_name(); if (m_visualize) { auto file_ext = "svg"; diff --git a/src/plugins/intel_cpu/src/infer_request.cpp b/src/plugins/intel_cpu/src/infer_request.cpp index 90c712e90bf..95d12fee86b 100644 --- a/src/plugins/intel_cpu/src/infer_request.cpp +++ b/src/plugins/intel_cpu/src/infer_request.cpp @@ -181,6 +181,9 @@ void SyncInferRequest::redefineMemoryForInputNodes() { void SyncInferRequest::update_external_inputs() { // Update it due to batched_tensors case will update input tensor + if (m_batched_tensors.size() == 0) + return; + // for (auto input : _compiled_model->get_orig_model()->inputs()) { for (auto input : get_inputs()) { std::string input_name = get_port_name(input); if (input_name.empty()) { @@ -398,7 +401,7 @@ void SyncInferRequest::check_port(const ov::Output& port) const if (name.empty() || (_input_ports_map.find(name) == _input_ports_map.end() && _output_ports_map.find(name) == _output_ports_map.end())) { - OPENVINO_THROW("cpu plugin checking port failed: cannot find this port!"); + OPENVINO_THROW("cpu plugin checking port failed: cannot find this port with name ", name); } } diff --git a/src/plugins/intel_cpu/src/node.cpp b/src/plugins/intel_cpu/src/node.cpp index 3a24053904d..f0bd5e16890 100644 --- a/src/plugins/intel_cpu/src/node.cpp +++ b/src/plugins/intel_cpu/src/node.cpp @@ -119,7 +119,6 @@ Node::Node(const std::shared_ptr& op, bool isScalar = shape.rank().get_length() == 0; outputShapes.emplace_back(isScalar ? ngraph::PartialShape{1} : shape); - std::cout << typeStr << " : " << op->get_output_element_type(i) << std::endl; originalOutputPrecisions.emplace_back(details::convertPrecision(op->get_output_element_type(i))); } }