diff --git a/cmake/test_model_zoo.cmake b/cmake/test_model_zoo.cmake index a8a7d4cc025..d27de12fe7a 100644 --- a/cmake/test_model_zoo.cmake +++ b/cmake/test_model_zoo.cmake @@ -68,18 +68,24 @@ function(ov_model_convert SRC DST OUT) set(${OUT} ${files} PARENT_SCOPE) endfunction() +if(OV_GENERATOR_MULTI_CONFIG) + set(test_model_zoo_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$/test_model_zoo") +else() + set(test_model_zoo_output_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo") +endif() + ov_model_convert("${CMAKE_CURRENT_SOURCE_DIR}/src/core/tests" - "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo/core" + "${test_model_zoo_output_dir}/core" core_tests_out_files) set(rel_path "src/tests/functional/plugin/shared/models") ov_model_convert("${OpenVINO_SOURCE_DIR}/${rel_path}" - "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo/func_tests/models" + "${test_model_zoo_output_dir}/func_tests/models" ft_out_files) set(rel_path "src/frontends/onnx/tests/models") ov_model_convert("${OpenVINO_SOURCE_DIR}/${rel_path}" - "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo/onnx" + "${test_model_zoo_output_dir}/onnx" onnx_fe_out_files) if(ENABLE_TESTS) @@ -92,7 +98,7 @@ if(ENABLE_TESTS) # add_dependencies(test_model_zoo paddle_test_models) #endif() - install(DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test_model_zoo" + install(DIRECTORY "${test_model_zoo_output_dir}" DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL) set(TEST_MODEL_ZOO "./test_model_zoo" CACHE PATH "Path to test model zoo") diff --git a/src/inference/include/ie/ie_locked_memory.hpp b/src/inference/include/ie/ie_locked_memory.hpp index b14be8884c3..aa784f290a5 100644 --- a/src/inference/include/ie/ie_locked_memory.hpp +++ b/src/inference/include/ie/ie_locked_memory.hpp @@ -281,6 +281,16 @@ public: return base::isEqualTo(pointer); } + /** + * @brief Compares stored object with the given one + * @param pointer A LockedMemory to compare with + * @return `true` if objects are equal, `false` otherwise + */ + bool operator==(const LockedMemory& lm) const { + // special case with nullptr + return base::isEqualTo(lm.as()); + } + /** * @brief Compares the object with the one stored in the memory * @param pointer A pointer to compare with diff --git a/src/inference/src/system_conf.cpp b/src/inference/src/system_conf.cpp index 47646e16e8d..8adc67d56be 100644 --- a/src/inference/src/system_conf.cpp +++ b/src/inference/src/system_conf.cpp @@ -111,34 +111,34 @@ bool with_cpu_x86_avx512_core_amx() { bool check_open_mp_env_vars(bool include_omp_num_threads) { for (auto&& var : {"GOMP_CPU_AFFINITY", - "GOMP_DEBUG" + "GOMP_DEBUG", "GOMP_RTEMS_THREAD_POOLS", - "GOMP_SPINCOUNT" - "GOMP_STACKSIZE" - "KMP_AFFINITY" - "KMP_NUM_THREADS" + "GOMP_SPINCOUNT", + "GOMP_STACKSIZE", + "KMP_AFFINITY", + "KMP_NUM_THREADS", "MIC_KMP_AFFINITY", - "MIC_OMP_NUM_THREADS" - "MIC_OMP_PROC_BIND" - "MKL_DOMAIN_NUM_THREADS" - "MKL_DYNAMIC" + "MIC_OMP_NUM_THREADS", + "MIC_OMP_PROC_BIND", + "MKL_DOMAIN_NUM_THREADS", + "MKL_DYNAMIC", "MKL_NUM_THREADS", - "OMP_CANCELLATION" - "OMP_DEFAULT_DEVICE" - "OMP_DISPLAY_ENV" + "OMP_CANCELLATION", + "OMP_DEFAULT_DEVICE", + "OMP_DISPLAY_ENV", "OMP_DYNAMIC", - "OMP_MAX_ACTIVE_LEVELS" - "OMP_MAX_TASK_PRIORITY" + "OMP_MAX_ACTIVE_LEVELS", + "OMP_MAX_TASK_PRIORITY", "OMP_NESTED", - "OMP_NUM_THREADS" - "OMP_PLACES" - "OMP_PROC_BIND" - "OMP_SCHEDULE" + "OMP_NUM_THREADS", + "OMP_PLACES", + "OMP_PROC_BIND", + "OMP_SCHEDULE", "OMP_STACKSIZE", - "OMP_THREAD_LIMIT" - "OMP_WAIT_POLICY" + "OMP_THREAD_LIMIT", + "OMP_WAIT_POLICY", "PHI_KMP_AFFINITY", - "PHI_KMP_PLACE_THREADS" + "PHI_KMP_PLACE_THREADS", "PHI_OMP_NUM_THREADS"}) { if (getenv(var)) { if (0 != strcmp(var, "OMP_NUM_THREADS") || include_omp_num_threads) diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/infer_request/io_blob.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/infer_request/io_blob.cpp index 5ff5b8d5104..04e370ccc0d 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/infer_request/io_blob.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/infer_request/io_blob.cpp @@ -41,85 +41,4 @@ namespace { ::testing::ValuesIn(Autoconfigs)), InferRequestIOBBlobTest::getTestCaseName); - std::vector prcs = { - InferenceEngine::Precision::FP16, - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP64, - InferenceEngine::Precision::I4, - InferenceEngine::Precision::I8, - InferenceEngine::Precision::I16, - InferenceEngine::Precision::I32, - InferenceEngine::Precision::I64, - InferenceEngine::Precision::U4, - InferenceEngine::Precision::U8, - InferenceEngine::Precision::U16, - InferenceEngine::Precision::U32, - InferenceEngine::Precision::U64, - InferenceEngine::Precision::BF16, - InferenceEngine::Precision::BIN, - InferenceEngine::Precision::BOOL, - }; - -INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestIOBBlobSetPrecisionTest, - ::testing::Combine( - ::testing::ValuesIn(prcs), - ::testing::Values(CommonTestUtils::DEVICE_CPU), - ::testing::ValuesIn(configs)), - InferRequestIOBBlobSetPrecisionTest::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestIOBBlobSetPrecisionTest, - ::testing::Combine( - ::testing::ValuesIn(prcs), - ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(Multiconfigs)), - InferRequestIOBBlobSetPrecisionTest::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestIOBBlobSetPrecisionTest, - ::testing::Combine( - ::testing::ValuesIn(prcs), - ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(Autoconfigs)), - InferRequestIOBBlobSetPrecisionTest::getTestCaseName); - - std::vector layouts = { - InferenceEngine::Layout::ANY, - InferenceEngine::Layout::NCHW, - InferenceEngine::Layout::NHWC, - InferenceEngine::Layout::NCDHW, - InferenceEngine::Layout::NDHWC, - InferenceEngine::Layout::OIHW, - InferenceEngine::Layout::GOIHW, - InferenceEngine::Layout::OIDHW, - InferenceEngine::Layout::GOIDHW, - InferenceEngine::Layout::SCALAR, - InferenceEngine::Layout::C, - InferenceEngine::Layout::CHW, - InferenceEngine::Layout::HWC, - InferenceEngine::Layout::HW, - InferenceEngine::Layout::NC, - InferenceEngine::Layout::CN, - InferenceEngine::Layout::BLOCKED, - }; - - INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestIOBBlobSetLayoutTest, - ::testing::Combine( - ::testing::ValuesIn(layouts), - ::testing::Values(CommonTestUtils::DEVICE_CPU), - ::testing::ValuesIn(configs)), - InferRequestIOBBlobSetLayoutTest::getTestCaseName); - - INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestIOBBlobSetLayoutTest, - ::testing::Combine( - ::testing::ValuesIn(layouts), - ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(Multiconfigs)), - InferRequestIOBBlobSetLayoutTest::getTestCaseName); - - INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestIOBBlobSetLayoutTest, - ::testing::Combine( - ::testing::ValuesIn(layouts), - ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(Autoconfigs)), - InferRequestIOBBlobSetLayoutTest::getTestCaseName); - } // namespace diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/cum_sum.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/cum_sum.cpp index da9881933a1..3b657a77abc 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/cum_sum.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/cum_sum.cpp @@ -105,11 +105,11 @@ const auto testCasesAxis_6 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsCumSum_negative_axis, CumSumLayerTest, testCasesNegativeAxis, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsCumSum_axis_0, CumSumLayerTest, testCasesAxis_0, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsCumSum_axis_1, CumSumLayerTest, testCasesAxis_1, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsCumSum_axis_2, CumSumLayerTest, testCasesAxis_2, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsCumSum_axis_3, CumSumLayerTest, testCasesAxis_3, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsCumSum_axis_4, CumSumLayerTest, testCasesAxis_4, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsCumSum_axis_5, CumSumLayerTest, testCasesAxis_5, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsCumSum_axis_6, CumSumLayerTest, testCasesAxis_6, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsCumSum_negative_axis, CumSumLayerTest, testCasesNegativeAxis, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsCumSum_axis_0, CumSumLayerTest, testCasesAxis_0, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsCumSum_axis_1, CumSumLayerTest, testCasesAxis_1, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsCumSum_axis_2, CumSumLayerTest, testCasesAxis_2, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsCumSum_axis_3, CumSumLayerTest, testCasesAxis_3, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsCumSum_axis_4, CumSumLayerTest, testCasesAxis_4, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsCumSum_axis_5, CumSumLayerTest, testCasesAxis_5, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsCumSum_axis_6, CumSumLayerTest, testCasesAxis_6, CumSumLayerTest::getTestCaseName); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/dft.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/dft.cpp index cadab8011e9..0a1ec094ddf 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/dft.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/dft.cpp @@ -101,7 +101,7 @@ const auto testCase4D = ::testing::Combine( ); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsDFT_1d, DFTLayerTest, testCase1D, DFTLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsDFT_2d, DFTLayerTest, testCase2D, DFTLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsDFT_3d, DFTLayerTest, testCase3D, DFTLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsDFT_4d, DFTLayerTest, testCase4D, DFTLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsDFT_1d, DFTLayerTest, testCase1D, DFTLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsDFT_2d, DFTLayerTest, testCase2D, DFTLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsDFT_3d, DFTLayerTest, testCase3D, DFTLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsDFT_4d, DFTLayerTest, testCase4D, DFTLayerTest::getTestCaseName); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp index ec4181205ff..8061a99b783 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/mvn.cpp @@ -69,9 +69,9 @@ const auto MvnReductionAxes = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsMVN_AcrossChannels, Mvn1LayerTest, MvnAcrossChannels, Mvn1LayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsMVN_AcrossChannels, Mvn1LayerTest, MvnAcrossChannels, Mvn1LayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsMVN_ReductionAxes, Mvn1LayerTest, MvnReductionAxes, Mvn1LayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsMVN_ReductionAxes, Mvn1LayerTest, MvnReductionAxes, Mvn1LayerTest::getTestCaseName); std::vector idxPrecisions = { diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/roll.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/roll.cpp index 651a3794c32..a48ef41caac 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/roll.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/roll.cpp @@ -84,21 +84,21 @@ const auto testCaseUnordNegAxesAndShifts10D = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsRoll_2d_zero_shifts, RollLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TestsRoll_2d_zero_shifts, RollLayerTest, testCase2DZeroShifts, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsRoll_1d, RollLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TestsRoll_1d, RollLayerTest, testCase1D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsRoll_2d, RollLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TestsRoll_2d, RollLayerTest, testCase2D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsRoll_3d, RollLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TestsRoll_3d, RollLayerTest, testCase3D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsRoll_negative_unordered_axes_4d, RollLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TestsRoll_negative_unordered_axes_4d, RollLayerTest, testCaseNegativeUnorderedAxes4D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsRoll_negative_unordered_axes_5d, RollLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TestsRoll_negative_unordered_axes_5d, RollLayerTest, testCaseRepeatingAxes5D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsRoll_negative_shifts_6d, RollLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TestsRoll_negative_shifts_6d, RollLayerTest, testCaseNegativeShifts6D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsRoll_unord_neg_shifts_and_axes_10d, RollLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TestsRoll_unord_neg_shifts_and_axes_10d, RollLayerTest, testCaseUnordNegAxesAndShifts10D, RollLayerTest::getTestCaseName); } // namespace diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/select.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/select.cpp index 6b6014da856..5f76a8462c5 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/select.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/select.cpp @@ -81,6 +81,6 @@ const auto numpyCases = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsSelect_none, SelectLayerTest, noneCases, SelectLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsSelect_none, SelectLayerTest, noneCases, SelectLayerTest::getTestCaseName); -INSTANTIATE_TEST_SUITE_P(smoke_INTEL_CPU_TestsSelect_numpy, SelectLayerTest, numpyCases, SelectLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsSelect_numpy, SelectLayerTest, numpyCases, SelectLayerTest::getTestCaseName); diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/strided_slice.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/strided_slice.cpp index 23c6b0d54bd..524dc9a4a62 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/strided_slice.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/single_layer_tests/strided_slice.cpp @@ -128,7 +128,7 @@ std::vector ss_only_test_cases = { }; INSTANTIATE_TEST_SUITE_P( - smoke_INTEL_CPU, StridedSliceLayerTest, + smoke, StridedSliceLayerTest, ::testing::Combine( ::testing::ValuesIn(ss_only_test_cases), ::testing::Values(InferenceEngine::Precision::FP32), diff --git a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp index 1ce2b498c17..69b7a522968 100644 --- a/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp +++ b/src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp @@ -67,12 +67,7 @@ std::vector disabledTestPatterns() { // TODO: 57562 No dynamic output shape support R"(.*NonZeroLayerTest.*)", // Not expected behavior - R"(.*Behavior.*InferRequestIOBBlobSetLayoutTest.*layout=(SCALAR|OIHW).*)", - R"(.*Behavior.*InferRequestIOBBlobSetLayoutTest.*CanSetOutBlobWithDifferentLayouts.*layout=HW.*)", - R"(.*Behavior.*InferRequestIOBBlobSetLayoutTest.*CanSetInBlobWithDifferentLayouts.*layout=NHWC.*targetDevice=(AUTO|MULTI).*)", - R"(.*Behavior.*InferRequestIOBBlobSetLayoutTest.*CanSetOutBlobWithDifferentLayouts.*layout=CN.*targetDevice=(AUTO|MULTI).*)", R"(.*Behavior.*InferRequestSetBlobByType.*Batched.*)", - R"(.*Auto_Behavior.*InferRequestIOBBlobTest.*canProcessDeallocatedOutputBlobAfterGetAndSetBlob.*)", R"(.*Auto.*Behavior.*ExecutableNetworkBaseTest.*canLoadCorrectNetworkToGetExecutableWithIncorrectConfig.*)", R"(.*(Auto|Multi).*Behavior.*CorrectConfigAPITests.*CanSetExclusiveAsyncRequests.*)", R"(.*(Auto|Multi).*Behavior.*IncorrectConfigTests.*CanNotLoadNetworkWithIncorrectConfig.*)", @@ -193,32 +188,23 @@ std::vector disabledTestPatterns() { R"(.*UniqueLayerTestCPU.*axis.*True.*)", }; -#define FIX_62820 0 -#if FIX_62820 && ((IE_THREAD == IE_THREAD_TBB) || (IE_THREAD == IE_THREAD_TBB_AUTO)) - retVector.emplace_back(R"(.*ReusableCPUStreamsExecutor.*)"); -#endif - -#ifdef __APPLE__ - // TODO: Issue 55717 - // retVector.emplace_back(R"(.*smoke_LPT.*ReduceMinTransformation.*f32.*)"); -#endif - #if defined(OPENVINO_ARCH_ARM64) || defined(OPENVINO_ARCH_ARM) - retVector.emplace_back(R"(OVClassBasicTest.smoke_SetConfigAffinity.*)"); - retVector.emplace_back(R"(OVClassConfigTestCPU.smoke_Check(Model|Core)StreamsHasHigherPriorityThanLatencyHint.*)"); - retVector.emplace_back(R"(.*OVInferRequestDynamicTests.*)"); + retVector.emplace_back(R"(OVClassBasicPropsTest.smoke_SetConfigAffinity.*)"); retVector.emplace_back(R"(ONNXQuantizedModels/QuantizedModelsTests.*)"); + // TODO: generate new 'expected' runtime graph for CPU ARM retVector.emplace_back(R"(smoke_serialization/ExecGraphSerializationTest.ExecutionGraph.*)"); - retVector.emplace_back(R"(smoke_BehaviorTests/OVCompiledModelPropertiesDefaultTests.CheckDefaultValues.*)"); - retVector.emplace_back(R"(smoke_BehaviorTests/CorrectConfigCheck.canSetConfigAndCheckGetConfig.*CPU_THROUGHPUT_STREAMS=8.*)"); - retVector.emplace_back(R"(smoke_BehaviorTests/CorrectConfigCheck.canSetConfigTwiceAndCheckGetConfig.*CPU_THROUGHPUT_STREAMS=8.*)"); - retVector.emplace_back(R"(smoke_Basic/DefaultConfigurationTest.checkDeviceDefaultConfigurationValue/configKey=CPU_BIND_THREAD.*)"); retVector.emplace_back(R"(smoke_ExecGraph/ExecGraphRuntimePrecision.CheckRuntimePrecision/Function=(EltwiseWithTwoDynamicInputs|FakeQuantizeRelu).*)"); + { + // TODO: enable once streams / tput mode is supported + retVector.emplace_back(R"(OVClassConfigTestCPU.smoke_Check(Model|Core)StreamsHasHigherPriorityThanLatencyHint.*)"); + retVector.emplace_back(R"(smoke_BehaviorTests/CorrectConfigCheck.canSetConfigAndCheckGetConfig.*CPU_THROUGHPUT_STREAMS=8.*)"); + retVector.emplace_back(R"(smoke_BehaviorTests/CorrectConfigCheck.canSetConfigTwiceAndCheckGetConfig.*CPU_THROUGHPUT_STREAMS=8.*)"); + retVector.emplace_back(R"(smoke_CPU_OVClassLoadNetworkAndCheckWithSecondaryPropertiesTest/OVClassLoadNetworkAndCheckSecondaryPropertiesTest.LoadNetworkAndCheckSecondaryPropertiesTest.*)"); + retVector.emplace_back(R"(smoke_CPU_OVClassLoadNetworkAndCheckWithSecondaryPropertiesDoubleTest/OVClassLoadNetworkAndCheckSecondaryPropertiesTest.LoadNetworkAndCheckSecondaryPropertiesTest.*)"); + retVector.emplace_back(R"(smoke_CPU_OVClassCompileModelAndCheckSecondaryPropertiesTest.*)"); + retVector.emplace_back(R"(smoke_CPU_OVClassCompileModelAndCheckWithSecondaryPropertiesDoubleTest.*)"); + } retVector.emplace_back(R"(smoke_LPT.*)"); - retVector.emplace_back(R"(smoke_CPU_OVClassLoadNetworkAndCheckWithSecondaryPropertiesTest/OVClassLoadNetworkAndCheckSecondaryPropertiesTest.LoadNetworkAndCheckSecondaryPropertiesTest.*)"); - retVector.emplace_back(R"(smoke_CPU_OVClassLoadNetworkAndCheckWithSecondaryPropertiesDoubleTest/OVClassLoadNetworkAndCheckSecondaryPropertiesTest.LoadNetworkAndCheckSecondaryPropertiesTest.*)"); - retVector.emplace_back(R"(smoke_CPU_OVClassCompileModelAndCheckSecondaryPropertiesTest/OVClassCompileModelAndCheckSecondaryPropertiesTest.CompileModelAndCheckSecondaryPropertiesTest.*)"); - retVector.emplace_back(R"(smoke_CPU_OVClassCompileModelAndCheckWithSecondaryPropertiesDoubleTest.*)"); retVector.emplace_back(R"(smoke_Activation_Basic/ActivationLayerTest.CompareWithRefs.*)"); retVector.emplace_back(R"(smoke_Integer_Activation_Basic/ActivationLayerTest.CompareWithRefs/(Tanh|Negative|Sqrt).*)"); retVector.emplace_back(R"(smoke_Activation_Basic_Prelu_Const/ActivationLayerTest.CompareWithRefs/(LeakyRelu|PReLu).*)"); @@ -232,9 +218,9 @@ std::vector disabledTestPatterns() { retVector.emplace_back(R"(smoke_TrivialLoop/TrivialLoopTest.AutoSlicingInputWithDynCondition_(CheckPredefinedValues|CheckReference).*)"); retVector.emplace_back(R"(smoke_Decomposition_(3|4)D/Mvn6LayerTest.CompareWithRefs.*)"); retVector.emplace_back(R"(smoke_AvgPool_ExplicitPad_CeilRounding/PoolingLayerTest.CompareWithRefs.*)"); - retVector.emplace_back(R"(smoke_INTEL_CPU_TestsDFT_(1|2|3|4)d/DFTLayerTest.CompareWithRefs.*)"); - retVector.emplace_back(R"(smoke_INTEL_CPU_TestsSelect_none/SelectLayerTest.CompareWithRefImpl/COND=BOOL.*)"); - retVector.emplace_back(R"(smoke_INTEL_CPU_TestsSelect_numpy/SelectLayerTest.CompareWithRefImpl/COND=BOOL.*)"); + retVector.emplace_back(R"(smoke_TestsDFT_(1|2|3|4)d/DFTLayerTest.CompareWithRefs.*)"); + retVector.emplace_back(R"(smoke_TestsSelect_none/SelectLayerTest.CompareWithRefImpl/COND=BOOL.*)"); + retVector.emplace_back(R"(smoke_TestsSelect_numpy/SelectLayerTest.CompareWithRefImpl/COND=BOOL.*)"); retVector.emplace_back(R"(smoke_Snippets.*)"); retVector.emplace_back(R"(smoke_Quantized.*)"); retVector.emplace_back(R"(smoke_NegativeQuantizedMatMulMultiplyFusion.*)"); diff --git a/src/plugins/intel_cpu/thirdparty/CMakeLists.txt b/src/plugins/intel_cpu/thirdparty/CMakeLists.txt index 8ae6ca4800d..db8dd7e32be 100644 --- a/src/plugins/intel_cpu/thirdparty/CMakeLists.txt +++ b/src/plugins/intel_cpu/thirdparty/CMakeLists.txt @@ -65,7 +65,7 @@ function(ie_add_onednn) set(DNNL_TARGET_ARCH "ARM" CACHE STRING "" FORCE) set(DNNL_AARCH64_USE_ACL OFF CACHE BOOL "" FORCE) set(ARM_COMPUTE_TARGET_ARCH_DEFAULT armv7a) - set(ARM_COMPUTE_TARGET_ARCHS armv7a) + set(ARM_COMPUTE_TARGET_ARCHS armv7a armv7a-hf) else() set(DNNL_TARGET_ARCH "AARCH64" CACHE STRING "" FORCE) set(DNNL_AARCH64_USE_ACL ON CACHE BOOL "" FORCE) @@ -76,9 +76,13 @@ function(ie_add_onednn) else() set(ARM_COMPUTE_TARGET_ARCH_DEFAULT arm64-v8a) endif() - set(ARM_COMPUTE_TARGET_ARCHS arm64-v8a arm64-v8.2-a arm64-v8.2-a-sve arm64-v8.2-a-sve2 - armv8a armv8.2-a armv8.2-a-sve armv8.6-a armv8.6-a-sve armv8.6-a-sve2 - armv8r64) + set(ARM_COMPUTE_TARGET_ARCHS arm64-v8a + arm64-v8.2-a arm64-v8.2-a-sve arm64-v8.2-a-sve2 + armv8a + armv8.2-a armv8.2-a-sve + armv8.6-a armv8.6-a-sve armv8.6-a-sve2 armv8.6-a-sve2-sme2 + armv8r64 # the same as armv8.4-a + ) endif() set(ARM_COMPUTE_TARGET_ARCH "${ARM_COMPUTE_TARGET_ARCH_DEFAULT}" CACHE STRING "Architecture for ARM ComputeLibrary") diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/io_blob.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/io_blob.cpp index e9a7414b4a9..c6a8067cf73 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/io_blob.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request/io_blob.cpp @@ -39,85 +39,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, ::testing::ValuesIn(autoconfigs())), InferRequestIOBBlobTest::getTestCaseName); -std::vector prcs = { - InferenceEngine::Precision::FP16, - InferenceEngine::Precision::FP32, - InferenceEngine::Precision::FP64, - InferenceEngine::Precision::I4, - InferenceEngine::Precision::I8, - InferenceEngine::Precision::I16, - InferenceEngine::Precision::I32, - InferenceEngine::Precision::I64, - InferenceEngine::Precision::U4, - InferenceEngine::Precision::U8, - InferenceEngine::Precision::U16, - InferenceEngine::Precision::U32, - InferenceEngine::Precision::U64, - InferenceEngine::Precision::BF16, - InferenceEngine::Precision::BIN, - InferenceEngine::Precision::BOOL, -}; - -INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestIOBBlobSetPrecisionTest, - ::testing::Combine( - ::testing::ValuesIn(prcs), - ::testing::Values(CommonTestUtils::DEVICE_GPU), - ::testing::Values(std::map{})), - InferRequestIOBBlobSetPrecisionTest::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestIOBBlobSetPrecisionTest, - ::testing::Combine( - ::testing::ValuesIn(prcs), - ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(configs())), - InferRequestIOBBlobSetPrecisionTest::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestIOBBlobSetPrecisionTest, - ::testing::Combine( - ::testing::ValuesIn(prcs), - ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(autoconfigs())), - InferRequestIOBBlobSetPrecisionTest::getTestCaseName); - -std::vector layouts = { - InferenceEngine::Layout::ANY, - InferenceEngine::Layout::NCHW, - InferenceEngine::Layout::NHWC, - InferenceEngine::Layout::NCDHW, - InferenceEngine::Layout::NDHWC, - InferenceEngine::Layout::OIHW, - InferenceEngine::Layout::GOIHW, - InferenceEngine::Layout::OIDHW, - InferenceEngine::Layout::GOIDHW, - InferenceEngine::Layout::SCALAR, - InferenceEngine::Layout::C, - InferenceEngine::Layout::CHW, - InferenceEngine::Layout::HWC, - InferenceEngine::Layout::HW, - InferenceEngine::Layout::NC, - InferenceEngine::Layout::CN, - InferenceEngine::Layout::BLOCKED, -}; - -INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestIOBBlobSetLayoutTest, - ::testing::Combine( - ::testing::ValuesIn(layouts), - ::testing::Values(CommonTestUtils::DEVICE_GPU), - ::testing::Values(std::map{})), - InferRequestIOBBlobSetLayoutTest::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestIOBBlobSetLayoutTest, - ::testing::Combine( - ::testing::ValuesIn(layouts), - ::testing::Values(CommonTestUtils::DEVICE_MULTI), - ::testing::ValuesIn(configs())), - InferRequestIOBBlobSetLayoutTest::getTestCaseName); - -INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestIOBBlobSetLayoutTest, - ::testing::Combine( - ::testing::ValuesIn(layouts), - ::testing::Values(CommonTestUtils::DEVICE_AUTO), - ::testing::ValuesIn(autoconfigs())), - InferRequestIOBBlobSetLayoutTest::getTestCaseName); - } // namespace diff --git a/src/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp b/src/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp index ba9172ca037..4eea97f94ef 100644 --- a/src/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp +++ b/src/tests/functional/plugin/gpu/shared_tests_instances/skip_tests_config.cpp @@ -48,9 +48,6 @@ std::vector disabledTestPatterns() { // Not allowed dynamic loop tests on GPU R"(.*smoke_StaticShapeLoop_dynamic_exit.*)", // Not expected behavior - R"(.*Behavior.*InferRequestIOBBlobSetLayoutTest.*layout=(SCALAR|OIHW).*)", - R"(.*Behavior.*InferRequestIOBBlobSetLayoutTest.*CanSetInBlobWithDifferentLayouts.*layout=NHWC.*)", - R"(.*Behavior.*InferRequestIOBBlobSetLayoutTest.*CanSetOutBlobWithDifferentLayouts.*layout=(CN|HW).*)", R"(.*Behavior.*(Multi|Auto).*InferRequestSetBlobByType.*Batched.*)", R"(.*(Multi|Auto).*Behavior.*InferRequestIOBBlobTest.*canProcessDeallocatedOutputBlobAfterGetAndSetBlob.*)", // TODO Issue 100145 diff --git a/src/tests/functional/plugin/shared/CMakeLists.txt b/src/tests/functional/plugin/shared/CMakeLists.txt index aee3c039020..4f9f2a0b0ec 100644 --- a/src/tests/functional/plugin/shared/CMakeLists.txt +++ b/src/tests/functional/plugin/shared/CMakeLists.txt @@ -24,6 +24,9 @@ if(ENABLE_AUTO_BATCH) list(APPEND DEPENDENCIES openvino_auto_batch_plugin) endif() +if(ENABLE_TEMPLATE) + list(APPEND DEPENDENCIES openvino_template_plugin) +endif() # remove once CVS-69781 is fixed if(ENABLE_OV_IR_FRONTEND) @@ -31,7 +34,7 @@ if(ENABLE_OV_IR_FRONTEND) endif() if (ENABLE_OV_ONNX_FRONTEND) - list(APPEND DEPENDENCIES test_model_zoo) + list(APPEND DEPENDENCIES test_model_zoo openvino_onnx_frontend) list(APPEND DEFINES TEST_MODELS="${TEST_MODEL_ZOO}/func_tests/models/") else() set(EXCLUDED_SOURCE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src/onnx)