diff --git a/src/common/low_precision_transformations/CMakeLists.txt b/src/common/low_precision_transformations/CMakeLists.txt index 54a5bf6da7f5d2..5ea74c9ab509a5 100644 --- a/src/common/low_precision_transformations/CMakeLists.txt +++ b/src/common/low_precision_transformations/CMakeLists.txt @@ -28,7 +28,6 @@ ov_build_target_faster(${TARGET_NAME}_obj UNITY) target_link_libraries(${TARGET_NAME}_obj PRIVATE openvino::itt) target_include_directories(${TARGET_NAME}_obj PRIVATE $ - $> $>) add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}_obj) @@ -46,7 +45,6 @@ target_link_libraries(${TARGET_NAME} INTERFACE openvino::runtime) target_include_directories(${TARGET_NAME} INTERFACE $ - $> $>) # LTO diff --git a/src/common/low_precision_transformations/include/low_precision/batch_to_space.hpp b/src/common/low_precision_transformations/include/low_precision/batch_to_space.hpp index 2d6d2e3286ef25..99ed46e500ada9 100644 --- a/src/common/low_precision_transformations/include/low_precision/batch_to_space.hpp +++ b/src/common/low_precision_transformations/include/low_precision/batch_to_space.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include "openvino/pass/pattern/matcher.hpp" #include "low_precision/layer_transformation.hpp" namespace ov { @@ -25,7 +25,7 @@ class LP_TRANSFORMATIONS_API BatchToSpaceTransformation : public LayerTransforma OPENVINO_RTTI("BatchToSpaceTransformation", "0"); BatchToSpaceTransformation(const Params& params = Params()); bool canBeTransformed(const TransformationContext& context, std::shared_ptr op) const override; - bool transform(TransformationContext& context, ngraph::pattern::Matcher &m) override; + bool transform(TransformationContext& context, ov::pass::pattern::Matcher &m) override; bool isPrecisionPreserved(std::shared_ptr layer) const noexcept override; }; diff --git a/src/common/low_precision_transformations/include/low_precision/lpt_visibility.hpp b/src/common/low_precision_transformations/include/low_precision/lpt_visibility.hpp index 016f34b0e3b50a..aedc2ce7616e19 100644 --- a/src/common/low_precision_transformations/include/low_precision/lpt_visibility.hpp +++ b/src/common/low_precision_transformations/include/low_precision/lpt_visibility.hpp @@ -4,7 +4,7 @@ #pragma once -#include "ngraph/visibility.hpp" +#include "openvino/core/visibility.hpp" /** * @file lpt_visibility.hpp diff --git a/src/common/low_precision_transformations/include/low_precision/multiply_partial.hpp b/src/common/low_precision_transformations/include/low_precision/multiply_partial.hpp index c3db52ce5d9e9d..8c369acdb3d00d 100644 --- a/src/common/low_precision_transformations/include/low_precision/multiply_partial.hpp +++ b/src/common/low_precision_transformations/include/low_precision/multiply_partial.hpp @@ -4,7 +4,7 @@ #pragma once -#include +#include "openvino/pass/pattern/matcher.hpp" #include "low_precision/eltwise_base_transformation.hpp" namespace ov { @@ -23,7 +23,7 @@ class LP_TRANSFORMATIONS_API MultiplyPartialTransformation : public EltwiseBaseT public: OPENVINO_RTTI("MultiplyPartialTransformation", "0"); MultiplyPartialTransformation(const Params& params = Params()); - bool transform(TransformationContext& context, ngraph::pattern::Matcher &m) override; + bool transform(TransformationContext& context, ov::pass::pattern::Matcher &m) override; bool canBeTransformed(const TransformationContext& context, std::shared_ptr layer) const override; }; diff --git a/src/common/low_precision_transformations/include/low_precision/network_helper.hpp b/src/common/low_precision_transformations/include/low_precision/network_helper.hpp index 83e486af697ff7..5ca510079124c1 100644 --- a/src/common/low_precision_transformations/include/low_precision/network_helper.hpp +++ b/src/common/low_precision_transformations/include/low_precision/network_helper.hpp @@ -126,8 +126,8 @@ class LP_TRANSFORMATIONS_API NetworkHelper { std::shared_ptr input = nullptr); static std::shared_ptr makeDequantizationSubtract( - const ngraph::Output& parent, - const ngraph::Output& subtract_constant); + const ov::Output& parent, + const ov::Output& subtract_constant); static bool areQuantizeAndDequantizeSupportedForSubtract(const std::shared_ptr& node, const std::vector& defaultPrecisions = precision_set::get_int8_support()); diff --git a/src/common/low_precision_transformations/include/low_precision/space_to_batch.hpp b/src/common/low_precision_transformations/include/low_precision/space_to_batch.hpp index bacd7f1d7c5d59..86ad225177ee58 100644 --- a/src/common/low_precision_transformations/include/low_precision/space_to_batch.hpp +++ b/src/common/low_precision_transformations/include/low_precision/space_to_batch.hpp @@ -5,7 +5,7 @@ #pragma once #include -#include +#include "openvino/pass/pattern/matcher.hpp" #include "low_precision/layer_transformation.hpp" namespace ov { @@ -25,7 +25,7 @@ class LP_TRANSFORMATIONS_API SpaceToBatchTransformation : public LayerTransforma OPENVINO_RTTI("SpaceToBatchTransformation", "0"); SpaceToBatchTransformation(const Params& params = Params()); bool canBeTransformed(const TransformationContext& context, std::shared_ptr op) const override; - bool transform(TransformationContext& context, ngraph::pattern::Matcher &m) override; + bool transform(TransformationContext& context, ov::pass::pattern::Matcher &m) override; bool isPrecisionPreserved(std::shared_ptr layer) const noexcept override; }; diff --git a/src/common/low_precision_transformations/src/multiply_to_group_convolution.cpp b/src/common/low_precision_transformations/src/multiply_to_group_convolution.cpp index a8999aeff8eec6..b679e0882f43e6 100644 --- a/src/common/low_precision_transformations/src/multiply_to_group_convolution.cpp +++ b/src/common/low_precision_transformations/src/multiply_to_group_convolution.cpp @@ -111,9 +111,9 @@ bool MultiplyToGroupConvolutionTransformation::transform(TransformationContext& const auto weightsNode = std::make_shared(weightsPrecision, weightsShape, weightsBuffer); const size_t spatialDimsSize = pShape.rank().get_length() - 2; - ngraph::Strides strides(spatialDimsSize, 1ul); - ngraph::CoordinateDiff pads(spatialDimsSize, 0ul); - ngraph::Strides dilations(spatialDimsSize, 1ul); + ov::Strides strides(spatialDimsSize, 1ul); + ov::CoordinateDiff pads(spatialDimsSize, 0ul); + ov::Strides dilations(spatialDimsSize, 1ul); const auto convolution = std::make_shared>( std::vector{ element::f32, element::f32 }, diff --git a/src/common/low_precision_transformations/tests/batch_to_space_transformation.cpp b/src/common/low_precision_transformations/tests/batch_to_space_transformation.cpp index 7015ede358c775..26e97fb4381e7b 100644 --- a/src/common/low_precision_transformations/tests/batch_to_space_transformation.cpp +++ b/src/common/low_precision_transformations/tests/batch_to_space_transformation.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include "common_test_utils/ov_test_utils.hpp" @@ -51,14 +50,14 @@ class BatchToSpaceTransformationTestValues { }; typedef std::tuple< - ngraph::PartialShape, + ov::PartialShape, BatchToSpaceTransformationTestValues> BatchToSpaceTransformationParams; class BatchToSpaceTransformation : public LayerTransformation, public testing::WithParamInterface { public: void SetUp() override { - const ngraph::PartialShape input_shape = std::get<0>(GetParam()); + const ov::PartialShape input_shape = std::get<0>(GetParam()); const BatchToSpaceTransformationTestValues test_values = std::get<1>(GetParam()); actualFunction = ngraph::builder::subgraph::BatchToSpaceFunction::get( @@ -85,7 +84,7 @@ class BatchToSpaceTransformation : public LayerTransformation, } static std::string getTestCaseName(testing::TestParamInfo obj) { - const ngraph::PartialShape shape = std::get<0>(obj.param); + const ov::PartialShape shape = std::get<0>(obj.param); const BatchToSpaceTransformationTestValues testValues = std::get<1>(obj.param); std::ostringstream result; @@ -109,7 +108,7 @@ TEST_P(BatchToSpaceTransformation, CompareFunctions) { } namespace testValues { -const std::vector input_shapes = { +const std::vector input_shapes = { {4, 3, 50, 86} }; diff --git a/src/common/low_precision_transformations/tests/convert_subtract_constant_transformation.cpp b/src/common/low_precision_transformations/tests/convert_subtract_constant_transformation.cpp index 46d9dbaff521dc..865fb8172c1baf 100644 --- a/src/common/low_precision_transformations/tests/convert_subtract_constant_transformation.cpp +++ b/src/common/low_precision_transformations/tests/convert_subtract_constant_transformation.cpp @@ -29,7 +29,7 @@ class ConvertSubtractConstantTransformationTestValues { ngraph::builder::subgraph::DequantizationOperations dequantizationOnActivations; ngraph::builder::subgraph::DequantizationOperations dequantizationOnWeights; ngraph::builder::subgraph::Constant weights; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; ov::element::Type precisionAfterOperation; ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; }; diff --git a/src/common/low_precision_transformations/tests/convolution_backprop_data_transformation.cpp b/src/common/low_precision_transformations/tests/convolution_backprop_data_transformation.cpp index c2cc9f8d52feef..d34cf021d92988 100644 --- a/src/common/low_precision_transformations/tests/convolution_backprop_data_transformation.cpp +++ b/src/common/low_precision_transformations/tests/convolution_backprop_data_transformation.cpp @@ -38,8 +38,8 @@ class ConvolutionBackpropDataTransformationTestValues { public: ov::element::Type precisionBeforeDequantization; ngraph::builder::subgraph::DequantizationOperations dequantizationOnActivations; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; - ngraph:: builder::subgraph::DequantizationOperations dequantizationOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::DequantizationOperations dequantizationOnWeights; std::shared_ptr weights; callback_function_type callback; @@ -85,7 +85,7 @@ class ConvolutionBackpropDataTransformationTestValues { public: ov::element::Type precisionBeforeDequantization; ngraph::builder::subgraph::DequantizationOperations dequantizationOnActivations; - ngraph:: builder::subgraph::DequantizationOperations dequantizationOnWeights; + ngraph::builder::subgraph::DequantizationOperations dequantizationOnWeights; ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; std::shared_ptr weights; bool transformed; diff --git a/src/common/low_precision_transformations/tests/convolution_qdq_transformation.cpp b/src/common/low_precision_transformations/tests/convolution_qdq_transformation.cpp index 7abcc64a15f40d..a5c0970af93ffd 100644 --- a/src/common/low_precision_transformations/tests/convolution_qdq_transformation.cpp +++ b/src/common/low_precision_transformations/tests/convolution_qdq_transformation.cpp @@ -30,7 +30,7 @@ class ConvolutionQDqTransformationTestValues { ngraph::builder::subgraph::DequantizationOperations dequantizationOnActivations; ngraph::builder::subgraph::DequantizationOperations dequantizationOnWeights; ngraph::builder::subgraph::Constant weights; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; ov::element::Type precisionAfterOperation; ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; }; diff --git a/src/common/low_precision_transformations/tests/convolution_transformation.cpp b/src/common/low_precision_transformations/tests/convolution_transformation.cpp index 87ac3856aa699a..097c277a493156 100644 --- a/src/common/low_precision_transformations/tests/convolution_transformation.cpp +++ b/src/common/low_precision_transformations/tests/convolution_transformation.cpp @@ -29,7 +29,7 @@ class ConvolutionTransformationTestValues { ov::element::Type precisionBeforeDequantization; ngraph::builder::subgraph::DequantizationOperations dequantizationOnActivations; std::shared_ptr weights; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; }; class Expected { @@ -37,7 +37,7 @@ class ConvolutionTransformationTestValues { ov::element::Type precisionBeforeDequantization; ngraph::builder::subgraph::DequantizationOperations dequantizationBefore; std::shared_ptr weights; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; ov::element::Type precisionAfterOperation; ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; ov::element::Type precisionAfterDequantization; diff --git a/src/common/low_precision_transformations/tests/fake_quantize_on_weights_with_unsupported_child.cpp b/src/common/low_precision_transformations/tests/fake_quantize_on_weights_with_unsupported_child.cpp index 81e84aaf4132b2..96477c9d205b6d 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_on_weights_with_unsupported_child.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_on_weights_with_unsupported_child.cpp @@ -28,13 +28,13 @@ class FakeQuantizeOnWeightsWithUnsupportedChildTestValues { class Actual { public: std::shared_ptr weights; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; }; class Expected { public: std::shared_ptr weights; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; }; TestTransformationParams params; diff --git a/src/common/low_precision_transformations/tests/fake_quantize_precision_selection_transformation.cpp b/src/common/low_precision_transformations/tests/fake_quantize_precision_selection_transformation.cpp index 1d9a25cc5d87a1..27a76bec641c74 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_precision_selection_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_precision_selection_transformation.cpp @@ -26,15 +26,15 @@ using namespace ov::pass; namespace { class ActualValues { public: - ngraph:: builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; }; class ExpectedValues { public: element::Type fakeQuantizeOnDataOutPrecision; - ngraph:: builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantizeOnData; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; }; class FakeQuantizePrecisionSelectionTransformationTestValues { diff --git a/src/common/low_precision_transformations/tests/fake_quantize_transformation.cpp b/src/common/low_precision_transformations/tests/fake_quantize_transformation.cpp index 80363c85e234b8..27911421ca6d6a 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_transformation.cpp @@ -42,8 +42,8 @@ class FakeQuantizeTransformationTestValues { addNotPrecisionPreservedOperation(addNotPrecisionPreservedOperation) {} TestTransformationParams params; - ngraph:: builder::subgraph::FakeQuantizeOnDataWithConstant actual; - ngraph:: builder::subgraph::FakeQuantizeOnDataWithConstant expected; + ngraph::builder::subgraph::FakeQuantizeOnDataWithConstant actual; + ngraph::builder::subgraph::FakeQuantizeOnDataWithConstant expected; ov::element::Type expectedFakeQuantizeOnDataPrecision; std::map expectedValues; // add not precision preserved operation to set output precision for FakeQuantize diff --git a/src/common/low_precision_transformations/tests/fake_quantize_with_dq_not_optimal_transformation.cpp b/src/common/low_precision_transformations/tests/fake_quantize_with_dq_not_optimal_transformation.cpp index edbadea9c6bfc4..10ec95eb5e89c9 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -31,13 +31,13 @@ class FakeQuantizeWithNotOptimalTransformationTestValues { public: class Values { public: - ngraph:: builder::subgraph::FakeQuantizeOnDataWithConstant fqOnData; - ngraph:: builder::subgraph::DequantizationOperations::Convert convertOnData; - ngraph:: builder::subgraph::DequantizationOperations dequantizationOnData; - ngraph:: builder::subgraph::Constant constantOnWeights; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fqOnWeights; - ngraph:: builder::subgraph::DequantizationOperations dequantizationOnWeights; - ngraph:: builder::subgraph::DequantizationOperations dequantizationAfter; + ngraph::builder::subgraph::FakeQuantizeOnDataWithConstant fqOnData; + ngraph::builder::subgraph::DequantizationOperations::Convert convertOnData; + ngraph::builder::subgraph::DequantizationOperations dequantizationOnData; + ngraph::builder::subgraph::Constant constantOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fqOnWeights; + ngraph::builder::subgraph::DequantizationOperations dequantizationOnWeights; + ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; }; TestTransformationParams params; Values actual; diff --git a/src/common/low_precision_transformations/tests/fake_quantize_with_dynamic_intervals_transformation.cpp b/src/common/low_precision_transformations/tests/fake_quantize_with_dynamic_intervals_transformation.cpp index 5756d0471edac4..b890e07a7bf1b5 100644 --- a/src/common/low_precision_transformations/tests/fake_quantize_with_dynamic_intervals_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fake_quantize_with_dynamic_intervals_transformation.cpp @@ -117,9 +117,9 @@ class FakeQuantizeWithDynamicIntervalsTransformation : public LayerTransformatio auto fakeQuantize = std::make_shared(input, inputLow, inputHigh, outputLow, outputHigh, levels); fakeQuantize->set_friendly_name("fakeQuantize"); - ngraph::ResultVector results{ std::make_shared(fakeQuantize) }; + ov::ResultVector results{ std::make_shared(fakeQuantize) }; - ngraph::ParameterVector inputs{ input }; + ov::ParameterVector inputs{ input }; if (as_type_ptr(inputLow)) { inputs.push_back(as_type_ptr(inputLow)); } diff --git a/src/common/low_precision_transformations/tests/fold_convert_transformation.cpp b/src/common/low_precision_transformations/tests/fold_convert_transformation.cpp index 0b01123792d20c..a38afe5cda7434 100644 --- a/src/common/low_precision_transformations/tests/fold_convert_transformation.cpp +++ b/src/common/low_precision_transformations/tests/fold_convert_transformation.cpp @@ -54,8 +54,8 @@ class FoldConvertTransformation : public LayerTransformation, public testing::Wi output->set_friendly_name("output"); return std::make_shared( - ngraph::ResultVector{ std::make_shared(output) }, - ngraph::ParameterVector{ input }, + ov::ResultVector{ std::make_shared(output) }, + ov::ParameterVector{ input }, "FoldConvertTransformation"); }; actualFunction = createFunction(testValues.precision, inputShape, testValues.dequantizationActual); diff --git a/src/common/low_precision_transformations/tests/fold_fake_quantize_in_transformations.cpp b/src/common/low_precision_transformations/tests/fold_fake_quantize_in_transformations.cpp index 566806e7ee7af1..42975c42797476 100644 --- a/src/common/low_precision_transformations/tests/fold_fake_quantize_in_transformations.cpp +++ b/src/common/low_precision_transformations/tests/fold_fake_quantize_in_transformations.cpp @@ -28,7 +28,7 @@ class FoldFakeQuantizeInTransformationsTestValues { public: std::vector constValues; ov::element::Type constPrecision; - ngraph:: builder::subgraph::FakeQuantizeOnData fakeQuantize; + ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; ov::element::Type fqOutPrecision; }; @@ -90,10 +90,10 @@ class FoldFakeQuantizeInTransformations testValues.actual.fqOutPrecision); fq = ov::pass::low_precision::NetworkHelper::fold_fake_quantize(as_type_ptr(fq), testValues.roundValues); - ngraph::ResultVector results{std::make_shared(fq)}; + ov::ResultVector results{std::make_shared(fq)}; actualFunction = std::make_shared( results, - parameter ? ngraph::ParameterVector{parameter} : ngraph::ParameterVector{}, + parameter ? ov::ParameterVector{parameter} : ov::ParameterVector{}, "FoldFakeQuantizeFunction"); referenceFunction = diff --git a/src/common/low_precision_transformations/tests/get_dequantization_below_transformation.cpp b/src/common/low_precision_transformations/tests/get_dequantization_below_transformation.cpp index 253543d4ba1e4f..d016567af28292 100644 --- a/src/common/low_precision_transformations/tests/get_dequantization_below_transformation.cpp +++ b/src/common/low_precision_transformations/tests/get_dequantization_below_transformation.cpp @@ -24,8 +24,8 @@ using namespace ov::pass; class GetDequantizationBelowTestValues { public: - ngraph:: builder::subgraph::FakeQuantizeOnData fakeQuantize; - ngraph:: builder::subgraph::DequantizationOperations dequantization; + ngraph::builder::subgraph::FakeQuantizeOnData fakeQuantize; + ngraph::builder::subgraph::DequantizationOperations dequantization; }; inline std::ostream& operator<<(std::ostream& os, const std::vector& values) { diff --git a/src/common/low_precision_transformations/tests/group_convolution_transformation.cpp b/src/common/low_precision_transformations/tests/group_convolution_transformation.cpp index ee977f566c8bb5..b98f03997a74b8 100644 --- a/src/common/low_precision_transformations/tests/group_convolution_transformation.cpp +++ b/src/common/low_precision_transformations/tests/group_convolution_transformation.cpp @@ -29,7 +29,7 @@ class GroupConvolutionTestValues { ov::element::Type precisionBeforeDequantization; ngraph::builder::subgraph::DequantizationOperations dequantization; std::shared_ptr weights; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; ngraph::builder::subgraph::DequantizationOperations dequantizationOnWeights; }; @@ -38,7 +38,7 @@ class GroupConvolutionTestValues { ov::element::Type precisionBeforeDequantization; ngraph::builder::subgraph::DequantizationOperations dequantizationBefore; std::shared_ptr weights; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; ngraph::builder::subgraph::DequantizationOperations dequantizationOnWeights; ov::element::Type precisionAfterOperation; ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; diff --git a/src/common/low_precision_transformations/tests/interpolate_transformation.cpp b/src/common/low_precision_transformations/tests/interpolate_transformation.cpp index 32e6ff474f59d7..17eb8fc22374dd 100644 --- a/src/common/low_precision_transformations/tests/interpolate_transformation.cpp +++ b/src/common/low_precision_transformations/tests/interpolate_transformation.cpp @@ -27,7 +27,7 @@ using namespace ngraph::builder::subgraph; class interpAttributes { public: - ngraph::AxisSet axes; + ov::AxisSet axes; std::string mode; bool align_corners; bool antialias; @@ -36,7 +36,7 @@ class interpAttributes { interpAttributes() = default; - interpAttributes(const ngraph::AxisSet& axes, + interpAttributes(const ov::AxisSet& axes, const std::string& mode, const bool& align_corners, const bool& antialias, @@ -206,7 +206,7 @@ const std::vector testValues { ov::Shape{}, LayerTransformation::createParamsU8I8(), interpAttributes( - ngraph::AxisSet{2, 3}, + ov::AxisSet{2, 3}, "nearest", false, false, @@ -233,7 +233,7 @@ const std::vector testValues { ov::Shape{}, LayerTransformation::createParamsU8I8(), interpAttributes( - ngraph::AxisSet{2, 3}, + ov::AxisSet{2, 3}, "nearest", false, false, @@ -260,7 +260,7 @@ const std::vector testValues { ov::Shape{}, LayerTransformation::createParamsU8I8(), interpAttributes( - ngraph::AxisSet{2, 3}, + ov::AxisSet{2, 3}, "nearest", false, false, @@ -287,7 +287,7 @@ const std::vector testValues { ov::Shape{}, LayerTransformation::createParamsU8I8(), interpAttributes( - ngraph::AxisSet{2, 3}, + ov::AxisSet{2, 3}, "nearest", false, false, @@ -314,7 +314,7 @@ const std::vector testValues { ov::Shape{}, LayerTransformation::createParamsU8I8(), interpAttributes( - ngraph::AxisSet{2, 3}, + ov::AxisSet{2, 3}, "linear", false, false, @@ -341,7 +341,7 @@ const std::vector testValues { ov::Shape{}, LayerTransformation::createParamsU8I8(), interpAttributes( - ngraph::AxisSet{1, 2, 3}, + ov::AxisSet{1, 2, 3}, "nearest", false, false, @@ -368,7 +368,7 @@ const std::vector testValues { ov::Shape{}, LayerTransformation::createParamsU8I8(), interpAttributes( - ngraph::AxisSet{2, 3}, + ov::AxisSet{2, 3}, "nearest", true, false, @@ -395,7 +395,7 @@ const std::vector testValues { ov::Shape{}, LayerTransformation::createParamsU8I8(), interpAttributes( - ngraph::AxisSet{2, 3}, + ov::AxisSet{2, 3}, "nearest", false, false, diff --git a/src/common/low_precision_transformations/tests/is_asymmetric_on_weights_dequantization.cpp b/src/common/low_precision_transformations/tests/is_asymmetric_on_weights_dequantization.cpp index 7aa5cc54009465..17ca061df0c952 100644 --- a/src/common/low_precision_transformations/tests/is_asymmetric_on_weights_dequantization.cpp +++ b/src/common/low_precision_transformations/tests/is_asymmetric_on_weights_dequantization.cpp @@ -24,7 +24,7 @@ class IsAsymmetricOnWeightsDequantizationTestValues { ov::element::Type precisionBeforeDequantization; ngraph::builder::subgraph::DequantizationOperations dequantizationOnActivations; std::shared_ptr weights; - ngraph:: builder::subgraph::DequantizationOperations dequantizationOnWeights; + ngraph::builder::subgraph::DequantizationOperations dequantizationOnWeights; bool isAsymmetricOnWeights; }; diff --git a/src/common/low_precision_transformations/tests/is_asymmetric_on_weights_fq.cpp b/src/common/low_precision_transformations/tests/is_asymmetric_on_weights_fq.cpp index 7e5022375de4de..e229209a507054 100644 --- a/src/common/low_precision_transformations/tests/is_asymmetric_on_weights_fq.cpp +++ b/src/common/low_precision_transformations/tests/is_asymmetric_on_weights_fq.cpp @@ -25,7 +25,7 @@ class IsAsymmetricOnWeightsFakeQuantizeTestValues { ov::element::Type precisionBeforeDequantization; ngraph::builder::subgraph::DequantizationOperations dequantizationOnActivations; std::shared_ptr weights; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnWeights fakeQuantizeOnWeights; }; typedef std::tuple< diff --git a/src/common/low_precision_transformations/tests/is_constant_path_transformation.cpp b/src/common/low_precision_transformations/tests/is_constant_path_transformation.cpp index 7c89c647bcdcf8..36f44b00f60432 100644 --- a/src/common/low_precision_transformations/tests/is_constant_path_transformation.cpp +++ b/src/common/low_precision_transformations/tests/is_constant_path_transformation.cpp @@ -112,10 +112,10 @@ TEST(LPT, isConstantPathConvParentDqTransformation) { const auto conv = std::make_shared( input, weights, - ngraph::Strides{ 1, 1 }, - ngraph::CoordinateDiff{ 0, 0 }, - ngraph::CoordinateDiff{ 0, 0 }, - ngraph::Strides{ 1, 1 }); + ov::Strides{ 1, 1 }, + ov::CoordinateDiff{ 0, 0 }, + ov::CoordinateDiff{ 0, 0 }, + ov::Strides{ 1, 1 }); const auto dqAfterConv = makeDequantization(conv, DequantizationOperations{ {}, {}, {0.1f} }); const bool result = ov::pass::low_precision::NetworkHelper::isConstantPath(dqAfterConv); @@ -129,10 +129,10 @@ TEST(LPT, isConstantPathGroupConvParentDqTransformation) { const auto groupConv = std::make_shared( input, weights, - ngraph::Strides{ 1, 1 }, - ngraph::CoordinateDiff{ 0, 0 }, - ngraph::CoordinateDiff{ 0, 0 }, - ngraph::Strides{ 1, 1 }); + ov::Strides{ 1, 1 }, + ov::CoordinateDiff{ 0, 0 }, + ov::CoordinateDiff{ 0, 0 }, + ov::Strides{ 1, 1 }); const auto dqAfterGroupConv = makeDequantization(groupConv, DequantizationOperations{ {}, {}, {0.1f} }); const bool result = ov::pass::low_precision::NetworkHelper::isConstantPath(dqAfterGroupConv); diff --git a/src/common/low_precision_transformations/tests/is_function_quantized_transformation.cpp b/src/common/low_precision_transformations/tests/is_function_quantized_transformation.cpp index 9d07dc94bed16a..c6de0adc2c5d5a 100644 --- a/src/common/low_precision_transformations/tests/is_function_quantized_transformation.cpp +++ b/src/common/low_precision_transformations/tests/is_function_quantized_transformation.cpp @@ -21,7 +21,7 @@ class IsFunctionQuantizedTransformationValues { public: ov::Shape shape; ov::element::Type precision; - ngraph:: builder::subgraph::FakeQuantizeOnDataWithConstant fakeQuantize; + ngraph::builder::subgraph::FakeQuantizeOnDataWithConstant fakeQuantize; bool constantSubgraphOnParameters; bool inputOnParameters; @@ -44,8 +44,8 @@ class IsFunctionQuantizedTransformation : public LayerTransformation, public tes replace_node(fakeQuantize->get_input_node_shared_ptr(3), input); } - ngraph::ResultVector results{ std::make_shared(fakeQuantize) }; - model = std::make_shared(results, ngraph::ParameterVector{ input }, "IsFunctionQuantizedFunction"); + ov::ResultVector results{ std::make_shared(fakeQuantize) }; + model = std::make_shared(results, ov::ParameterVector{ input }, "IsFunctionQuantizedFunction"); model->validate_nodes_and_infer_types(); } diff --git a/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp b/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp index 35a80285def102..e059d886c10839 100644 --- a/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp +++ b/src/common/low_precision_transformations/tests/lpt_avoid_shapeof_propagation_test.cpp @@ -150,10 +150,10 @@ TEST(LPT, AvoidDequantizationToShapeOfPropagationConvolutionTransformation) { auto convolution = std::make_shared(mul, mulOnWeights, - ngraph::Strides{1, 1}, - ngraph::CoordinateDiff{0, 0}, - ngraph::CoordinateDiff{0, 0}, - ngraph::Strides{1, 1}); + ov::Strides{1, 1}, + ov::CoordinateDiff{0, 0}, + ov::CoordinateDiff{0, 0}, + ov::Strides{1, 1}); auto shapeOf = std::make_shared(convolution); @@ -180,10 +180,10 @@ TEST(LPT, AvoidDequantizationToShapeOfPropagationConvolutionBackpropDataTransfor auto convolutionBackpropData = std::make_shared(mul, mulOnWeights, - ngraph::Strides{1, 1}, - ngraph::CoordinateDiff{0, 0}, - ngraph::CoordinateDiff{0, 0}, - ngraph::Strides{1, 1}); + ov::Strides{1, 1}, + ov::CoordinateDiff{0, 0}, + ov::CoordinateDiff{0, 0}, + ov::Strides{1, 1}); auto shapeOf = std::make_shared(convolutionBackpropData); @@ -255,10 +255,10 @@ TEST(LPT, AvoidDequantizationToShapeOfPropagationGroupConvolutionTransformation) auto groupConvolution = std::make_shared(mul, reshapeOnWeights, - ngraph::Strides{1, 1}, - ngraph::CoordinateDiff{0, 0}, - ngraph::CoordinateDiff{0, 0}, - ngraph::Strides{1, 1}); + ov::Strides{1, 1}, + ov::CoordinateDiff{0, 0}, + ov::CoordinateDiff{0, 0}, + ov::Strides{1, 1}); auto shapeOf = std::make_shared(groupConvolution); auto result1 = std::make_shared(groupConvolution); @@ -646,9 +646,9 @@ TEST(LPT, AvoidDequantizationToShapeOfPropagationStridedSliceTransformation) { auto convert = std::make_shared(input, element::f32); auto mul = std::make_shared(convert, ov::op::v0::Constant::create(element::f32, {}, {2.f})); - auto beginParam = ngraph::op::v0::Constant::create(ov::element::i64, ov::Shape{4}, {0, 0, 0, 0}); - auto endParam = ngraph::op::v0::Constant::create(ov::element::i64, ov::Shape{4}, {1, 2, 1, 1}); - auto stridesParam = ngraph::op::v0::Constant::create(ov::element::i64, ov::Shape{4}, {1, 1, 1, 1}); + auto beginParam = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{4}, {0, 0, 0, 0}); + auto endParam = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{4}, {1, 2, 1, 1}); + auto stridesParam = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{4}, {1, 1, 1, 1}); auto stridedSlice = std::make_shared(mul, beginParam, endParam, @@ -674,7 +674,7 @@ TEST(LPT, AvoidDequantizationToShapeOfPropagationTransposeTransformation) { auto convert = std::make_shared(input, element::f32); auto mul = std::make_shared(convert, ov::op::v0::Constant::create(element::f32, {}, {2.f})); - auto constant = ngraph::op::v0::Constant::create(ov::element::i64, ov::Shape{4}, {0, 1, 3, 2}); + auto constant = ov::op::v0::Constant::create(ov::element::i64, ov::Shape{4}, {0, 1, 3, 2}); auto transpose = std::make_shared(mul, constant); auto shapeOf = std::make_shared(transpose); diff --git a/src/common/low_precision_transformations/tests/multiply_transformation.cpp b/src/common/low_precision_transformations/tests/multiply_transformation.cpp index 5fe7dec67e146f..a9aa1ecf0390aa 100644 --- a/src/common/low_precision_transformations/tests/multiply_transformation.cpp +++ b/src/common/low_precision_transformations/tests/multiply_transformation.cpp @@ -28,7 +28,7 @@ using namespace ngraph::builder::subgraph; class MultiplyBranch { public: ngraph::builder::subgraph::Constant constant; - ngraph::element::Type input_precision; + ov::element::Type input_precision; ngraph::builder::subgraph::DequantizationOperations dequantization; ngraph::builder::subgraph::FakeQuantizeOnData fake_quantize; }; diff --git a/src/common/low_precision_transformations/tests/mvn_transformation.cpp b/src/common/low_precision_transformations/tests/mvn_transformation.cpp index 1dbafbb445d10c..004324dd198ffb 100644 --- a/src/common/low_precision_transformations/tests/mvn_transformation.cpp +++ b/src/common/low_precision_transformations/tests/mvn_transformation.cpp @@ -41,7 +41,7 @@ class MVNTransformationTestValues { ngraph::builder::subgraph::DequantizationOperations dequantizationAfter; }; - ngraph::AxisSet reductionAxes; + ov::AxisSet reductionAxes; bool normalizeVariance; TestTransformationParams params; Actual actual; diff --git a/src/common/low_precision_transformations/tests/normalize_l2_transformation.cpp b/src/common/low_precision_transformations/tests/normalize_l2_transformation.cpp index 78a2fb21e6a111..a9aea8fbdad3ae 100644 --- a/src/common/low_precision_transformations/tests/normalize_l2_transformation.cpp +++ b/src/common/low_precision_transformations/tests/normalize_l2_transformation.cpp @@ -47,7 +47,7 @@ class NormalizeL2TransformationTestValues { typedef std::tuple< ov::element::Type, ov::PartialShape, - ngraph::op::EpsMode, + ov::op::EpsMode, std::vector, NormalizeL2TransformationTestValues> NormalizeL2TransformationParams; @@ -56,7 +56,7 @@ class NormalizeL2Transformation : public LayerTransformation, public testing::Wi void SetUp() override { ov::element::Type precision; ov::PartialShape shape; - ngraph::op::EpsMode epsMode; + ov::op::EpsMode epsMode; std::vector axes; NormalizeL2TransformationTestValues params; std::tie(precision, shape, epsMode, axes, params) = GetParam(); @@ -88,7 +88,7 @@ class NormalizeL2Transformation : public LayerTransformation, public testing::Wi ov::element::Type precision; ov::PartialShape shape; ov::Shape axes; - ngraph::op::EpsMode epsMode; + ov::op::EpsMode epsMode; NormalizeL2TransformationTestValues params; std::tie(precision, shape, epsMode, axes, params) = obj.param; @@ -115,9 +115,9 @@ const std::vector precisions = { ov::element::f16 }; -std::vector epsMode = { - ngraph::op::EpsMode::ADD, - ngraph::op::EpsMode::MAX +std::vector epsMode = { + ov::op::EpsMode::ADD, + ov::op::EpsMode::MAX }; std::vector> axes = { diff --git a/src/common/low_precision_transformations/tests/separate_in_standalone_branch_transformation.cpp b/src/common/low_precision_transformations/tests/separate_in_standalone_branch_transformation.cpp index a530f76ecef052..54ad8be926ab25 100644 --- a/src/common/low_precision_transformations/tests/separate_in_standalone_branch_transformation.cpp +++ b/src/common/low_precision_transformations/tests/separate_in_standalone_branch_transformation.cpp @@ -72,11 +72,11 @@ class SeparateInStandaloneBranchTransformation : reshape2->set_friendly_name("reshape2"); return std::make_shared( - ngraph::ResultVector{ + ov::ResultVector{ std::make_shared(reshape1), std::make_shared(reshape2) }, - std::vector> { input }, + std::vector> { input }, "SeparateInStandaloneBranchTransformation"); }; actualFunction = createActualFunction(testValues.precisionBefore, shape, testValues.dequantization); @@ -103,11 +103,11 @@ class SeparateInStandaloneBranchTransformation : reshape2->set_friendly_name("reshape2"); return std::make_shared( - ngraph::ResultVector{ + ov::ResultVector{ std::make_shared(reshape1), std::make_shared(reshape2) }, - std::vector> { input }, + std::vector> { input }, "SeparateInStandaloneBranchTransformation"); }; referenceFunction = createReferenceFunction(testValues.precisionBefore, shape, testValues.dequantization); diff --git a/src/common/low_precision_transformations/tests/space_to_batch_transformation.cpp b/src/common/low_precision_transformations/tests/space_to_batch_transformation.cpp index ed81d3b46dc9e3..cce257e05d6a15 100644 --- a/src/common/low_precision_transformations/tests/space_to_batch_transformation.cpp +++ b/src/common/low_precision_transformations/tests/space_to_batch_transformation.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include "common_test_utils/ov_test_utils.hpp" @@ -51,13 +50,13 @@ class SpaceToBatchTransformationTestValues { }; typedef std::tuple< - ngraph::PartialShape, + ov::PartialShape, SpaceToBatchTransformationTestValues> SpaceToBatchTransformationParams; class SpaceToBatchTransformation : public LayerTransformation, public testing::WithParamInterface { public: void SetUp() override { - const ngraph::PartialShape input_shape = std::get<0>(GetParam()); + const ov::PartialShape input_shape = std::get<0>(GetParam()); const SpaceToBatchTransformationTestValues test_values = std::get<1>(GetParam()); actualFunction = ngraph::builder::subgraph::SpaceToBatchFunction::get( @@ -84,7 +83,7 @@ class SpaceToBatchTransformation : public LayerTransformation, public testing::W } static std::string getTestCaseName(testing::TestParamInfo obj) { - const ngraph::PartialShape shape = std::get<0>(obj.param); + const ov::PartialShape shape = std::get<0>(obj.param); const SpaceToBatchTransformationTestValues testValues = std::get<1>(obj.param); std::ostringstream result; @@ -108,7 +107,7 @@ TEST_P(SpaceToBatchTransformation, CompareFunctions) { } namespace testValues { -const std::vector shapes = { +const std::vector shapes = { {1, 3, 100, 171}, }; diff --git a/src/common/low_precision_transformations/tests/transformer_is_function_quantized.cpp b/src/common/low_precision_transformations/tests/transformer_is_function_quantized.cpp index a71f50afb68468..be8f901b32f9cf 100644 --- a/src/common/low_precision_transformations/tests/transformer_is_function_quantized.cpp +++ b/src/common/low_precision_transformations/tests/transformer_is_function_quantized.cpp @@ -27,8 +27,8 @@ namespace { class TestValues { public: - ngraph:: builder::subgraph::FakeQuantizeOnData fqOnData; - ngraph:: builder::subgraph::FakeQuantizeOnWeights fqOnWeights; + ngraph::builder::subgraph::FakeQuantizeOnData fqOnData; + ngraph::builder::subgraph::FakeQuantizeOnWeights fqOnWeights; }; inline std::ostream& operator<<(std::ostream& out, const TestValues& testValue) { diff --git a/src/common/transformations/CMakeLists.txt b/src/common/transformations/CMakeLists.txt index e7d365ca32492e..0eea2cdbfbdfbc 100644 --- a/src/common/transformations/CMakeLists.txt +++ b/src/common/transformations/CMakeLists.txt @@ -43,8 +43,7 @@ endif() add_library(${TARGET_NAME} INTERFACE) target_include_directories(${TARGET_NAME} INTERFACE - $ - $>) + $) target_link_libraries(${TARGET_NAME} INTERFACE openvino::runtime) diff --git a/src/common/transformations/tests/utils/primitives_priority_test.cpp b/src/common/transformations/tests/utils/primitives_priority_test.cpp index 64f6330a1da188..6baceddaaacc68 100644 --- a/src/common/transformations/tests/utils/primitives_priority_test.cpp +++ b/src/common/transformations/tests/utils/primitives_priority_test.cpp @@ -12,12 +12,9 @@ #include #include "common_test_utils/ov_test_utils.hpp" -#include "common_test_utils/test_common.hpp" -#include "ie_ngraph_utils.hpp" #include "openvino/core/model.hpp" #include "openvino/opsets/opset1.hpp" #include "transformations/rt_info/primitives_priority_attribute.hpp" -#include "transformations/utils/utils.hpp" using namespace ov; using namespace testing;