diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation.cpp index 5e9c20974..9555be5de 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation.cpp @@ -11,7 +11,7 @@ #include "cuda_test_constants.hpp" using namespace LayerTestsDefinitions; -using namespace ngraph::helpers; +using ov::test::utils::ActivationTypes; namespace { const std::vector netPrecisions = {InferenceEngine::Precision::FP32, @@ -27,40 +27,40 @@ const std::vector intPrecisions = { // TODO commented tests don't work for CUDA now. // The reason there are missing correspondent operations or transformation const std::map>> activationTypes = { - {Sigmoid, {}}, - {Tanh, {}}, - {Relu, {}}, - {Exp, {}}, - {Log, {}}, - // {Sign, {}}, - {Abs, {}}, - {Clamp, {{-2.0f, 2.0f}}}, - {Negative, {}}, - // {Acos, {}}, - // {Asin, {}}, - // {Atan, {}}, - {Cos, {}}, - {Cosh, {}}, - {Floor, {}}, - {Sin, {}}, - {Sinh, {}}, - {Sqrt, {}}, - // {Tan, {}}, - {Elu, {{0.1f}}}, - // {Erf, {}}, - // {HardSigmoid, {{0.2f, 0.5f}}}, - // {Selu, {{1.6732f, 1.0507f}}}, - // {Ceiling, {}}, - {Mish, {}}, - {Swish, {{0.5f}}}, - {HSwish, {}}, - // {SoftPlus, {}}, - {HSigmoid, {}}, - // {RoundHalfToEven, {}}, - // {RoundHalfAwayFromZero, {}}, - {Gelu, {}}, - {GeluErf, {}}, - {GeluTanh, {}}}; + {ActivationTypes::Sigmoid, {}}, + {ActivationTypes::Tanh, {}}, + {ActivationTypes::Relu, {}}, + {ActivationTypes::Exp, {}}, + {ActivationTypes::Log, {}}, + // {ActivationTypes::Sign, {}}, + {ActivationTypes::Abs, {}}, + {ActivationTypes::Clamp, {{-2.0f, 2.0f}}}, + {ActivationTypes::Negative, {}}, + // {ActivationTypes::Acos, {}}, + // {ActivationTypes::Asin, {}}, + // {ActivationTypes::Atan, {}}, + {ActivationTypes::Cos, {}}, + {ActivationTypes::Cosh, {}}, + {ActivationTypes::Floor, {}}, + {ActivationTypes::Sin, {}}, + {ActivationTypes::Sinh, {}}, + {ActivationTypes::Sqrt, {}}, + // {ActivationTypes::Tan, {}}, + {ActivationTypes::Elu, {{0.1f}}}, + // {ActivationTypes::Erf, {}}, + // {ActivationTypes::HardSigmoid, {{0.2f, 0.5f}}}, + // {ActivationTypes::Selu, {{1.6732f, 1.0507f}}}, + // {ActivationTypes::Ceiling, {}}, + {ActivationTypes::Mish, {}}, + {ActivationTypes::Swish, {{0.5f}}}, + {ActivationTypes::HSwish, {}}, + // {ActivationTypes::SoftPlus, {}}, + {ActivationTypes::HSigmoid, {}}, + // {ActivationTypes::RoundHalfToEven, {}}, + // {ActivationTypes::RoundHalfAwayFromZero, {}}, + {ActivationTypes::Gelu, {}}, + {ActivationTypes::GeluErf, {}}, + {ActivationTypes::GeluTanh, {}}}; class CUDAActivationIntegerLayerTest : public ActivationLayerTest { void SetUp() override { @@ -71,18 +71,18 @@ class CUDAActivationIntegerLayerTest : public ActivationLayerTest { // List of operations that should be tested also with integer precision const std::map>> intActivationTypes = { - {Abs, {}}, - {Negative, {}}, - {Cos, {}}, - {Cosh, {}}, - {Sinh, {}}, - {Sqrt, {}}, - {Log, {}}, + {ActivationTypes::Abs, {}}, + {ActivationTypes::Negative, {}}, + {ActivationTypes::Cos, {}}, + {ActivationTypes::Cosh, {}}, + {ActivationTypes::Sinh, {}}, + {ActivationTypes::Sqrt, {}}, + {ActivationTypes::Log, {}}, }; const std::map>> preluActivationParamTypes = { - {PReLu, {{}}}, // Slope will be filled with increasing values from -10 to match slope input shape - {LeakyRelu, {{0.01f}}}}; + {ActivationTypes::PReLu, {{}}}, // Slope will be filled with increasing values from -10 to match slope input shape + {ActivationTypes::LeakyRelu, {{0.01f}}}}; std::map, std::vector>> basic = { {{1, 50}, {{}}}, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation_slt.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation_slt.cpp index 7dc6ca89b..7670faffb 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation_slt.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/activation_slt.cpp @@ -36,6 +36,7 @@ namespace LayerTestsDefinitions { namespace { +using ov::test::utils::ActivationTypes; // ============================================================================= // clang-format off @@ -49,7 +50,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_squeezenet1_1_opid143, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -67,7 +68,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_resnet_50_caffe2_opid150, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector( {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -87,7 +88,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid102, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -106,7 +107,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_vgg16_IR_opid18, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -125,7 +126,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_2d_unet_graph_transform_opid38, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -144,7 +145,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid285, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -163,7 +164,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_3d_unet_graph_transform_opid38, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -182,7 +183,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_resnet_50_caffe2_opid103, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -201,7 +202,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid149, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -220,7 +221,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_photo_style_transfer_opid104, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -239,7 +240,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_2d_unet_graph_transform_opid10, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -258,7 +259,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_3d_unet_graph_transform_opid10, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -277,7 +278,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_squeezenet1_1_opid13, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -296,7 +297,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid107, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -315,7 +316,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_squeezenet1_1_opid100, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -334,7 +335,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid244, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -353,7 +354,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid22, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -372,7 +373,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid222, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -391,7 +392,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid166, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -410,7 +411,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid608, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -429,7 +430,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_resnet_50_caffe2_opid250, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -448,7 +449,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid249, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -467,7 +468,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid227, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -486,7 +487,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid129, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -505,7 +506,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_Tacotron2_decoder_iter_opid3, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -524,7 +525,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_resnet_50_caffe2_opid140, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -543,7 +544,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid232, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -562,7 +563,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_resnet_50_caffe2_opid135, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -581,7 +582,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_resnet_50_caffe2_opid30, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -600,7 +601,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_2d_unet_graph_transform_opid49, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -619,7 +620,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_3d_unet_graph_transform_opid49, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -638,7 +639,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid59, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -657,7 +658,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid14, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -676,7 +677,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid9, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -695,7 +696,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_photo_style_transfer_opid13, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -714,7 +715,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_squeezenet1_1_opid46, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -733,7 +734,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_2d_unet_graph_transform_opid102, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -752,7 +753,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_3d_unet_graph_transform_opid102, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -771,7 +772,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid623, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -790,7 +791,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid628, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -809,7 +810,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid217, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -828,7 +829,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid640, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -847,7 +848,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_vgg16_IR_opid84, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -866,7 +867,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid661, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -885,7 +886,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_squeezenet1_1_opid79, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -904,7 +905,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_Tacotron2_encoder_opid10, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -923,7 +924,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_resnet_50_caffe2_opid235, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -942,7 +943,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_resnet_50_caffe2_opid114, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -961,7 +962,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_resnet_50_caffe2_opid240, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -980,7 +981,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid666, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -999,7 +1000,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid112, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1018,7 +1019,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_photo_style_transfer_opid192, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1037,7 +1038,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_squeezenet1_1_opid7, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1056,7 +1057,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_squeezenet1_1_opid111, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1075,7 +1076,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid19, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1094,7 +1095,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid17, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1113,7 +1114,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_vgg16_IR_opid12, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1132,7 +1133,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_2d_unet_graph_transform_opid27, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1151,7 +1152,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid111, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1170,7 +1171,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_3d_unet_graph_transform_opid27, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1189,7 +1190,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid11, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1208,7 +1209,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid134, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1227,7 +1228,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_resnet_50_caffe2_opid15, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1246,7 +1247,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid31, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1265,7 +1266,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid117, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1284,7 +1285,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid100, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1303,7 +1304,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid122, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1322,7 +1323,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid36, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1341,7 +1342,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_googlenet_v4_tf_opid25, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1360,7 +1361,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid373, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1379,7 +1380,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid315, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1398,7 +1399,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid357, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1417,7 +1418,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid320, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1436,7 +1437,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid325, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1455,7 +1456,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid362, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1474,7 +1475,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid576, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1493,7 +1494,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid335, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1512,7 +1513,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid330, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1531,7 +1532,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid352, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1550,7 +1551,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_mask_rcnn_inception_v2_coco_opid342, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1569,7 +1570,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_GAN_opid33, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1588,7 +1589,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_GAN_opid66, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1607,7 +1608,7 @@ INSTANTIATE_TEST_CASE_P( autogen_ReLU_GAN_opid96, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1633,7 +1634,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_2d_unet_graph_transform_cuda_opid82, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1652,7 +1653,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_3d_unet_graph_transform_cuda_opid82, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1671,7 +1672,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_ssd_mobilenet_v2_coco_opid420, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1690,7 +1691,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_efficientdet_d1_tf_opid499, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1709,7 +1710,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_efficientdet_d1_tf_opid103, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1728,7 +1729,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_efficientdet_d1_tf_opid48, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1747,7 +1748,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_efficientdet_d1_tf_opid638, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1766,7 +1767,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_efficientdet_d1_tf_opid186, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1785,7 +1786,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_yolov5_640x640_IR_opid516, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1804,7 +1805,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_yolov5_640x640_IR_opid431, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1823,7 +1824,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_yolov5_640x640_IR_opid346, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1842,7 +1843,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_efficientdet_d1_tf_opid26, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1861,7 +1862,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_efficientdet_d1_tf_opid273, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1880,7 +1881,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_efficientdet_d1_tf_opid384, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1899,7 +1900,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_efficientdet_d1_tf_opid1435, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1918,7 +1919,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_efficientdet_d1_tf_opid76, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1937,7 +1938,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_mask_rcnn_inception_v2_coco_opid581, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1956,7 +1957,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Sigmoid_GAN_opid102, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -1990,7 +1991,7 @@ auto listToVectors(const std::initializer_list{ngraph::helpers::Tanh, 0}), + ::testing::Combine(::testing::Values(std::pair{ActivationTypes::Tanh, 0}), ::testing::Values(InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2007,24 +2008,24 @@ INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic_Tanh, // ============================================================================= // ------------- Clamp ------------- -using ClampParams = std::pair>; +using ClampParams = std::pair>; using ClampShape = std::pair, std::vector>; using Precisions = std::initializer_list; // ------------- Clamp Smoke ------------- -const std::initializer_list clampParamsSmoke{{ngraph::helpers::Clamp, {0.0, 10.1}}, - {ngraph::helpers::Clamp, {0.0, 10.5}}, - {ngraph::helpers::Clamp, {0.0, 20.4}}, - {ngraph::helpers::Clamp, {0.0, 23.999}}, - {ngraph::helpers::Clamp, {0.0, 100.0}}, - {ngraph::helpers::Clamp, {-1.0, 0.0}}, - {ngraph::helpers::Clamp, {-20.1, -10.5}}, - {ngraph::helpers::Clamp, {-10.0, 10.0}}, - {ngraph::helpers::Clamp, {10.3, 20.4}}, - {ngraph::helpers::Clamp, {0.1, 10.1}}, - {ngraph::helpers::Clamp, {10.0, 100.0}}, - {ngraph::helpers::Clamp, {10.6, 20.6}}}; +const std::initializer_list clampParamsSmoke{{ActivationTypes::Clamp, {0.0, 10.1}}, + {ActivationTypes::Clamp, {0.0, 10.5}}, + {ActivationTypes::Clamp, {0.0, 20.4}}, + {ActivationTypes::Clamp, {0.0, 23.999}}, + {ActivationTypes::Clamp, {0.0, 100.0}}, + {ActivationTypes::Clamp, {-1.0, 0.0}}, + {ActivationTypes::Clamp, {-20.1, -10.5}}, + {ActivationTypes::Clamp, {-10.0, 10.0}}, + {ActivationTypes::Clamp, {10.3, 20.4}}, + {ActivationTypes::Clamp, {0.1, 10.1}}, + {ActivationTypes::Clamp, {10.0, 100.0}}, + {ActivationTypes::Clamp, {10.6, 20.6}}}; const Precisions clampNetPrcSmoke{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16, @@ -2078,14 +2079,14 @@ INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic_Clamp_I64, // clang-format off // {AUTOGENERATED_TESTS_BEGIN_TAG_CLAMP} using AutogenClampParams = std::pair< - std::pair>, + std::pair>, std::pair, std::vector>>; // Attrs: {'max': '6.0', 'min': '0.0'} // In: (1, 128, 1, 1) // Out: (1, 128, 1, 1) // Operators: 'ssd_mobilenet_v2_coco:opid357' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid357_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 128, 1, 1}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 128, 1, 1}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid357, ActivationLayerTest, @@ -2106,7 +2107,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 128, 2, 2) // Operators: 'ssd_mobilenet_v2_coco:opid329' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid329_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 128, 2, 2}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 128, 2, 2}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid329, ActivationLayerTest, @@ -2127,7 +2128,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 128, 3, 3) // Operators: 'ssd_mobilenet_v2_coco:opid306' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid324' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid306_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 128, 3, 3}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 128, 3, 3}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid306, ActivationLayerTest, @@ -2148,7 +2149,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 128, 5, 5) // Operators: 'ssd_mobilenet_v2_coco:opid301' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid301_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 128, 5, 5}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 128, 5, 5}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid301, ActivationLayerTest, @@ -2169,7 +2170,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 1280, 10, 10) // Operators: 'ssd_mobilenet_v2_coco:opid265' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid265_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 1280, 10, 10}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 1280, 10, 10}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid265, ActivationLayerTest, @@ -2190,7 +2191,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 144, 38, 38) // Operators: 'ssd_mobilenet_v2_coco:opid57' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid57_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 144, 38, 38}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 144, 38, 38}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid57, ActivationLayerTest, @@ -2211,7 +2212,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 144, 75, 75) // Operators: 'ssd_mobilenet_v2_coco:opid37' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid42' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid52' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid37_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 144, 75, 75}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 144, 75, 75}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid37, ActivationLayerTest, @@ -2232,7 +2233,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 192, 19, 19) // Operators: 'ssd_mobilenet_v2_coco:opid101' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid101_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 192, 19, 19}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 192, 19, 19}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid101, ActivationLayerTest, @@ -2253,7 +2254,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 192, 38, 38) // Operators: 'ssd_mobilenet_v2_coco:opid66' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid71' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid81' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid86' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid96' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid66_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 192, 38, 38}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 192, 38, 38}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid66, ActivationLayerTest, @@ -2274,7 +2275,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 256, 10, 10) // Operators: 'ssd_mobilenet_v2_coco:opid278' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid278_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 256, 10, 10}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 256, 10, 10}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid278, ActivationLayerTest, @@ -2295,7 +2296,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 256, 2, 2) // Operators: 'ssd_mobilenet_v2_coco:opid334' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid334_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 256, 2, 2}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 256, 2, 2}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid334, ActivationLayerTest, @@ -2316,7 +2317,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 256, 3, 3) // Operators: 'ssd_mobilenet_v2_coco:opid311' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid311_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 256, 3, 3}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 256, 3, 3}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid311, ActivationLayerTest, @@ -2337,7 +2338,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 256, 5, 5) // Operators: 'ssd_mobilenet_v2_coco:opid283' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid283_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 256, 5, 5}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 256, 5, 5}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid283, ActivationLayerTest, @@ -2358,7 +2359,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 32, 150, 150) // Operators: 'ssd_mobilenet_v2_coco:opid14' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid9' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid14_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 32, 150, 150}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 32, 150, 150}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid14, ActivationLayerTest, @@ -2379,7 +2380,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 384, 19, 19) // Operators: 'ssd_mobilenet_v2_coco:opid110' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid115' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid125' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid130' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid140' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid145' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid155' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid160' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid110_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 384, 19, 19}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 384, 19, 19}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid110, ActivationLayerTest, @@ -2400,7 +2401,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 512, 5, 5) // Operators: 'ssd_mobilenet_v2_coco:opid288' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid288_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 512, 5, 5}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 512, 5, 5}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid288, ActivationLayerTest, @@ -2421,7 +2422,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 512, 50, 86) // Operators: 'mask_rcnn_inception_v2_coco:opid277' [FP16, FP32] const AutogenClampParams autogen_Clamp_mask_rcnn_inception_v2_coco_opid277_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 512, 50, 86}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 512, 50, 86}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_mask_rcnn_inception_v2_coco_opid277, ActivationLayerTest, @@ -2442,7 +2443,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 576, 10, 10) // Operators: 'ssd_mobilenet_v2_coco:opid212' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid212_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 576, 10, 10}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 576, 10, 10}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid212, ActivationLayerTest, @@ -2463,7 +2464,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 576, 19, 19) // Operators: 'ssd_mobilenet_v2_coco:opid169' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid174' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid184' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid189' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid199' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid169_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 576, 19, 19}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 576, 19, 19}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid169, ActivationLayerTest, @@ -2484,7 +2485,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 64, 1, 1) // Operators: 'ssd_mobilenet_v2_coco:opid352' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid352_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 64, 1, 1}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 64, 1, 1}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid352, ActivationLayerTest, @@ -2505,7 +2506,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 64, 2, 2) // Operators: 'ssd_mobilenet_v2_coco:opid347' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid347_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 64, 2, 2}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 64, 2, 2}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid347, ActivationLayerTest, @@ -2526,7 +2527,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 96, 150, 150) // Operators: 'ssd_mobilenet_v2_coco:opid23' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid23_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 96, 150, 150}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 96, 150, 150}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid23, ActivationLayerTest, @@ -2547,7 +2548,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 96, 75, 75) // Operators: 'ssd_mobilenet_v2_coco:opid28' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid28_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 96, 75, 75}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 96, 75, 75}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid28, ActivationLayerTest, @@ -2568,7 +2569,7 @@ INSTANTIATE_TEST_CASE_P( // Out: (1, 960, 10, 10) // Operators: 'ssd_mobilenet_v2_coco:opid221' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid226' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid236' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid241' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid251' [FP16, FP32], 'ssd_mobilenet_v2_coco:opid256' [FP16, FP32] const AutogenClampParams autogen_Clamp_ssd_mobilenet_v2_coco_opid221_params = - {{ngraph::helpers::Clamp, {0.0, 6.0}}, {{1, 960, 10, 10}, {}}}; + {{ActivationTypes::Clamp, {0.0, 6.0}}, {{1, 960, 10, 10}, {}}}; INSTANTIATE_TEST_CASE_P( autogen_Clamp_ssd_mobilenet_v2_coco_opid221, ActivationLayerTest, @@ -2617,7 +2618,7 @@ namespace benchmark { // ------------- Clamp Big shapes------------- -const ClampParams clampParamsBig{ngraph::helpers::Clamp, {0.0, 10.0}}; +const ClampParams clampParamsBig{ActivationTypes::Clamp, {0.0, 10.0}}; const Precisions clampNetPrcBig{InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; @@ -2751,8 +2752,8 @@ TEST_F(ClampBenchmark, DISABLED_benchmark) { // ============================================================================= // ------------- Swish ------------- -const std::initializer_list>> smoke_SwishParams{ - {ngraph::helpers::Swish, {0.59}}, {ngraph::helpers::Swish, {1.0}}, {ngraph::helpers::Swish, {-3.277}}}; +const std::initializer_list>> smoke_SwishParams{ + {ActivationTypes::Swish, {0.59}}, {ActivationTypes::Swish, {1.0}}, {ActivationTypes::Swish, {-3.277}}}; const std::initializer_list> smoke_SwishShapes{ {1}, @@ -2785,7 +2786,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid181, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2804,7 +2805,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid482, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2823,7 +2824,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_yolov5_640x640_FP32_IR_opid134, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2842,7 +2843,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_yolov5_640x640_FP32_IR_opid124, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2861,7 +2862,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid114, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2880,7 +2881,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid147, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2899,7 +2900,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid36, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2918,7 +2919,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid621, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2937,7 +2938,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid268, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2956,7 +2957,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid234, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2975,7 +2976,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid169, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -2994,7 +2995,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_yolov5_640x640_FP32_IR_opid188, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3013,7 +3014,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_yolov5_640x640_FP32_IR_opid129, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3032,7 +3033,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid379, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3051,7 +3052,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_yolov5_640x640_FP32_IR_opid48, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3070,7 +3071,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid14, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3089,7 +3090,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid43, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3108,7 +3109,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid494, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3127,7 +3128,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid256, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3146,7 +3147,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_yolov5_640x640_FP32_IR_opid183, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3165,7 +3166,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid126, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3184,7 +3185,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_yolov5_640x640_FP32_IR_opid43, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3203,7 +3204,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_yolov5_640x640_FP32_IR_opid101, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3222,7 +3223,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid460, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3241,7 +3242,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid367, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3260,7 +3261,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid21, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3279,7 +3280,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid633, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3298,7 +3299,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid1017, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3317,7 +3318,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid1029, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3336,7 +3337,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid1041, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3355,7 +3356,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid1005, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3374,7 +3375,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid1053, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3393,7 +3394,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid64, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3412,7 +3413,7 @@ INSTANTIATE_TEST_CASE_P( autogen_Swish_efficientdet_d1_tf_opid59, ActivationLayerTest, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -3432,7 +3433,7 @@ const std::initializer_list> Floor_shapes = { INSTANTIATE_TEST_CASE_P( Floor_Yolov5s, ActivationLayerTest, - ::testing::Combine(::testing::Values(std::pair{ngraph::helpers::Floor, 0}), + ::testing::Combine(::testing::Values(std::pair{ActivationTypes::Floor, 0}), ::testing::ValuesIn(std::vector({InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp index 39a972fb2..935d44e71 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/comparison.cpp @@ -12,7 +12,6 @@ namespace { using namespace ov::test; using namespace ov::test::utils; -using namespace ngraph::helpers; class UnsymmetricalComparisonLayerTest : public UnsymmetricalComparer {}; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp index e57a0b778..623fe7861 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp @@ -158,10 +158,8 @@ class ConvolutionBackpropDataExtendedLayerTest auto outputShapeNode = std::make_shared( ov::element::Type_t::i64, ov::Shape{outputShapeData.size()}, outputShapeData); - auto paramOuts = - ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto convBackpropData = std::dynamic_pointer_cast( - makeConvolutionBackpropData(paramOuts[0], + makeConvolutionBackpropData(params[0], outputShapeNode, ngPrc, kernel, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp index 9d5ece80c..a8ac9ca4d 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_backprop_data_add.cpp @@ -156,10 +156,8 @@ class ConvolutionBackpropDataAddExtendedLayerTest auto outputShapeNode = std::make_shared( ov::element::Type_t::i64, ov::Shape{outputShapeData.size()}, outputShapeData); - auto paramOuts = - ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto convBackpropData = std::dynamic_pointer_cast( - makeConvolutionBackpropData(paramOuts[0], + makeConvolutionBackpropData(params[0], outputShapeNode, ngPrc, kernel, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp index 0cd408b9d..8b8ed879b 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.cpp @@ -21,6 +21,7 @@ #include "average_finder.hpp" namespace LayerTestsDefinitions { +using ov::test::utils::ActivationTypes; constexpr uint32_t RANGE = 10; constexpr int32_t START_FROM = -5; @@ -85,9 +86,9 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP32, }; -const std::vector netActivations = { - ngraph::helpers::ActivationTypes::None, - ngraph::helpers::ActivationTypes::Relu, +const std::vector netActivations = { + ActivationTypes::None, + ActivationTypes::Relu, }; /* ============= 2D Convolution ============= */ @@ -225,7 +226,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({1, 88, 10, 10})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::Values(ngraph::helpers::ActivationTypes::None)), + ::testing::Values(ActivationTypes::None)), ConvolutionBiasAddActivationThresholdLayerTest::getTestCaseName); /* ============= resnet50/vgg16 Convolutions ============= */ diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp index 83a92fac4..cf43100b7 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution_biasadd_activation.hpp @@ -31,16 +31,17 @@ #include namespace LayerTestsDefinitions { +using ov::test::utils::ActivationTypes; // TODO: Consider to add bias shape in here too, instead of deriving it in test class. // That would allow test generator to use bias shape from model typedef std::tuple convBAATestParamSet; typedef std::tuple groupConvBAATestParamSet; @@ -89,13 +90,13 @@ class BasicConvolutionBiasAddActivationLayerTest static std::string getTestCaseName(testing::TestParamInfo obj) { typename Traits::ConvParamSet convParamSet; - ngraph::helpers::ActivationTypes activation; + ActivationTypes activation; std::tie(convParamSet, activation) = obj.param; std::ostringstream result; result << TConvLayerTest::getTestCaseName({convParamSet, obj.index}) << "_"; result << "Activation=" - << (activation == ngraph::helpers::ActivationTypes::None + << (activation == ActivationTypes::None ? "None" : LayerTestsDefinitions::activationNames[activation]); return result.str(); @@ -104,7 +105,7 @@ class BasicConvolutionBiasAddActivationLayerTest protected: void SetUp() override { typename Traits::ConvParamSet convParamSet; - ngraph::helpers::ActivationTypes activation; + ActivationTypes activation; std::tie(convParamSet, activation) = this->GetParam(); ov::element::Type ngNetPrc = ov::element::Type_t::undefined; @@ -133,7 +134,7 @@ class BasicConvolutionBiasAddActivationLayerTest } else { lastNode = biasAddLayer; } - if (activation != ngraph::helpers::ActivationTypes::None) { + if (activation != ActivationTypes::None) { lastNode = ngraph::builder::makeActivation(lastNode, ngNetPrc, activation); } @@ -164,14 +165,11 @@ class BasicConvolutionBiasAddActivationLayerTest auto ngPrc = FuncTestUtils::PrecisionUtils::convertIE2nGraphPrc(netPrecision); ov::ParameterVector params{std::make_shared(ngPrc, ov::Shape(inputShape))}; - - auto paramOuts = - ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); std::vector filter_weights; std::shared_ptr convNode = nullptr; if constexpr (!isGroup) { - convNode = ngraph::builder::makeConvolution(paramOuts[0], + convNode = ngraph::builder::makeConvolution(params[0], ngPrc, kernel, stride, @@ -183,7 +181,7 @@ class BasicConvolutionBiasAddActivationLayerTest false, filter_weights); } else { - convNode = ngraph::builder::makeGroupConvolution(paramOuts[0], + convNode = ngraph::builder::makeGroupConvolution(params[0], ngPrc, kernel, stride, diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp index d0e4053fa..447cfc579 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/cuda_eltwise.cpp @@ -28,6 +28,8 @@ namespace LayerTestsDefinitions { namespace { +using ov::test::utils::EltwiseTypes; +using ov::test::utils::InputLayerType; template void replace(InferenceEngine::Blob::Ptr& blob, float old_value, float new_value, bool is_integer) { @@ -166,18 +168,18 @@ InferenceEngine::Blob::Ptr CudaEltwiseLayerTest::GenerateInput(const InferenceEn const auto precision = info.getPrecision(); const auto is_float = precision.is_float(); switch (op_type) { - case ngraph::helpers::EltwiseTypes::POWER: + case EltwiseTypes::POWER: return is_float ? FuncTestUtils::createAndFillBlob(info.getTensorDesc(), 2, 2, 128) : FuncTestUtils::createAndFillBlob(info.getTensorDesc(), 4, 2); - case ngraph::helpers::EltwiseTypes::DIVIDE: - case ngraph::helpers::EltwiseTypes::MOD: { + case EltwiseTypes::DIVIDE: + case EltwiseTypes::MOD: { auto blob = FuncTestUtils::createAndFillBlob(info.getTensorDesc(), range, start_from, resolution, seed); if (!is_float && info.name() == secondary_input_name) { replace(blob, precision, 0, 1, true); } return blob; } - case ngraph::helpers::EltwiseTypes::ERF: + case EltwiseTypes::ERF: return FuncTestUtils::createAndFillBlob(info.getTensorDesc(), 6, -3); default: return FuncTestUtils::createAndFillBlob(info.getTensorDesc(), range, start_from, resolution, seed); @@ -193,9 +195,9 @@ void CudaEltwiseLayerTest::SetUp() { ov::test::ElementType netType; ov::test::ElementType in_prc; ov::test::ElementType out_prc; - ngraph::helpers::InputLayerType secondaryInputType; + InputLayerType secondaryInputType; ov::test::utils::OpType opType; - ngraph::helpers::EltwiseTypes eltwiseType; + EltwiseTypes eltwiseType; ov::AnyMap additionalConfig; const ov::test::subgraph::EltwiseTestParams ew_params = std::get<0>(this->GetParam()); const OperationMode mode = std::get<1>(this->GetParam()); @@ -223,12 +225,12 @@ void CudaEltwiseLayerTest::SetUp() { FAIL() << "Unsupported Secondary operation type"; } // To propagate shape_input_secondary just in static case because all shapes are defined in dynamic scenarion - if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) { + if (secondaryInputType == InputLayerType::PARAMETER) { transformInputShapesAccordingEltwise(shape_input_secondary); } std::shared_ptr secondaryInput; - if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) { + if (secondaryInputType == InputLayerType::PARAMETER) { auto input = std::make_shared(netType, shape_input_secondary); secondaryInput = input; parameters.push_back(input); @@ -238,8 +240,8 @@ void CudaEltwiseLayerTest::SetUp() { auto data = NGraphFunctions::Utils::generateVector( ngraph::shape_size(shape), up_to, start_from, seed); switch (eltwiseType) { - case ngraph::helpers::EltwiseTypes::DIVIDE: - case ngraph::helpers::EltwiseTypes::MOD: { + case EltwiseTypes::DIVIDE: + case EltwiseTypes::MOD: { if (ov::element::Type{netType}.is_integral()) { std::replace_if( data.begin(), @@ -250,7 +252,7 @@ void CudaEltwiseLayerTest::SetUp() { secondaryInput = std::make_shared(netType, shape, data); break; } - case ngraph::helpers::EltwiseTypes::POWER: { + case EltwiseTypes::POWER: { ov::Tensor random_tensor(netType, shape); ov::test::utils::fill_tensor_random(random_tensor, 3, -3); secondaryInput = std::make_shared(random_tensor); @@ -268,7 +270,7 @@ void CudaEltwiseLayerTest::SetUp() { secondary_input_name = secondaryInput->get_friendly_name(); const bool is_python_divide = mode == OperationMode::PYTHON_DIVIDE; - auto eltwise = eltwiseType == ngraph::helpers::EltwiseTypes::DIVIDE + auto eltwise = eltwiseType == EltwiseTypes::DIVIDE ? std::make_shared(parameters[0], secondaryInput, is_python_divide) : ngraph::builder::makeEltwise(parameters[0], secondaryInput, eltwiseType); function = std::make_shared(eltwise, parameters, "Eltwise"); diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp index 056ef9f4a..22172f746 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/eltwise_test.cpp @@ -19,10 +19,12 @@ namespace LayerTestsDefinitions { namespace { +using ov::test::utils::InputLayerType; +using ov::test::utils::EltwiseTypes; // Common parameters -const std::vector input_layer_types = {ngraph::helpers::InputLayerType::CONSTANT, - ngraph::helpers::InputLayerType::PARAMETER}; +const std::vector input_layer_types = {InputLayerType::CONSTANT, + InputLayerType::PARAMETER}; const ov::AnyMap additional_config = {}; @@ -50,7 +52,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::ADD), + ::testing::Values(EltwiseTypes::ADD), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::ValuesIn(add_precisions), @@ -66,7 +68,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::ADD), + ::testing::Values(EltwiseTypes::ADD), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::Values(ov::test::ElementType::u32), @@ -82,7 +84,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::ADD), + ::testing::Values(EltwiseTypes::ADD), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::Values(ov::test::ElementType::i64), @@ -101,7 +103,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::MULTIPLY), + ::testing::Values(EltwiseTypes::MULTIPLY), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::ValuesIn(mul_precisions), @@ -120,7 +122,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::SUBTRACT), + ::testing::Values(EltwiseTypes::SUBTRACT), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::ValuesIn(sub_precisions), @@ -139,7 +141,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::DIVIDE), + ::testing::Values(EltwiseTypes::DIVIDE), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::ValuesIn(div_precisions), @@ -155,7 +157,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::DIVIDE), + ::testing::Values(EltwiseTypes::DIVIDE), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::Values(ov::test::ElementType::u32), @@ -171,7 +173,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::DIVIDE), + ::testing::Values(EltwiseTypes::DIVIDE), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::Values(ov::test::ElementType::i64), @@ -193,7 +195,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::SQUARED_DIFF), + ::testing::Values(EltwiseTypes::SQUARED_DIFF), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::ValuesIn(sq_diff_precisions), @@ -205,14 +207,14 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest::getTestCaseName); const std::vector floor_mod_precisions = { - ov::test::ElementType::f16, ov::test::ElementType::f32, ov::test::ElementType::i32, ov::test::ElementType::u8}; + ov::test::ElementType::f16, ov::test::ElementType::f32, ov::test::ElementType::i32/*, ov::test::ElementType::u8*/}; INSTANTIATE_TEST_CASE_P( smoke_FloorMod, CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::FLOOR_MOD), + ::testing::Values(EltwiseTypes::FLOOR_MOD), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::ValuesIn(floor_mod_precisions), @@ -222,13 +224,13 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); - +/* INSTANTIATE_TEST_CASE_P( smoke_FloorMod_U32, CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::FLOOR_MOD), + ::testing::Values(EltwiseTypes::FLOOR_MOD), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::Values(ov::test::ElementType::u32), @@ -238,13 +240,13 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(additional_config)), ::testing::Values(OperationMode::NORMAL)), CudaEltwiseLayerTest::getTestCaseName); - +*/ INSTANTIATE_TEST_CASE_P( smoke_FloorMod_I64, CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::FLOOR_MOD), + ::testing::Values(EltwiseTypes::FLOOR_MOD), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::Values(ov::test::ElementType::i64), @@ -268,7 +270,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(smoke_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::MOD), + ::testing::Values(EltwiseTypes::MOD), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(smoke_op_types), ::testing::ValuesIn(mod_precisions), @@ -315,7 +317,7 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation( renset50_vgg16_add_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::ADD), + ::testing::Values(EltwiseTypes::ADD), ::testing::ValuesIn(input_layer_types), ::testing::ValuesIn(renset50_vgg16_op_types), ::testing::ValuesIn(renset50_vgg16_input_precisions), @@ -346,8 +348,8 @@ INSTANTIATE_TEST_CASE_P( CudaEltwiseLayerTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation( tacotron2_Multiply_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::MULTIPLY), - ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), + ::testing::Values(EltwiseTypes::MULTIPLY), + ::testing::Values(InputLayerType::PARAMETER), ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(tacotron2_Multiply_input_precisions), ::testing::Values(ov::test::ElementType::undefined), @@ -389,8 +391,8 @@ INSTANTIATE_TEST_CASE_P( AddBenchmarkTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(bench_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::ADD), - ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), + ::testing::Values(EltwiseTypes::ADD), + ::testing::Values(InputLayerType::PARAMETER), ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(bench_add_precisions), ::testing::Values(ov::test::ElementType::undefined), @@ -418,8 +420,8 @@ INSTANTIATE_TEST_CASE_P( MultiplyBenchmarkTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(bench_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::MULTIPLY), - ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), + ::testing::Values(EltwiseTypes::MULTIPLY), + ::testing::Values(InputLayerType::PARAMETER), ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(bench_mul_precisions), ::testing::Values(ov::test::ElementType::undefined), @@ -447,8 +449,8 @@ INSTANTIATE_TEST_CASE_P( SubtractBenchmarkTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(bench_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::SUBTRACT), - ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), + ::testing::Values(EltwiseTypes::SUBTRACT), + ::testing::Values(InputLayerType::PARAMETER), ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(bench_sub_precisions), ::testing::Values(ov::test::ElementType::undefined), @@ -476,8 +478,8 @@ INSTANTIATE_TEST_CASE_P( DivideBenchmarkTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(bench_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::DIVIDE), - ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), + ::testing::Values(EltwiseTypes::DIVIDE), + ::testing::Values(InputLayerType::PARAMETER), ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(bench_div_precisions), ::testing::Values(ov::test::ElementType::undefined), @@ -510,8 +512,8 @@ INSTANTIATE_TEST_CASE_P( ModBenchmarkTest, ::testing::Combine( ::testing::Combine(::testing::ValuesIn(ov::test::static_shapes_to_test_representation(bench_shapes)), - ::testing::Values(ngraph::helpers::EltwiseTypes::MOD), - ::testing::Values(ngraph::helpers::InputLayerType::PARAMETER), + ::testing::Values(EltwiseTypes::MOD), + ::testing::Values(InputLayerType::PARAMETER), ::testing::Values(ov::test::utils::OpType::VECTOR), ::testing::ValuesIn(bench_mod_precisions), ::testing::Values(ov::test::ElementType::undefined), diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp index fd3e470db..65f2addb4 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/fully_connected.cpp @@ -6,8 +6,10 @@ #include #include "finite_comparer.hpp" +#include "common_test_utils/test_enums.hpp" namespace LayerTestsDefinitions { +using ov::test::utils::InputLayerType; struct FullyConnectedShapeRelatedParams { std::pair input1, input2; @@ -19,7 +21,7 @@ typedef std::tuple // Additional network configuration > @@ -33,7 +35,7 @@ class FullyConnectedLayerTest : public testing::WithParamInterface additionalConfig; std::tie(shapeRelatedParams, @@ -67,7 +69,7 @@ class FullyConnectedLayerTest : public testing::WithParamInterface additionalConfig; std::tie(shapeRelatedParams, @@ -86,17 +88,15 @@ class FullyConnectedLayerTest : public testing::WithParamInterface(ngPrc, ov::Shape{shapeRelatedParams.input1.first})}; std::shared_ptr secondaryInput; - if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) { + if (secondaryInputType == InputLayerType::PARAMETER) { secondaryInput = std::make_shared(ngPrc, ov::Shape(shapeRelatedParams.input2.first)); params.push_back(std::static_pointer_cast(secondaryInput)); } else { secondaryInput = std::make_shared(ngPrc, shapeRelatedParams.input2.first); } auto thirdInput = std::make_shared(ngPrc, shapeRelatedParams.input3); - auto paramOuts = - ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); auto MatMul = std::make_shared( - paramOuts[0], secondaryInput, shapeRelatedParams.input1.second, shapeRelatedParams.input2.second); + params[0], secondaryInput, shapeRelatedParams.input1.second, shapeRelatedParams.input2.second); auto Add = std::make_shared(MatMul, thirdInput); ov::ResultVector results{std::make_shared(Add)}; function = std::make_shared(results, params, "FullyConnected"); @@ -122,7 +122,7 @@ typedef std::tuple // Additional network configuration > @@ -136,7 +136,7 @@ class FullyConnectedLayer2MatMulTest : public testing::WithParamInterface additionalConfig; std::tie(shapeRelatedParams, @@ -174,7 +174,7 @@ class FullyConnectedLayer2MatMulTest : public testing::WithParamInterface additionalConfig; std::tie(shapeRelatedParams, @@ -196,7 +196,7 @@ class FullyConnectedLayer2MatMulTest : public testing::WithParamInterface(ngPrc, ov::Shape(shapeRelatedParams.matmul2_input1.first))); std::shared_ptr matmul0SecondaryInput; - if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) { + if (secondaryInputType == InputLayerType::PARAMETER) { matmul0SecondaryInput = std::make_shared(ngPrc, ov::Shape(shapeRelatedParams.matmul1_input2.first)); params.push_back(std::static_pointer_cast(matmul0SecondaryInput)); @@ -206,7 +206,7 @@ class FullyConnectedLayer2MatMulTest : public testing::WithParamInterface matmul1SecondaryInput; - if (secondaryInputType == ngraph::helpers::InputLayerType::PARAMETER) { + if (secondaryInputType == InputLayerType::PARAMETER) { matmul1SecondaryInput = std::make_shared(ngPrc, ov::Shape(shapeRelatedParams.matmul2_input2.first)); params.push_back(std::static_pointer_cast(matmul1SecondaryInput)); @@ -215,13 +215,11 @@ class FullyConnectedLayer2MatMulTest : public testing::WithParamInterface(ngPrc, shapeRelatedParams.matmul2_input2.first); } - auto paramOuts = - ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)); - auto matMul0 = std::make_shared(paramOuts[0], + auto matMul0 = std::make_shared(params[0], matmul0SecondaryInput, shapeRelatedParams.matmul1_input1.second, shapeRelatedParams.matmul1_input2.second); - auto matMul1 = std::make_shared(paramOuts[1], + auto matMul1 = std::make_shared(params[1], matmul1SecondaryInput, shapeRelatedParams.matmul2_input1.second, shapeRelatedParams.matmul2_input2.second); @@ -290,9 +288,9 @@ const std::vector tacatron2ShapeRelated {{{1, 1000, 32}, false}, {{128, 32}, true}, {{1, 1, 1024}, false}, {{128, 1024}, true}}, }; -std::vector secondaryInputTypes = { - ngraph::helpers::InputLayerType::CONSTANT, - ngraph::helpers::InputLayerType::PARAMETER, +std::vector secondaryInputTypes = { + InputLayerType::CONSTANT, + InputLayerType::PARAMETER, }; std::map additional_config = {}; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.cpp.jinja2 index 718a2ec93..9c815f5d6 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.cpp.jinja2 @@ -1,5 +1,5 @@ using {{test_traits.cpp_alias_name}} = std::pair< - std::pair>, + std::pair>, std::pair, std::vector>>; {%- for op in operators %} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.py b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.py index 52fee572c..e21a0d80e 100755 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.py +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/clamp.py @@ -49,7 +49,7 @@ def cpp_params_name(self): @property def cpp_params_decl(self): - return 'const {type} {name} = \n\t{{{{ngraph::helpers::Clamp, {{{min}, {max}}}}}, {{{shape}, {{}}}}}};'.format( + return 'const {type} {name} = \n\t{{{{ActivationTypes::Clamp, {{{min}, {max}}}}}, {{{shape}, {{}}}}}};'.format( type = self.test_traits.cpp_alias_name, name = self.cpp_params_name, min = self.op.data['min'].as_float(), diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.cpp.jinja2 index 312b1b9bb..ead89bc59 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.cpp.jinja2 @@ -20,7 +20,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({{op.cpp_list_input}})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{{op.cpp_activations}})), + ::testing::ValuesIn(std::vector{{op.cpp_activations}})), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.py b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.py index 68206307f..6fc8cb606 100755 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.py +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/convolution_biasadd_activation.py @@ -65,4 +65,4 @@ def cpp_auto_pad(self): @property def cpp_activations(self): - return '{ngraph::helpers::ActivationTypes::None,ngraph::helpers::ActivationTypes::Relu}' + return '{ActivationTypes::None,ActivationTypes::Relu}' diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.cpp.jinja2 index cdb888b4a..130e2a0b1 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.cpp.jinja2 @@ -21,7 +21,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(InferenceEngine::Layout::ANY), // Output layout ::testing::Values(std::vector({{op.cpp_list_input}})), // Input shape ::testing::Values(ov::test::utils::DEVICE_NVIDIA)), - ::testing::ValuesIn(std::vector{{op.cpp_activations}})), + ::testing::ValuesIn(std::vector{{op.cpp_activations}})), {{op.cpp_test_class_name}}::getTestCaseName); {% endfor -%} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.py b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.py index d0088453a..6f1c8dc93 100755 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.py +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/group_convolution_biasadd_activation.py @@ -69,4 +69,4 @@ def cpp_auto_pad(self): @property def cpp_activations(self): - return '{ngraph::helpers::ActivationTypes::None}' + return '{ActivationTypes::None}' diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/mat_mul.py b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/mat_mul.py index 22b847d0f..b14fe577d 100755 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/mat_mul.py +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/mat_mul.py @@ -46,7 +46,7 @@ def cpp_additional_config(self): @property def cpp_secondary_input_types(self): - return ('std::vector {' - 'ngraph::helpers::InputLayerType::CONSTANT, ' - 'ngraph::helpers::InputLayerType::PARAMETER' + return ('std::vector {' + 'InputLayerType::CONSTANT, ' + 'InputLayerType::PARAMETER' '}') diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/relu.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/relu.cpp.jinja2 index 4d13f85f6..0816a0326 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/relu.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/relu.cpp.jinja2 @@ -4,7 +4,7 @@ INSTANTIATE_TEST_CASE_P( {{op.cpp_test_name}}, {{op.cpp_test_class_name}}, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Relu, 0}), + ::testing::Values(std::pair{ActivationTypes::Relu, 0}), ::testing::ValuesIn(std::vector({{op.cpp_net_precisions}})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/sigmoid.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/sigmoid.cpp.jinja2 index fb575046b..fa95ea6e5 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/sigmoid.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/sigmoid.cpp.jinja2 @@ -4,7 +4,7 @@ INSTANTIATE_TEST_CASE_P( {{op.cpp_test_name}}, {{op.cpp_test_class_name}}, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Sigmoid, 0}), + ::testing::Values(std::pair{ActivationTypes::Sigmoid, 0}), ::testing::ValuesIn(std::vector({{op.cpp_net_precisions}})), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/swish.cpp.jinja2 b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/swish.cpp.jinja2 index 2c8badb53..104b0b945 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/swish.cpp.jinja2 +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/generator/ops/swish.cpp.jinja2 @@ -4,7 +4,7 @@ INSTANTIATE_TEST_CASE_P( {{op.cpp_test_name}}, {{op.cpp_test_class_name}}, ::testing::Combine( - ::testing::Values(std::pair{ngraph::helpers::Swish, {1.0}}), + ::testing::Values(std::pair{ActivationTypes::Swish, {1.0}}), {%- if op.has_beta %} // Warning!: Swish has > 1 inputs, beta != 1.0, actual beta value stored in binary model data {%- endif %} diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp index 1c36358e9..f0634b887 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation.cpp @@ -17,6 +17,7 @@ #include "convolution_biasadd_activation.hpp" namespace LayerTestsDefinitions { +using ov::test::utils::ActivationTypes; TEST_P(GroupConvolutionBiasAddActivationLayerTest, CompareWithRefs) { SKIP_IF_CURRENT_TEST_IS_DISABLED() @@ -37,10 +38,10 @@ TEST_P(GroupConvolutionBiasAddAddActivationLayerTest, CompareWithRefs) { const std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; -const std::vector netActivations = { - ngraph::helpers::ActivationTypes::None, +const std::vector netActivations = { + ActivationTypes::None, // TODO: enable when ReLU fusing transformation is enabled for GroupConvolution - // ngraph::helpers::ActivationTypes::Relu + // ActivationTypes::Relu }; /* ============= 1D Convolution ============= */ diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp index 7de9bb694..9d1528f95 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/group_convolution_biasadd_activation_autogenerated.cpp @@ -15,14 +15,15 @@ namespace LayerTestsDefinitions { namespace { +using ov::test::utils::ActivationTypes; const std::vector netPrecisions = { InferenceEngine::Precision::FP16, InferenceEngine::Precision::FP32, }; -const std::vector netActivations = { - ngraph::helpers::ActivationTypes::None, +const std::vector netActivations = { + ActivationTypes::None, }; // ============================================================================= diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp index cdc62cc17..8ebd9a35b 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_cell.cpp @@ -12,6 +12,7 @@ #include "unsymmetrical_comparer.hpp" namespace LayerTestsDefinitions { +using ov::test::utils::InputLayerType; constexpr int SEED_FIRST = 10; constexpr float THRESHOLD_FP16 = 0.05f; @@ -66,7 +67,7 @@ const std::vector linear_before_reset{true}; const std::vector net_precisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; -const std::vector WRBLayerTypes = {ngraph::helpers::InputLayerType::CONSTANT}; +const std::vector WRBLayerTypes = {InputLayerType::CONSTANT}; // ------------- Smoke shapes ------------- const std::vector smoke_batches_01{1, 2}; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp index 76cf66aca..a5c7a9bf5 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/gru_sequence.cpp @@ -10,9 +10,10 @@ #include "unsymmetrical_comparer.hpp" -namespace LayerTestsDefinitions { +using ov::test::utils::InputLayerType; +using ov::test::utils::SequenceTestsMode; -using ngraph::helpers::InputLayerType; +namespace LayerTestsDefinitions { class CUDNNGRUSequenceTest : public UnsymmetricalComparer { public: @@ -66,7 +67,6 @@ class LPCNetCUDNNGRUSequenceTest : public UnsymmetricalComparer } void updatedGRUSequenceTest_SetUp() { - using namespace ngraph::helpers; size_t seq_lengths; size_t batch; size_t hidden_size; @@ -107,7 +107,7 @@ class LPCNetCUDNNGRUSequenceTest : public UnsymmetricalComparer ASSERT_EQ(InputLayerType::CONSTANT, WRBType); std::vector WRB = {inputShapes[3], inputShapes[4], inputShapes[5], inputShapes[2]}; auto gru_sequence = - ngraph::builder::makeGRU(ngraph::helpers::convert2OutputVector(ngraph::helpers::castOps2Nodes(params)), + ngraph::builder::makeGRU(ov::OutputVector{params[0], params[1]}, WRB, hidden_size, activations, @@ -121,7 +121,7 @@ class LPCNetCUDNNGRUSequenceTest : public UnsymmetricalComparer ov::ResultVector results{std::make_shared(gru_sequence->output(0)), std::make_shared(gru_sequence->output(1))}; function = std::make_shared(results, params, "gru_sequence"); - bool ti_found = is_tensor_iterator_exist(function); + bool ti_found = ngraph::helpers::is_tensor_iterator_exist(function); EXPECT_EQ(ti_found, false); } @@ -151,7 +151,7 @@ TEST_P(LPCNetCUDNNGRUSequenceTest, CompareWithRefs) { using namespace LayerTestsDefinitions; namespace { -ngraph::helpers::SequenceTestsMode mode{ngraph::helpers::SequenceTestsMode::PURE_SEQ}; +SequenceTestsMode mode{SequenceTestsMode::PURE_SEQ}; // output values increase rapidly without clip, so use only seq_lengths = 2 std::vector seq_lengths{1, 2, 5, 10}; std::vector batch{1}; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp index 0cdd46ce1..a2df570b3 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_cell.cpp @@ -15,6 +15,7 @@ #include "cuda_thread_context.hpp" namespace LayerTestsDefinitions { +using ov::test::utils::InputLayerType; constexpr int SEED_FIRST = 10; constexpr float THRESHOLD_FP16 = 0.06f; @@ -66,7 +67,7 @@ const bool should_decompose = false; const std::vector activations{"sigmoid", "tanh", "tanh"}; const std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; -const std::vector WRBLayerTypes = {ngraph::helpers::InputLayerType::CONSTANT}; +const std::vector WRBLayerTypes = {InputLayerType::CONSTANT}; // ------------- Smoke shapes ------------- const std::vector smoke_batch{1, 5}; diff --git a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp index 5d27b0c12..19c0982f4 100644 --- a/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp +++ b/modules/nvidia_plugin/tests/functional/shared_tests_instances/single_layer_tests/lstm_sequence.cpp @@ -14,6 +14,8 @@ #include "unsymmetrical_comparer.hpp" namespace LayerTestsDefinitions { +using ov::test::utils::InputLayerType; +using ov::test::utils::SequenceTestsMode; class CUDALSTMSequenceTest : public UnsymmetricalComparer { void SetUp() override { @@ -36,7 +38,7 @@ class CUDALSTMSequenceTest : public UnsymmetricalComparer { }; using LSTMSequenceOptimizedParams = - typename std::tuple