Enabled C-API tests on ARM platform (#17119)

* Enabled C-API tests on ARM platform

* Fixed ARM CPU plugin test on streams
This commit is contained in:
Ilya Lavrenov 2023-04-21 22:55:18 +04:00 committed by GitHub
parent d7b775f583
commit fbc28297ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 20 deletions

View File

@ -29,6 +29,10 @@ if(ENABLE_INTEL_GPU)
add_dependencies(${TARGET_NAME} openvino_intel_gpu_plugin)
endif()
if(ENABLE_HETERO)
add_dependencies(${TARGET_NAME} openvino_hetero_plugin)
endif()
add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
install(TARGETS ${TARGET_NAME}

View File

@ -1229,8 +1229,6 @@ TEST_P(ie_c_api_test, ie_infer_request_infer_async_wait_time) {
ie_core_free(&core);
}
// For ARM plugin, no "Batch" related operations support for now, so skip related APIs
#ifndef __aarch64__
TEST_P(ie_c_api_test, ie_infer_request_set_batch) {
ie_core_t *core = nullptr;
IE_ASSERT_OK(ie_core_create("", &core));
@ -1317,7 +1315,6 @@ TEST_P(ie_c_api_test, ie_infer_request_set_negative_batch) {
ie_network_free(&network);
ie_core_free(&core);
}
#endif
TEST_P(ie_c_api_test, ie_blob_make_memory) {

View File

@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//
#include "openvino/core/visibility.hpp"
#include "ov_test.hpp"
#include "test_model_repo.hpp"
@ -139,7 +140,12 @@ TEST_P(ov_core_test, ov_core_compile_model_with_property) {
char* property_value = nullptr;
OV_EXPECT_OK(ov_compiled_model_get_property(compiled_model, key, &property_value));
#if defined(OPENVINO_ARCH_ARM) || defined(OPENVINO_ARCH_ARM64)
// TODO: fix once ARM plugin supports multi-stream
EXPECT_STREQ(property_value, "1");
#else
EXPECT_STREQ(property_value, "2");
#endif
ov_free(property_value);
ov_compiled_model_free(compiled_model);
@ -403,9 +409,6 @@ TEST_P(ov_core_test, ov_core_set_and_get_property_execution_mode) {
}
TEST_P(ov_core_test, ov_core_set_get_property_str) {
#ifdef __aarch64__
GTEST_SKIP() << "Skip this test for ARM CPU for now, cause no string property supported";
#endif
auto device_name = GetParam();
ov_core_t* core = nullptr;
OV_EXPECT_OK(ov_core_create(&core));
@ -459,9 +462,6 @@ TEST_P(ov_core_test, ov_core_set_property_int_invalid) {
}
TEST_P(ov_core_test, ov_core_set_multiple_common_properties) {
#ifdef __aarch64__
GTEST_SKIP() << "Skip this test for ARM CPU for now, cause no string property supported";
#endif
auto device_name = GetParam();
ov_core_t* core = nullptr;
OV_EXPECT_OK(ov_core_create(&core));

View File

@ -9,6 +9,7 @@
#include "ngraph_functions/builders.hpp"
#include "ngraph_functions/subgraph_builders.hpp"
#include "openvino/core/visibility.hpp"
#include "openvino/pass/manager.hpp"
#include "openvino/util/file_util.hpp"
@ -53,21 +54,16 @@ inline void fill_random_input_nv12_data(uint8_t* data, const size_t w, const siz
}
inline std::string generate_test_xml_file() {
#ifdef _WIN32
# ifdef __MINGW32__
std::string tmp_libraryname = "libopenvino_intel_cpu_plugin";
# else
std::string tmp_libraryname = "openvino_intel_cpu_plugin";
# endif
#elif defined __APPLE__
# ifdef __aarch64__
#if defined(OPENVINO_ARCH_ARM) || defined(OPENVINO_ARCH_ARM64)
std::string tmp_libraryname = "openvino_arm_cpu_plugin";
# else
#elif defined(OPENVINO_ARCH_X86) || defined(OPENVINO_ARCH_X86_64)
std::string tmp_libraryname = "openvino_intel_cpu_plugin";
# endif
#elif defined(OPENVINO_ARCH_RISCV64)
std::string tmp_libraryname = "openvino_riscv_cpu_plugin";
#else
std::string tmp_libraryname = "openvino_intel_cpu_plugin";
# error "Undefined system processor"
#endif
tmp_libraryname += IE_BUILD_POSTFIX;
std::string libraryname = ov::util::make_plugin_library_name({}, tmp_libraryname);