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

Fixed plugin name in tests for ARM CPU (#16932)

Browse Source
This commit is contained in:
Ilya Lavrenov 2023-04-13 22:35:21 +04:00 committed by GitHub
parent 85f9d1392c
commit de8f34c8f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/intel_cpu/src/plugin.cpp
View File

@ -838,5 +838,15 @@ InferenceEngine::IExecutableNetworkInternal::Ptr Engine::ImportNetwork(std::istr
} // namespace ov } // namespace ov
using namespace ov::intel_cpu; using namespace ov::intel_cpu;
#if defined(OPENVINO_ARCH_ARM) || defined(OPENVINO_ARCH_ARM64)
static const Version version = {{2, 1}, CI_BUILD_NUMBER, "openvino_arm_cpu_plugin"};
#elif defined(OPENVINO_ARCH_X86) || defined(OPENVINO_ARCH_X86_64)
static const Version version = {{2, 1}, CI_BUILD_NUMBER, "openvino_intel_cpu_plugin"}; static const Version version = {{2, 1}, CI_BUILD_NUMBER, "openvino_intel_cpu_plugin"};
#elif defined(OPENVINO_ARCH_RISCV64)
static const Version version = {{2, 1}, CI_BUILD_NUMBER, "openvino_riscv_cpu_plugin"};
#else
#error "Undefined system processor"
#endif
IE_DEFINE_PLUGIN_CREATE_FUNCTION(Engine, version) IE_DEFINE_PLUGIN_CREATE_FUNCTION(Engine, version)

5
src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/ov_plugin/core_integration.cpp
View File

@ -11,6 +11,9 @@
using namespace ov::test::behavior; using namespace ov::test::behavior;
using namespace InferenceEngine::PluginConfigParams; using namespace InferenceEngine::PluginConfigParams;
// defined in plugin_name.cpp
extern const char * cpu_plugin_file_name;
namespace { namespace {
// //
// IE Class Common tests with <pluginName, deviceName params> // IE Class Common tests with <pluginName, deviceName params>
@ -18,7 +21,7 @@ namespace {
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
smoke_OVClassCommon, OVClassBasicTestP, smoke_OVClassCommon, OVClassBasicTestP,
::testing::Values(std::make_pair("openvino_intel_cpu_plugin", "CPU"))); ::testing::Values(std::make_pair(cpu_plugin_file_name, "CPU")));
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
smoke_OVClassNetworkTestP, OVClassNetworkTestP, smoke_OVClassNetworkTestP, OVClassNetworkTestP,

5
src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/core_integration.cpp
View File

@ -8,6 +8,9 @@ using namespace BehaviorTestsDefinitions;
using namespace InferenceEngine::PluginConfigParams; using namespace InferenceEngine::PluginConfigParams;
// defined in plugin_name.cpp
extern const char * cpu_plugin_file_name;
namespace { namespace {
// //
// IE Class Common tests with <pluginName, deviceName params> // IE Class Common tests with <pluginName, deviceName params>
@ -15,7 +18,7 @@ namespace {
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
smoke_IEClassCommon, IEClassBasicTestP, smoke_IEClassCommon, IEClassBasicTestP,
::testing::Values(std::make_pair("openvino_intel_cpu_plugin", "CPU"))); ::testing::Values(std::make_pair(cpu_plugin_file_name, "CPU")));
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
smoke_IEClassNetworkTestP, IEClassNetworkTestP, smoke_IEClassNetworkTestP, IEClassNetworkTestP,

7
src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/hetero_synthetic.cpp
View File

@ -8,6 +8,9 @@
#include "ngraph_functions/builders.hpp" #include "ngraph_functions/builders.hpp"
#include "ngraph_functions/subgraph_builders.hpp" #include "ngraph_functions/subgraph_builders.hpp"
// defined in plugin_name.cpp
extern const char * cpu_plugin_file_name;
namespace { namespace {
using namespace HeteroTests; using namespace HeteroTests;
@ -16,13 +19,13 @@ using namespace HeteroTests;
INSTANTIATE_TEST_SUITE_P(smoke_SingleMajorNode, HeteroSyntheticTest, INSTANTIATE_TEST_SUITE_P(smoke_SingleMajorNode, HeteroSyntheticTest,
::testing::Combine( ::testing::Combine(
::testing::Values(std::vector<PluginParameter>{{"CPU0", "openvino_intel_cpu_plugin"}, {"CPU1", "openvino_intel_cpu_plugin"}}), ::testing::Values(std::vector<PluginParameter>{{"CPU0", cpu_plugin_file_name}, {"CPU1", cpu_plugin_file_name}}),
::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_singleMajorNodeFunctions)), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_singleMajorNodeFunctions)),
HeteroSyntheticTest::getTestCaseName); HeteroSyntheticTest::getTestCaseName);
INSTANTIATE_TEST_SUITE_P(nightly_RandomMajorNodes, HeteroSyntheticTest, INSTANTIATE_TEST_SUITE_P(nightly_RandomMajorNodes, HeteroSyntheticTest,
::testing::Combine( ::testing::Combine(
::testing::Values(std::vector<PluginParameter>{{"CPU0", "openvino_intel_cpu_plugin"}, {"CPU1", "openvino_intel_cpu_plugin"}}), ::testing::Values(std::vector<PluginParameter>{{"CPU0", cpu_plugin_file_name}, {"CPU1", cpu_plugin_file_name}}),
::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_randomMajorNodeFunctions)), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_randomMajorNodeFunctions)),
HeteroSyntheticTest::getTestCaseName); HeteroSyntheticTest::getTestCaseName);

15
src/plugins/intel_cpu/tests/functional/shared_tests_instances/behavior/plugin/plugin_name.cpp Normal file
View File

@ -0,0 +1,15 @@
// Copyright (C) 2018-2023 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
#include "openvino/core/visibility.hpp"
#if defined(OPENVINO_ARCH_ARM) || defined(OPENVINO_ARCH_ARM64)
const char * cpu_plugin_file_name = "openvino_arm_cpu_plugin";
#elif defined(OPENVINO_ARCH_X86) || defined(OPENVINO_ARCH_X86_64)
const char * cpu_plugin_file_name = "openvino_intel_cpu_plugin";
#elif defined(OPENVINO_ARCH_RISCV64)
const char * cpu_plugin_file_name = "openvino_riscv_cpu_plugin";
#else
#error "Undefined system processor"
#endif