IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PT FE] Remove unique names from FE, rely on ResolveNameCollisions (#21636)

Browse Source 
* [PT FE] Remove unicalisation from FE, rely on ResolveNameCollisions

* Fix build
This commit is contained in:
Maxim Vafin 2023-12-14 12:49:46 +01:00 committed by GitHub
parent 27bf494355
commit 1d03b0813b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/pytorch/src/frontend.cpp
View File

@ -211,7 +211,7 @@ void FrontEnd::normalize(const std::shared_ptr<ov::Model>& model) const {
manager.register_pass<ov::pass::ReverseShapeAndTypeInfer>();
// Second pass of AlignTypesRemoval after all converting transformations
manager.register_pass<ov::frontend::pytorch::pass::AlignTypesRemoval>();
manager.register_pass<ov::pass::ResolveNameCollisions>();
manager.register_pass<ov::pass::ResolveNameCollisions>(true);
manager.run_passes(model);
apply_pytorch_conversion_transforms(model);

1
src/frontends/pytorch/src/node_context.cpp
View File

@ -50,7 +50,6 @@ OutputVector NodeContext::as_constant() const {
std::shared_ptr<Node> NodeContext::mark_node(std::shared_ptr<Node> ov_node) const {
ov_node = m_decoder->mark_node(ov_node);
m_translate_session->unique_name(ov_node);
return ov_node;
}

8
src/frontends/pytorch/src/translate_session.cpp
View File

@ -402,14 +402,6 @@ Output<Node> TranslateSession::get_reverseprop_op(const std::shared_ptr<TorchDec
return std::make_shared<PtFrameworkNode>(node, OutputVector{value}, 1, true);
}
void TranslateSession::unique_name(const std::shared_ptr<Node>& node) {
if (m_unique_friendly_name_set.count(node->get_friendly_name())) {
node->set_friendly_name(node->get_friendly_name() + '_' + std::to_string(m_friendly_name_counter++));
} else {
m_unique_friendly_name_set.insert(node->get_friendly_name());
}
}
} // namespace pytorch
} // namespace frontend
} // namespace ov

5
src/frontends/pytorch/src/translate_session.hpp
View File

@ -47,9 +47,6 @@ public:
/// \brief Gets pytorch tensor index from openvino tensor
size_t decode_tensor_name(const Output<Node>& tensor_desc);
/// \brief Make sure Node has unique name
void unique_name(const std::shared_ptr<Node>& node);
// Maps tensor index to initial tensor index which it is alias to, and to decoder of the node produced this alias
// and to the output produced during conversion of this node
std::map<size_t, std::tuple<size_t, std::shared_ptr<TorchDecoder>, Output<Node>>> m_may_be_alias;
@ -64,8 +61,6 @@ private:
std::map<size_t, std::pair<size_t, Output<Node>>> m_counter_map;
std::map<std::string, uint64_t> m_op_statistics;
std::unordered_set<std::string> m_unique_friendly_name_set;
size_t m_friendly_name_counter = 0;
};
} // namespace pytorch