Skip to content
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

Fix the issue caused by the changed tensor names after complex transformation #23081

Merged
merged 8 commits into from
Mar 7, 2024
Merged

Fix the issue caused by the changed tensor names after complex transformation #23081

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6ff7a47
try to identify the port by ignoring the tensor name checking
yangwang201911 Feb 26, 2024
64bea10
Merge branch 'master' into ywang2/fix_the_issue_caused_by_the_changed…
yangwang201911 Feb 27, 2024
625959d
Remove the I/O ports map
yangwang201911 Feb 28, 2024
be8ab3c
revert the changes in the cpu plugin.
yangwang201911 Feb 28, 2024
84e225d
Update checking logic and add test cases.
yangwang201911 Mar 7, 2024
2543259
Merge branch 'master' into ywang2/fix_the_issue_caused_by_the_changed…
yangwang201911 Mar 7, 2024
59ec327
Update.
yangwang201911 Mar 7, 2024
16eeee9
Update.
yangwang201911 Mar 7, 2024
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
14 changes: 12 additions & 2 deletions src/inference/src/dev/isync_infer_request.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,16 @@ const std::shared_ptr<const ov::ICompiledModel>& ov::ISyncInferRequest::get_comp
}

ov::ISyncInferRequest::FoundPort ov::ISyncInferRequest::find_port(const ov::Output<const ov::Node>& port) const {
// check if the tensor names of target port is a subset of source port's tensor names
auto check_tensor_names = [](const std::unordered_set<std::string>& source,
const std::unordered_set<std::string>& target) {
for (auto const& name : target) {
if (source.find(name) == source.end())
return false;
}
return true;
};

// This function is hotspot, need optimization.
auto check_nodes = [](const ov::Node* node1, const ov::Node* node2) {
return node1 == node2 ||
Expand All @@ -143,8 +153,8 @@ ov::ISyncInferRequest::FoundPort ov::ISyncInferRequest::find_port(const ov::Outp
ov::ISyncInferRequest::FoundPort::Type type = ov::ISyncInferRequest::FoundPort::Type::INPUT;
for (const auto& ports : {get_inputs(), get_outputs()}) {
for (size_t i = 0; i < ports.size(); i++) {
if (ports[i].get_index() == port.get_index() && ports[i].get_names() == port.get_names() &&
check_nodes(ports[i].get_node(), port.get_node())) {
if (ports[i].get_index() == port.get_index() && check_nodes(ports[i].get_node(), port.get_node()) &&
check_tensor_names(ports[i].get_names(), port.get_names())) {
std::lock_guard<std::mutex> lock(m_cache_mutex);
m_cached_ports[port_hash] = {i, type};
return m_cached_ports[port_hash];
Expand Down
38 changes: 37 additions & 1 deletion src/inference/tests/unit/iplugin_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class IPluginTest : public ::testing::Test {
std::shared_ptr<ov::Model> create_model() {
auto param = std::make_shared<ov::op::v0::Parameter>(ov::element::f32, ov::PartialShape{1, 3, 2, 2});
param->set_friendly_name("Param");
param->output(0).set_names({"param"});
param->output(0).set_names({"param", "name1", "name2", "name3"});

auto relu = std::make_shared<ov::op::v0::Relu>(param);
relu->set_friendly_name("ReLU");
Expand Down Expand Up @@ -81,6 +81,42 @@ MATCHER_P(blob_in_map_pointer_is_same, ref_blob, "") {
return reinterpret_cast<float*>(arg.begin()->second->buffer()) == reinterpret_cast<float*>(ref_blob->buffer());
}

TEST_F(IPluginTest, SetIncorrectTensorNameForPort) {
yangwang201911 marked this conversation as resolved.
Show resolved Hide resolved
ov::SoPtr<ov::ITensor> tensor = ov::make_tensor(ov::element::f32, {1, 3, 2, 2});
auto updated_param = std::make_shared<ov::op::v0::Parameter>(ov::element::f32, ov::PartialShape{1, 3, 2, 2});
updated_param->set_friendly_name("Param");

updated_param->output(0).set_names({"new_name"});
EXPECT_THROW(mock_infer_request->set_tensor(updated_param->output(0), tensor), ov::Exception);

updated_param->output(0).set_names({"param", "new_name"});
EXPECT_THROW(mock_infer_request->set_tensor(updated_param->output(0), tensor), ov::Exception);

updated_param->output(0).set_names({"new_name", "name2"});
EXPECT_THROW(mock_infer_request->set_tensor(updated_param->output(0), tensor), ov::Exception);
}

TEST_F(IPluginTest, SetCorrectTensorNameForPort) {
yangwang201911 marked this conversation as resolved.
Show resolved Hide resolved
ov::SoPtr<ov::ITensor> tensor = ov::make_tensor(ov::element::f32, {1, 3, 2, 2});
auto updated_param = std::make_shared<ov::op::v0::Parameter>(ov::element::f32, ov::PartialShape{1, 3, 2, 2});
updated_param->set_friendly_name("Param");

updated_param->output(0).set_names({"param"});
EXPECT_NO_THROW(mock_infer_request->set_tensor(updated_param->output(0), tensor));

updated_param->output(0).set_names({"name1", "param"});
EXPECT_NO_THROW(mock_infer_request->set_tensor(updated_param->output(0), tensor));

updated_param->output(0).set_names({"name1", "name2"});
EXPECT_NO_THROW(mock_infer_request->set_tensor(updated_param->output(0), tensor));

updated_param->output(0).set_names({"param", "name1", "name2"});
EXPECT_NO_THROW(mock_infer_request->set_tensor(updated_param->output(0), tensor));

updated_param->output(0).set_names({"param", "name1", "name2", "name3"});
EXPECT_NO_THROW(mock_infer_request->set_tensor(updated_param->output(0), tensor));
}

TEST_F(IPluginTest, failToSetTensorWithIncorrectPort) {
auto incorrect_param = std::make_shared<ov::op::v0::Parameter>(ov::element::f32, ov::PartialShape{1, 2});
ov::SoPtr<ov::ITensor> tensor = ov::make_tensor(ov::element::f32, {1, 1, 1, 1});
Expand Down
Loading