Fixed plugin name in tests for ARM CPU (#16932)
This commit is contained in:
+4
-1
@@ -11,6 +11,9 @@
|
||||
using namespace ov::test::behavior;
|
||||
using namespace InferenceEngine::PluginConfigParams;
|
||||
|
||||
// defined in plugin_name.cpp
|
||||
extern const char * cpu_plugin_file_name;
|
||||
|
||||
namespace {
|
||||
//
|
||||
// IE Class Common tests with <pluginName, deviceName params>
|
||||
@@ -18,7 +21,7 @@ namespace {
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
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(
|
||||
smoke_OVClassNetworkTestP, OVClassNetworkTestP,
|
||||
|
||||
+4
-1
@@ -8,6 +8,9 @@ using namespace BehaviorTestsDefinitions;
|
||||
|
||||
using namespace InferenceEngine::PluginConfigParams;
|
||||
|
||||
// defined in plugin_name.cpp
|
||||
extern const char * cpu_plugin_file_name;
|
||||
|
||||
namespace {
|
||||
//
|
||||
// IE Class Common tests with <pluginName, deviceName params>
|
||||
@@ -15,7 +18,7 @@ namespace {
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(
|
||||
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(
|
||||
smoke_IEClassNetworkTestP, IEClassNetworkTestP,
|
||||
|
||||
+5
-2
@@ -8,6 +8,9 @@
|
||||
#include "ngraph_functions/builders.hpp"
|
||||
#include "ngraph_functions/subgraph_builders.hpp"
|
||||
|
||||
// defined in plugin_name.cpp
|
||||
extern const char * cpu_plugin_file_name;
|
||||
|
||||
namespace {
|
||||
using namespace HeteroTests;
|
||||
|
||||
@@ -16,13 +19,13 @@ using namespace HeteroTests;
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(smoke_SingleMajorNode, HeteroSyntheticTest,
|
||||
::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)),
|
||||
HeteroSyntheticTest::getTestCaseName);
|
||||
|
||||
INSTANTIATE_TEST_SUITE_P(nightly_RandomMajorNodes, HeteroSyntheticTest,
|
||||
::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)),
|
||||
HeteroSyntheticTest::getTestCaseName);
|
||||
|
||||
|
||||
+15
@@ -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
|
||||
Reference in New Issue
Block a user