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

snippets shared tests to API2.0 (#21631)

Browse Source
This commit is contained in:
Vitaliy Urusovskij 2023-12-15 09:56:23 +04:00 committed by GitHub
parent 94a21d606c
commit 193cc26658
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 88 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/intel_cpu/tests/functional/shared_tests_instances/snippets/mha.cpp
View File

@ -5,9 +5,6 @@
#include "snippets/mha.hpp"
#include "common_test_utils/test_constants.hpp"
#include "test_utils/cpu_test_utils.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
#include "ie_plugin_config.hpp"
#include "ie_system_conf.h"
namespace ov {
namespace test {
@ -48,10 +45,7 @@ static inline std::vector<std::vector<element::Type>> precision_bf16(size_t coun
static std::map<std::string, std::string> enable_callback() {
return std::map<std::string, std::string>{
{
InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::ENABLE
},
{"SNIPPETS_MODE", "ENABLE"},
};
}

21
src/tests/functional/plugin/shared/src/snippets/add.cpp
View File

@ -7,7 +7,6 @@
#include "subgraph_simple.hpp"
#include "ov_models/builders.hpp"
#include "functional_test_utils/skip_tests_config.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -46,9 +45,8 @@ void Add::SetUp() {
auto f = ov::test::snippets::AddFunction(inputDynamicShapes);
function = f.getOriginal();
setInferenceType(type);
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -83,9 +81,8 @@ void AddConst::SetUp() {
auto f = ov::test::snippets::AddConstFunction({inputDynamicShapes}, constShape);
function = f.getOriginal();
setInferenceType(type);
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -98,9 +95,8 @@ void AddRollConst::SetUp() {
auto f = ov::test::snippets::AddRollConstFunction({inputDynamicShapes}, constShape);
function = f.getOriginal();
setInferenceType(type);
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -138,9 +134,8 @@ void AddPair::SetUp() {
auto f = ov::test::snippets::AddFunction(inputDynamicShapes);
function = f.getOriginal();
setInferenceType(type);
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

12
src/tests/functional/plugin/shared/src/snippets/check_broadcast.cpp
View File

@ -7,7 +7,6 @@
#include "common_test_utils/common_utils.hpp"
#include "subgraph_converts.hpp"
#include "common_test_utils/ov_tensor_utils.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -35,9 +34,9 @@ public:
const auto result = std::make_shared<ov::op::v0::Result>(parent);
result->set_friendly_name("result");
return std::make_shared<ngraph::Function>(
ngraph::ResultVector{ result },
ngraph::ParameterVector{ parameter1, parameter2 },
return std::make_shared<ov::Model>(
ov::ResultVector{ result },
ov::ParameterVector{ parameter1, parameter2 },
"CheckBroadcastFunction");
}
};
@ -84,9 +83,8 @@ void CheckBroadcast::SetUp() {
inputDynamicShapes[1],
input_type,
test_case_params.broadcast);
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

14
src/tests/functional/plugin/shared/src/snippets/codegen_bert.cpp
View File

@ -8,8 +8,6 @@
#include <vector>
#include <string>
#include <ie_core.hpp>
#include "common_test_utils/common_utils.hpp"
#include "functional_test_utils/plugin_cache.hpp"
#include "shared_test_classes/base/layer_test_utils.hpp"
@ -44,17 +42,17 @@ namespace snippets {
ov::element::Type_t netPrecision;
std::tie(netPrecision, inputShape0, inputShape1, targetDevice) = this->GetParam();
auto shape = ngraph::Shape{inputShape0};
auto shape = ov::Shape{inputShape0};
auto input1 = std::make_shared<ov::op::v0::Parameter>(netPrecision, shape);
auto input2 = std::make_shared<ov::op::v0::Parameter>(netPrecision, shape);
auto shapeMM = ngraph::Shape{inputShape1};
auto shapeMM = ov::Shape{inputShape1};
auto input3 = std::make_shared<ov::op::v0::Parameter>(netPrecision, shapeMM);
auto add = std::make_shared<ov::op::v1::Add>(input1, input2);
auto mm = std::make_shared<ov::op::v0::MatMul>(add, input3);
std::vector<float> vals(ngraph::shape_size(shape));
std::vector<float> vals(ov::shape_size(shape));
for (int i = 0; i < vals.size(); i++) {
vals[i] = static_cast<float>(i)*vals.size();
}
@ -65,10 +63,10 @@ namespace snippets {
auto add3 = std::make_shared<ov::op::v1::Multiply>(add, add2);
auto result = std::make_shared<ov::op::v0::Result>(add3);
function = std::make_shared<ngraph::Function>(
ngraph::ResultVector{result},
function = std::make_shared<ov::Model>(
ov::ResultVector{result},
// it should be some topological order to pass parameters for reference code to be executed correctly
ngraph::ParameterVector{input1, input2, c0, input3},
ov::ParameterVector{input1, input2, c0, input3},
"CodegenBert");
}

6
src/tests/functional/plugin/shared/src/snippets/codegen_gelu.cpp
View File

@ -11,7 +11,6 @@
#include "subgraph_simple.hpp"
#include "ov_models/builders.hpp"
#include "functional_test_utils/skip_tests_config.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -66,9 +65,8 @@ namespace snippets {
ov::pass::InitNodeInfo().run_on_model(function);
ov::pass::ConstantFolding().run_on_model(function);
}
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

41
src/tests/functional/plugin/shared/src/snippets/convert.cpp
View File

@ -6,7 +6,6 @@
#include "snippets/convert.hpp"
#include "subgraph_converts.hpp"
#include "common_test_utils/ov_tensor_utils.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -43,9 +42,8 @@ void Convert::SetUp() {
auto f = ov::test::snippets::ConvertFunction(inputDynamicShapes, types.first[0], types.second[0]);
function = f.getOriginal();
output_type = types.second.front();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -102,9 +100,8 @@ void ConvertInput::SetUp() {
init_input_shapes(inputShape);
auto f = ov::test::snippets::ConvertInputFunction(inputDynamicShapes, types.first[0], types.second[0]);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -147,9 +144,8 @@ void ConvertOutput::SetUp() {
auto f = ov::test::snippets::ConvertOutputFunction(inputDynamicShapes, types.first[0], types.second[0]);
function = f.getOriginal();
output_type = types.second.front();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -162,9 +158,8 @@ void ConvertStub::SetUp() {
auto f = ov::test::snippets::ConvertStubFunction(inputDynamicShapes, types.first[0], types.second[0]);
function = f.getOriginal();
output_type = types.second.front();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -176,9 +171,8 @@ void ConvertPartialInputsAndResults::SetUp() {
auto f = ov::test::snippets::ConvertPartialInputsAndResultsFunction(inputDynamicShapes, types.first, types.second);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -190,9 +184,8 @@ void ConvertManyOnInputs::SetUp() {
auto f = ov::test::snippets::ConvertManyOnInputsFunction(inputDynamicShapes, types.first);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -204,9 +197,8 @@ void ConvertManyOnOutputs::SetUp() {
auto f = ov::test::snippets::ConvertManyOnOutputsFunction(inputDynamicShapes, types.first);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -218,9 +210,8 @@ void ConvertManyOnInputOutput::SetUp() {
auto f = ov::test::snippets::ConvertManyOnInputOutputFunction(inputDynamicShapes, types.first, types.second);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

6
src/tests/functional/plugin/shared/src/snippets/eltwise_two_results.cpp
View File

@ -5,7 +5,6 @@
#include "common_test_utils/common_utils.hpp"
#include "snippets/eltwise_two_results.hpp"
#include "subgraph_simple.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -42,9 +41,8 @@ void EltwiseTwoResults::SetUp() {
auto f = ov::test::snippets::EltwiseTwoResultsFunction({inputDynamicShapes[0], inputDynamicShapes[1]});
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

6
src/tests/functional/plugin/shared/src/snippets/enforce_precision.cpp
View File

@ -6,7 +6,6 @@
#include "common_test_utils/common_utils.hpp"
#include "subgraph_roll_matmul_roll.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -34,9 +33,8 @@ void EnforcePrecisionTest::SetUp() {
function = SubgraphRollMatMulRollFunction(input_shapes, ov::element::f32).getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({ InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK });
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
setInferenceType(element::bf16);

5
src/tests/functional/plugin/shared/src/snippets/fake_quantize_decomposition_test.cpp
View File

@ -10,7 +10,6 @@
#include <vector>
#include <string>
#include <ie_core.hpp>
#include "ov_ops/type_relaxed.hpp"
#include "fake_quantize_helper.hpp"
#include "function_helper.hpp"
@ -25,7 +24,7 @@ std::string FakeQuantizeDecompositionTest::getTestCaseName(testing::TestParamInf
const auto targetDevice = std::get<3>(obj.param);
const auto type_info = operation.first->get_type_info();
const auto operationString = ngraph::is_type<ov::op::v0::Parameter>(operation.first) ?
const auto operationString = ov::is_type<ov::op::v0::Parameter>(operation.first) ?
"nullptr" :
(std::string(type_info.name) + "_" + std::string(type_info.version_id));
@ -55,7 +54,7 @@ void FakeQuantizeDecompositionTest::SetUp() {
init_input_shapes({{values.inputShape, {values.inputShape}}});
std::shared_ptr<ngraph::Node> op = ngraph::is_type<ov::op::v0::Parameter>(operation.first) ? nullptr : operation.first;
std::shared_ptr<ov::Node> op = ov::is_type<ov::op::v0::Parameter>(operation.first) ? nullptr : operation.first;
function = ov::test::snippets::FakeQuantizeFunction::getOperationAndFakeQuantize(
{values.inputShape},
values.inputType,

6
src/tests/functional/plugin/shared/src/snippets/matmul.cpp
View File

@ -6,7 +6,6 @@
#include "snippets/matmul.hpp"
#include "subgraph_matmul.hpp"
#include "functional_test_utils/skip_tests_config.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -36,9 +35,8 @@ void MatMul::SetUp() {
init_input_shapes(static_partial_shapes_to_test_representation(input_shapes));
init_subgraph(input_shapes, elem_types);
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

6
src/tests/functional/plugin/shared/src/snippets/max_num_params_eltwise.cpp
View File

@ -5,7 +5,6 @@
#include "common_test_utils/common_utils.hpp"
#include "snippets/max_num_params_eltwise.hpp"
#include "subgraph_simple.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -38,9 +37,8 @@ void MaxNumParamsEltwise::SetUp() {
auto f = ov::test::snippets::EltwiseMaxNumParamsFunction(inputDynamicShapes);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

13
src/tests/functional/plugin/shared/src/snippets/mha.cpp
View File

@ -6,7 +6,6 @@
#include "snippets/mha.hpp"
#include "subgraph_mha.hpp"
#include "functional_test_utils/skip_tests_config.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
#include <common_test_utils/ov_tensor_utils.hpp>
namespace ov {
@ -39,8 +38,7 @@ std::string MHA::getTestCaseName(testing::TestParamInfo<ov::test::snippets::MHAP
if (!additionalConfig.empty()) {
result << "_PluginConf";
for (auto &item : additionalConfig) {
if (item.second == InferenceEngine::PluginConfigParams::YES)
result << "_" << item.first << "=" << item.second;
result << "_" << item.first << "=" << item.second;
}
}
return result.str();
@ -58,9 +56,8 @@ void MHA::SetUp() {
function = subgraph_model->getOriginal();
configuration.insert(additionalConfig.begin(), additionalConfig.end());
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
setInferenceType(prc);
@ -75,7 +72,7 @@ void MHA::compile_model() {
SubgraphBaseTest::compile_model();
}
void MHA::generate_inputs(const std::vector<ngraph::Shape>& targetInputStaticShapes) {
void MHA::generate_inputs(const std::vector<ov::Shape>& targetInputStaticShapes) {
inputs.clear();
const auto& model_inputs = function->inputs();
for (int i = 0; i < model_inputs.size(); ++i) {
@ -95,7 +92,7 @@ std::shared_ptr<SnippetsFunctionBase> MHA::get_subgraph() {
return std::make_shared<ov::test::snippets::MHAFunction>(inputDynamicShapes, m_input_types, m_with_mul);
}
void MHASelect::generate_inputs(const std::vector<ngraph::Shape>& targetInputStaticShapes) {
void MHASelect::generate_inputs(const std::vector<ov::Shape>& targetInputStaticShapes) {
inputs.clear();
auto model_inputs = function->inputs();
for (auto& model_input : model_inputs) {

6
src/tests/functional/plugin/shared/src/snippets/precision_propagation_convertion.cpp
View File

@ -6,7 +6,6 @@
#include "common_test_utils/common_utils.hpp"
#include "precision_propagation_convertion.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -42,9 +41,8 @@ void PrecisionPropagationConvertion::SetUp() {
init_input_shapes(input_shapes);
function = PrecisionPropagationConvertionFunction(inputDynamicShapes, ov::element::f32, fake_quantize_intervals).getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

17
src/tests/functional/plugin/shared/src/snippets/select.cpp
View File

@ -4,7 +4,6 @@
#include "common_test_utils/common_utils.hpp"
#include <common_test_utils/ov_tensor_utils.hpp>
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
#include "snippets/select.hpp"
#include "subgraph_simple.hpp"
@ -14,7 +13,7 @@ namespace snippets {
namespace {
void generate_data(std::map<std::shared_ptr<ov::Node>, ov::Tensor>& data_inputs, const std::vector<ov::Output<ov::Node>>& model_inputs,
const std::vector<ngraph::Shape>& targetInputStaticShapes) {
const std::vector<ov::Shape>& targetInputStaticShapes) {
data_inputs.clear();
ov::test::utils::InputGenerateData in_data;
in_data.start_from = -1;
@ -76,13 +75,12 @@ void Select::SetUp() {
auto f = ov::test::snippets::SelectFunction(inputDynamicShapes);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
void Select::generate_inputs(const std::vector<ngraph::Shape>& targetInputStaticShapes) {
void Select::generate_inputs(const std::vector<ov::Shape>& targetInputStaticShapes) {
generate_data(inputs, function->inputs(), targetInputStaticShapes);
}
@ -128,13 +126,12 @@ void BroadcastSelect::SetUp() {
auto f = ov::test::snippets::BroadcastSelectFunction({inputDynamicShapes[0], inputDynamicShapes[1], inputDynamicShapes[2]}, broadcastShape);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
void BroadcastSelect::generate_inputs(const std::vector<ngraph::Shape>& targetInputStaticShapes) {
void BroadcastSelect::generate_inputs(const std::vector<ov::Shape>& targetInputStaticShapes) {
generate_data(inputs, function->inputs(), targetInputStaticShapes);
}

11
src/tests/functional/plugin/shared/src/snippets/softmax.cpp
View File

@ -7,7 +7,6 @@
#include "subgraph_softmax.hpp"
#include "ov_models/builders.hpp"
#include "functional_test_utils/skip_tests_config.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -42,9 +41,8 @@ void Softmax::SetUp() {
auto f = ov::test::snippets::SoftmaxFunction(inputDynamicShapes, axis);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -82,9 +80,8 @@ void AddSoftmax::SetUp() {
auto f = ov::test::snippets::AddSoftmaxFunction(inputDynamicShapes, axis);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

6
src/tests/functional/plugin/shared/src/snippets/three_inputs_eltwise.cpp
View File

@ -6,7 +6,6 @@
#include "snippets/three_inputs_eltwise.hpp"
#include "subgraph_simple.hpp"
#include "functional_test_utils/skip_tests_config.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -49,9 +48,8 @@ void ThreeInputsEltwise::SetUp() {
auto f = ov::test::snippets::EltwiseThreeInputsFunction(inputDynamicShapes);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

11
src/tests/functional/plugin/shared/src/snippets/transpose.cpp
View File

@ -6,7 +6,6 @@
#include "snippets/transpose.hpp"
#include "subgraph_transpose.hpp"
#include "functional_test_utils/skip_tests_config.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -36,9 +35,8 @@ void Transpose::SetUp() {
auto f = ov::test::snippets::TransposeFunction({inputShape}, order);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -66,9 +64,8 @@ void TransposeMul::SetUp() {
init_input_shapes(static_partial_shapes_to_test_representation(inputShapes));
auto f = ov::test::snippets::TransposeMulFunction(inputShapes, order);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

21
src/tests/functional/plugin/shared/src/snippets/transpose_matmul.cpp
View File

@ -6,7 +6,6 @@
#include "snippets/transpose_matmul.hpp"
#include "subgraph_matmul.hpp"
#include "functional_test_utils/skip_tests_config.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -41,9 +40,8 @@ void TransposeMatMul::SetUp() {
auto f = ov::test::snippets::Transpose0213MatMulFunction(input_shapes, elem_types, transpose_position);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -56,9 +54,8 @@ void TransposeMatMulFQ::SetUp() {
auto f = ov::test::snippets::FQMatMulFunction(input_shapes, transpose_position);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -71,9 +68,8 @@ void ExplicitTransposeMatMul::SetUp() {
auto f = ov::test::snippets::TransposeMatMulFunction(input_shapes);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -86,9 +82,8 @@ void ExplicitTransposeMatMulBias::SetUp() {
auto f = ov::test::snippets::TransposeMatMulBiasFunction(input_shapes);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}

11
src/tests/functional/plugin/shared/src/snippets/transpose_softmax.cpp
View File

@ -7,7 +7,6 @@
#include "subgraph_softmax.hpp"
#include "ov_models/builders.hpp"
#include "functional_test_utils/skip_tests_config.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -42,9 +41,8 @@ void TransposeSoftmax::SetUp() {
auto f = ov::test::snippets::TransposeSoftmaxFunction(inputDynamicShapes, order, axis);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -58,9 +56,8 @@ void TransposeSoftmaxEltwise::SetUp() {
auto f = ov::test::snippets::TransposeSoftmaxEltwiseFunction(inputDynamicShapes, order, axis);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
abs_threshold = 1e-6;

11
src/tests/functional/plugin/shared/src/snippets/two_inputs_and_outputs.cpp
View File

@ -5,7 +5,6 @@
#include "common_test_utils/common_utils.hpp"
#include "snippets/two_inputs_and_outputs.hpp"
#include "subgraph_simple.hpp"
#include "cpp_interfaces/interface/ie_internal_plugin_config.hpp"
namespace ov {
namespace test {
@ -37,9 +36,8 @@ void TwoInputsAndOutputs::SetUp() {
init_input_shapes(inputShape);
auto f = ov::test::snippets::TwoInputsAndOutputsFunction(inputDynamicShapes);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}
@ -49,9 +47,8 @@ void TwoInputsAndOutputsWithReversedOutputs::SetUp() {
init_input_shapes(inputShape);
auto f = ov::test::snippets::TwoInputsAndOutputsWithReversedOutputsFunction(inputDynamicShapes);
function = f.getOriginal();
if (!configuration.count(InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE)) {
configuration.insert({InferenceEngine::PluginConfigInternalParams::KEY_SNIPPETS_MODE,
InferenceEngine::PluginConfigInternalParams::IGNORE_CALLBACK});
if (!configuration.count("SNIPPETS_MODE")) {
configuration.insert({"SNIPPETS_MODE", "IGNORE_CALLBACK"});
}
}