Renamed ov::Function to ov::Model (#9051)

* Renamed ov::Function to ov::Model

* Fixed all for macos

* Fixed build

* Fixed build

* Revert changes in GPU plugin

* Fixed ngraphFunctions

* Fixed all for mac

* Fixed new test

* Fixed if for Windows

* Fixed unit tests and renamed Function in python API

* Fixed code style

* Fixed import

* Fixed conflict

* Fixed merge issues
This commit is contained in:
Ilya Churaev authored and GitHub committed 2021-12-10 13:08:38 +03:00
1 parent 4f77056892
commit ec6f57872f
430 files changed
+2085 -2087

No files matched your search

@@ -21,5 +21,5 @@ class LP_TRANSFORMATIONS_API AlignQuantizationIntervals;
class ngraph::pass::low_precision::AlignQuantizationIntervals : public ngraph::pass::FunctionPass {
public:
NGRAPH_RTTI_DECLARATION;
bool run_on_function(std::shared_ptr<ngraph::Function> f) override;
bool run_on_model(const std::shared_ptr<ngraph::Function>& m) override;
};
@@ -22,5 +22,5 @@ class LP_TRANSFORMATIONS_API AlignQuantizationParameters;
class ngraph::pass::low_precision::AlignQuantizationParameters : public ngraph::pass::FunctionPass {
public:
NGRAPH_RTTI_DECLARATION;
bool run_on_function(std::shared_ptr<ngraph::Function> f) override;
bool run_on_model(const std::shared_ptr<ngraph::Function>& m) override;
};
@@ -43,7 +43,7 @@ public:
MarkupOptimizations(
const std::vector<OperationPrecisionRestriction>& precisionRestrictions,
const std::vector<OperationPerTensorQuantizationRestriction>& quantizationRestrictions);
bool run_on_function(std::shared_ptr<ngraph::Function> f) override;
bool run_on_model(const std::shared_ptr<ngraph::Function>& m) override;
private:
const std::vector<OperationPrecisionRestriction>& precisionRestrictions;
const std::vector<OperationPerTensorQuantizationRestriction>& quantizationRestrictions;
@@ -62,7 +62,7 @@ public:
const std::vector<OperationPrecisionRestriction>& precisionRestrictions = {},
const std::vector<OperationPerTensorQuantizationRestriction>& quantizationRestrictions = {},
const LayerTransformation::Params = LayerTransformation::Params());
bool run_on_function(std::shared_ptr<ngraph::Function> f) override;
bool run_on_model(const std::shared_ptr<ngraph::Function>& m) override;
static bool isFunctionQuantized(const std::shared_ptr<const ngraph::Function>& function);
static bool isFQLevelsPresent(const std::shared_ptr<const ngraph::Function>& function, const std::set<size_t>& levels);
@@ -21,5 +21,5 @@ class LP_TRANSFORMATIONS_API MarkupAvgPoolPrecisionPreserved;
class ngraph::pass::low_precision::MarkupAvgPoolPrecisionPreserved : public ngraph::pass::FunctionPass {
public:
NGRAPH_RTTI_DECLARATION;
bool run_on_function(std::shared_ptr<ngraph::Function> f) override;
bool run_on_model(const std::shared_ptr<ngraph::Function>& m) override;
};
@@ -21,5 +21,5 @@ class LP_TRANSFORMATIONS_API MarkupCanBeQuantized;
class ngraph::pass::low_precision::MarkupCanBeQuantized : public ngraph::pass::FunctionPass {
public:
NGRAPH_RTTI_DECLARATION;
bool run_on_function(std::shared_ptr<ngraph::Function> f) override;
bool run_on_model(const std::shared_ptr<ngraph::Function>& m) override;
};
@@ -37,7 +37,7 @@ public:
NGRAPH_RTTI_DECLARATION;
explicit MarkupPerTensorQuantization(const std::vector<OperationPerTensorQuantizationRestriction>& restrictions = {});
bool run_on_function(std::shared_ptr<ngraph::Function> f) override;
bool run_on_model(const std::shared_ptr<ngraph::Function>& m) override;
private:
std::unordered_map<std::string, PerTensorQuantization> restrictionsByOperation;
@@ -38,7 +38,7 @@ public:
NGRAPH_RTTI_DECLARATION;
explicit MarkupPrecisions(const std::vector<OperationPrecisionRestriction>& restrictions = {});
bool run_on_function(std::shared_ptr<ngraph::Function> f) override;
bool run_on_model(const std::shared_ptr<ngraph::Function>& m) override;
private:
static bool isPrecisionPreserved(const std::shared_ptr<Node>& node);
@@ -25,5 +25,5 @@ class LP_TRANSFORMATIONS_API PropagatePrecisions;
class ngraph::pass::low_precision::PropagatePrecisions : public ngraph::pass::FunctionPass {
public:
NGRAPH_RTTI_DECLARATION;
bool run_on_function(std::shared_ptr<ngraph::Function> f) override;
bool run_on_model(const std::shared_ptr<ngraph::Function>& m) override;
};
@@ -30,7 +30,7 @@ class LP_TRANSFORMATIONS_API PropagateSharedValue;
template <class AttributeType>
class ngraph::pass::low_precision::PropagateSharedValue : public ngraph::pass::FunctionPass {
public:
bool run_on_function(std::shared_ptr<ngraph::Function> f) override {
bool run_on_model(const std::shared_ptr<ngraph::Function>& f) override {
OV_ITT_SCOPE(FIRST_INFERENCE, itt::domains::LPT_LT, "PropagateSharedValue");
std::vector<std::shared_ptr<ngraph::Node>> nodes(f->get_ordered_ops());
@@ -14,7 +14,7 @@ using namespace ngraph::pass::low_precision;
NGRAPH_RTTI_DEFINITION(ngraph::pass::low_precision::AlignQuantizationIntervals, "AlignQuantizationIntervals", 0);
bool ngraph::pass::low_precision::AlignQuantizationIntervals::run_on_function(std::shared_ptr<ngraph::Function> f) {
bool ngraph::pass::low_precision::AlignQuantizationIntervals::run_on_model(const std::shared_ptr<ngraph::Function>& f) {
ngraph::pass::Manager manager;
manager.set_per_pass_validation(false);
std::shared_ptr<ngraph::pass::GraphRewrite> intervalsAlignment = manager.register_pass<ngraph::pass::GraphRewrite>();
@@ -15,7 +15,7 @@ using namespace ngraph::pass::low_precision;
NGRAPH_RTTI_DEFINITION(ngraph::pass::low_precision::AlignQuantizationParameters, "AlignQuantizationParameters", 0);
bool ngraph::pass::low_precision::AlignQuantizationParameters::run_on_function(std::shared_ptr<ngraph::Function> f) {
bool ngraph::pass::low_precision::AlignQuantizationParameters::run_on_model(const std::shared_ptr<ngraph::Function>& f) {
ngraph::pass::Manager manager;
manager.set_per_pass_validation(false);
std::shared_ptr<ngraph::pass::GraphRewrite> propagation = manager.register_pass<ngraph::pass::GraphRewrite>();
@@ -166,7 +166,7 @@ MarkupOptimizations::MarkupOptimizations(
precisionRestrictions(precisionRestrictions),
quantizationRestrictions(quantizationRestrictions) {}
bool ngraph::pass::low_precision::MarkupOptimizations::run_on_function(std::shared_ptr<ngraph::Function> f) {
bool ngraph::pass::low_precision::MarkupOptimizations::run_on_model(const std::shared_ptr<ngraph::Function>& f) {
ngraph::pass::Manager markup(get_pass_config());
markup.set_per_pass_validation(false);
markup.register_pass<low_precision::MarkupCanBeQuantized>();
@@ -188,7 +188,7 @@ bool ngraph::pass::low_precision::MarkupOptimizations::run_on_function(std::shar
return false;
}
bool ngraph::pass::low_precision::LowPrecision::run_on_function(std::shared_ptr<ngraph::Function> f) {
bool ngraph::pass::low_precision::LowPrecision::run_on_model(const std::shared_ptr<ngraph::Function>& f) {
OV_ITT_SCOPE(FIRST_INFERENCE, itt::domains::LPT_LT, "LowPrecision");
auto passConfig = get_pass_config();
@@ -14,7 +14,7 @@ using namespace ngraph;
NGRAPH_RTTI_DEFINITION(ngraph::pass::low_precision::MarkupAvgPoolPrecisionPreserved, "MarkupAvgPoolPrecisionPreserved", 0);
bool ngraph::pass::low_precision::MarkupAvgPoolPrecisionPreserved::run_on_function(std::shared_ptr<ngraph::Function> f) {
bool ngraph::pass::low_precision::MarkupAvgPoolPrecisionPreserved::run_on_model(const std::shared_ptr<ngraph::Function>& f) {
ngraph::pass::Manager manager;
manager.set_per_pass_validation(false);
std::shared_ptr<ngraph::pass::GraphRewrite> markupAvgPoolPrecision = manager.register_pass<ngraph::pass::GraphRewrite>();
@@ -18,7 +18,7 @@ using namespace ngraph;
NGRAPH_RTTI_DEFINITION(ngraph::pass::low_precision::MarkupCanBeQuantized, "MarkupCanBeQuantized", 0);
bool ngraph::pass::low_precision::MarkupCanBeQuantized::run_on_function(std::shared_ptr<ngraph::Function> f) {
bool ngraph::pass::low_precision::MarkupCanBeQuantized::run_on_model(const std::shared_ptr<ngraph::Function>& f) {
auto setEmptyPrecisions = [](const std::shared_ptr<ngraph::Node>& node) {
for (auto& input : node->inputs()) {
auto& rt = input.get_rt_info();
@@ -28,7 +28,7 @@ ngraph::pass::low_precision::MarkupPerTensorQuantization::MarkupPerTensorQuantiz
}
}
bool ngraph::pass::low_precision::MarkupPerTensorQuantization::run_on_function(std::shared_ptr<ngraph::Function> f) {
bool ngraph::pass::low_precision::MarkupPerTensorQuantization::run_on_model(const std::shared_ptr<ngraph::Function>& f) {
auto setRestriction = [](const std::shared_ptr<Node>& node, const std::vector<size_t>& restrictedPorts) {
auto createAttribute = [](Input<Node>& input){
auto &rt = input.get_rt_info();
@@ -62,7 +62,7 @@ void setRestriction(
}
} // namespace
bool ngraph::pass::low_precision::MarkupPrecisions::run_on_function(std::shared_ptr<ngraph::Function> f) {
bool ngraph::pass::low_precision::MarkupPrecisions::run_on_model(const std::shared_ptr<ngraph::Function>& f) {
for (const std::shared_ptr<Node>& node : f->get_ordered_ops()) {
if (node->get_input_size() == 0) {
continue;
@@ -17,7 +17,7 @@ using namespace ngraph::pass::low_precision;
NGRAPH_RTTI_DEFINITION(ngraph::pass::low_precision::PropagatePrecisions, "PropagatePrecisions", 0);
bool ngraph::pass::low_precision::PropagatePrecisions::run_on_function(std::shared_ptr<ngraph::Function> f) {
bool ngraph::pass::low_precision::PropagatePrecisions::run_on_model(const std::shared_ptr<ngraph::Function>& f) {
ngraph::pass::Manager manager;
manager.set_per_pass_validation(false);
std::shared_ptr<ngraph::pass::GraphRewrite> precisionsPropagation = manager.register_pass<ngraph::pass::GraphRewrite>();