Mikhail NosovandIlya Lavrenov
9f9df184c4
* Added compatibility check of layout with partial shape
E.g. layout "NC" in not compatible with PartialShape{1,3,224,224}
Check is added:
- For parameter set_layout
- For parameter set_partial_shape
- For result set_layout
- Checked also compatibility for all results after 'validate_and_infer_types'
* Fix incorrect tests
* Fix of more incorrect tests
* Removed couple of obsoleted error-handling tests - these are catched now on earlier stages
Co-authored-by: Ilya Lavrenov <ilya.lavrenov@intel.com>
97 lines
2.9 KiB
C++
97 lines
2.9 KiB
C++
// Copyright (C) 2018-2022 Intel Corporation
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
//
|
|
|
|
#include "ngraph/op/parameter.hpp"
|
|
|
|
#include <sstream>
|
|
|
|
#include "itt.hpp"
|
|
#include "layout_utils.hpp"
|
|
#include "ngraph/attribute_visitor.hpp"
|
|
|
|
using namespace std;
|
|
using namespace ngraph;
|
|
|
|
BWDCMP_RTTI_DEFINITION(op::v0::Parameter);
|
|
|
|
op::Parameter::Parameter(const element::Type& element_type, const ov::PartialShape& pshape)
|
|
: m_partial_shape(pshape),
|
|
m_element_type(element_type),
|
|
m_is_relevant_to_shapes(false) {
|
|
constructor_validate_and_infer_types();
|
|
}
|
|
|
|
bool op::Parameter::visit_attributes(AttributeVisitor& visitor) {
|
|
NGRAPH_OP_SCOPE(v0_Parameter_visit_attributes);
|
|
visitor.on_attribute("shape", m_partial_shape);
|
|
visitor.on_attribute("element_type", m_element_type);
|
|
return true;
|
|
}
|
|
|
|
void op::Parameter::validate_and_infer_types() {
|
|
NGRAPH_OP_SCOPE(v0_Parameter_validate_and_infer_types);
|
|
Op::validate_and_infer_types();
|
|
set_output_type(0, m_element_type, m_partial_shape);
|
|
}
|
|
|
|
shared_ptr<Node> op::Parameter::clone_with_new_inputs(const OutputVector& new_args) const {
|
|
NGRAPH_OP_SCOPE(v0_Parameter_clone_with_new_inputs);
|
|
check_new_args_count(this, new_args);
|
|
return make_shared<Parameter>(m_element_type, m_partial_shape);
|
|
}
|
|
|
|
bool op::Parameter::is_relevant_to_shapes() const {
|
|
return m_is_relevant_to_shapes;
|
|
}
|
|
|
|
void op::Parameter::set_is_relevant_to_shapes(bool is_relevant) {
|
|
m_is_relevant_to_shapes = is_relevant;
|
|
}
|
|
|
|
ov::Layout op::Parameter::get_layout() const {
|
|
return ov::layout::get_layout(output(0));
|
|
}
|
|
|
|
void op::Parameter::set_layout(const ov::Layout& layout) {
|
|
ov::layout::set_layout(output(0), layout);
|
|
}
|
|
|
|
void op::Parameter::set_partial_shape(const PartialShape& partial_shape) {
|
|
OPENVINO_ASSERT(ov::layout::utils::is_compatible(get_layout(), partial_shape),
|
|
"Can't set partial shape ",
|
|
partial_shape,
|
|
" for Parameter ",
|
|
*this,
|
|
" with layout ",
|
|
get_layout().to_string(),
|
|
". Layout is not compatible with shape");
|
|
m_partial_shape = partial_shape;
|
|
}
|
|
|
|
BWDCMP_RTTI_DEFINITION(ov::AttributeAdapter<ParameterVector>);
|
|
|
|
ov::AttributeAdapter<ParameterVector>::AttributeAdapter(ParameterVector& ref) : m_ref(ref) {}
|
|
|
|
bool ov::AttributeAdapter<ParameterVector>::visit_attributes(AttributeVisitor& visitor) {
|
|
size_t size = m_ref.size();
|
|
visitor.on_attribute("size", size);
|
|
if (size != m_ref.size()) {
|
|
m_ref.resize(size);
|
|
}
|
|
ostringstream index;
|
|
for (size_t i = 0; i < size; i++) {
|
|
index.str("");
|
|
index << i;
|
|
string id;
|
|
if (m_ref[i]) {
|
|
id = visitor.get_registered_node_id(m_ref[i]);
|
|
}
|
|
visitor.on_attribute(index.str(), id);
|
|
if (!m_ref[i]) {
|
|
m_ref[i] = ov::as_type_ptr<ngraph::op::v0::Parameter>(visitor.get_registered_node(id));
|
|
}
|
|
}
|
|
return true;
|
|
}
|