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

Removed global defitniions for plugins (#14273)

Browse Source
This commit is contained in:
Ilya Lavrenov 2022-11-28 22:52:19 +04:00 committed by GitHub
parent 09637ca5f2
commit 121cc920b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/features.cmake
View File

@ -195,24 +195,8 @@ if (ENABLE_PROFILING_RAW)
add_definitions(-DENABLE_PROFILING_RAW=1) add_definitions(-DENABLE_PROFILING_RAW=1)
endif() endif()
if (ENABLE_INTEL_MYRIAD)
add_definitions(-DENABLE_INTEL_MYRIAD=1)
endif()
if (ENABLE_MYRIAD_NO_BOOT AND ENABLE_INTEL_MYRIAD)
add_definitions(-DENABLE_MYRIAD_NO_BOOT=1)
endif()
if (ENABLE_INTEL_GPU)
add_definitions(-DENABLE_INTEL_GPU=1)
endif()
if (ENABLE_INTEL_CPU) if (ENABLE_INTEL_CPU)
add_definitions(-DENABLE_INTEL_CPU=1) add_definitions(-DENABLE_INTEL_CPU=1)
endif() endif()
if (ENABLE_INTEL_GNA)
add_definitions(-DENABLE_INTEL_GNA)
endif()
print_enabled_features() print_enabled_features()

2
src/tests_deprecated/behavior/CMakeLists.txt
View File

@ -4,6 +4,6 @@
add_subdirectory(shared_tests) add_subdirectory(shared_tests)
if (ENABLE_HDDL OR ENABLE_INTEL_MYRIAD) if (ENABLE_INTEL_MYRIAD)
add_subdirectory(vpu) add_subdirectory(vpu)
endif() endif()

6
src/tests_deprecated/behavior/vpu/CMakeLists.txt
View File

@ -23,12 +23,6 @@ function(enable_vpu TARGET_NAME FLAG_NAME PLUGIN_NAME)
list(APPEND TEST_SRC ${VPU_TESTS}) list(APPEND TEST_SRC ${VPU_TESTS})
endif() endif()
# Tests for HDDL plugin
if (ENABLE_HDDL)
file(GLOB HDDL_TESTS hddl_tests/*.cpp)
list(APPEND TEST_SRC ${HDDL_TESTS})
endif()
list(APPEND DEPENDENCIES list(APPEND DEPENDENCIES
${PLUGIN_NAME} ${PLUGIN_NAME}
vpu_copy_firmware) vpu_copy_firmware)

4
src/tests_deprecated/behavior/vpu/myriad_tests/aot_behavior_tests.cpp
View File

@ -4,8 +4,6 @@
/// @rationale aot tests aim to test network export/import functionality /// @rationale aot tests aim to test network export/import functionality
#if defined(ENABLE_INTEL_MYRIAD)
#include <behavior_test_plugin.h> #include <behavior_test_plugin.h>
#include <mvnc.h> #include <mvnc.h>
#include <vpu/backend/blob_format.hpp> #include <vpu/backend/blob_format.hpp>
@ -202,5 +200,3 @@ const BehTestParams vpuValues[] = {
}; };
INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, AOTBehaviorTests, ValuesIn(vpuValues), getTestCaseName); INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, AOTBehaviorTests, ValuesIn(vpuValues), getTestCaseName);
#endif