From 90e10e369d3262e729535bb3e39b6fa07fd6764b Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Thu, 18 Nov 2021 16:40:53 +0300 Subject: [PATCH] Configurable G-API preprocessing in static build (#8631) * Added cmake option todisable G-API preprocessing * Enabled PDPD, TF on Windows * Revert "Enabled PDPD, TF on Windows" This reverts commit 2851cba05616bfa8b41ca7aff2b37c571c3d16c8. --- .ci/azure/windows.yml | 2 +- cmake/features.cmake | 4 ++- .../behavior/preprocessing/preprocessing.cpp | 4 +++ .../behavior/preprocessing/set_preprocess.cpp | 6 +++- .../subgraph_reference/preprocess_legacy.cpp | 6 +++- .../ie_bridges/c/tests/CMakeLists.txt | 12 +++----- .../ie_bridges/c/tests/ie_c_api_test.cpp | 12 ++++---- .../src/inference_engine/CMakeLists.txt | 6 +++- .../src/mkldnn_plugin/CMakeLists.txt | 5 ++-- .../src/preprocessing/CMakeLists.txt | 29 ++++++++++++++----- .../src/preprocessing/ie_preprocess_data.hpp | 5 ++++ .../inference_engine/CMakeLists.txt | 2 ++ .../behavior/preprocessing/preprocessing.cpp | 4 +++ .../behavior/preprocessing/set_preprocess.cpp | 6 +++- .../behavior/preprocessing/set_preprocess.cpp | 4 +++ .../behavior/preprocessing/set_preprocess.cpp | 6 +++- .../functional/plugin/shared/CMakeLists.txt | 4 +++ .../fluid_preproc/CMakeLists.txt | 3 ++ 18 files changed, 90 insertions(+), 30 deletions(-) diff --git a/.ci/azure/windows.yml b/.ci/azure/windows.yml index 72642660043..1b01d4da70e 100644 --- a/.ci/azure/windows.yml +++ b/.ci/azure/windows.yml @@ -119,7 +119,7 @@ jobs: - script: | set PATH=$(WORK_DIR)\ninja-win;%PATH% - call "$(MSVS_VARS_PATH)" && cmake -GNinja -DENABLE_CLDNN=$(CMAKE_BUILD_SHARED_LIBS) -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_REQUIREMENTS_INSTALL=OFF -DENABLE_FASTER_BUILD=ON -DENABLE_TEMPLATE_PLUGIN=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DENABLE_STRICT_DEPENDENCIES=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.7.6\x64\python.exe" -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR) + call "$(MSVS_VARS_PATH)" && cmake -GNinja -DENABLE_CLDNN=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_GAPI_PREPROCESSING=$(CMAKE_BUILD_SHARED_LIBS) -DBUILD_SHARED_LIBS=$(CMAKE_BUILD_SHARED_LIBS) -DENABLE_REQUIREMENTS_INSTALL=OFF -DENABLE_FASTER_BUILD=ON -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) -DENABLE_TESTS=ON -DENABLE_STRICT_DEPENDENCIES=OFF -DENABLE_PYTHON=ON -DPYTHON_EXECUTABLE="C:\hostedtoolcache\windows\Python\3.7.6\x64\python.exe" -DIE_EXTRA_MODULES=$(OPENVINO_CONTRIB_REPO_DIR)\modules -DCMAKE_C_COMPILER:PATH="$(MSVC_COMPILER_PATH)" -DCMAKE_CXX_COMPILER:PATH="$(MSVC_COMPILER_PATH)" $(REPO_DIR) workingDirectory: $(BUILD_DIR) displayName: 'CMake' diff --git a/cmake/features.cmake b/cmake/features.cmake index a62b6f2f9c4..b7c152a0561 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -106,6 +106,8 @@ endif() ie_option (ENABLE_IR_V7_READER "Enables IR v7 reader" ${ENABLE_IR_V7_READER_DEFAULT}) +ie_option (ENABLE_GAPI_PREPROCESSING "Enables G-API preprocessing" ON) + ie_option (ENABLE_MULTI "Enables Multi Device Plugin" ON) ie_option (ENABLE_HETERO "Enables Hetero Device Plugin" ON) @@ -118,7 +120,7 @@ ie_dependent_option (ENABLE_MYRIAD "myriad targeted plugin for inference engine" ie_dependent_option (ENABLE_MYRIAD_NO_BOOT "myriad plugin will skip device boot" OFF "ENABLE_MYRIAD" OFF) -ie_dependent_option (ENABLE_GAPI_TESTS "tests for GAPI kernels" ON "ENABLE_TESTS" OFF) +ie_dependent_option (ENABLE_GAPI_TESTS "tests for GAPI kernels" ON "ENABLE_GAPI_PREPROCESSING;ENABLE_TESTS" OFF) ie_dependent_option (GAPI_TEST_PERF "if GAPI unit tests should examine performance" OFF "ENABLE_GAPI_TESTS" OFF) diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing/preprocessing.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing/preprocessing.cpp index 212d570bcfa..f82f978052f 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing/preprocessing.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing/preprocessing.cpp @@ -4,6 +4,8 @@ #include "behavior/preprocessing/preprocessing.hpp" +#ifdef ENABLE_GAPI_PREPROCESSING + using namespace BehaviorTestsDefinitions; namespace { @@ -36,3 +38,5 @@ INSTANTIATE_TEST_SUITE_P(smoke_Behavior_PreprocessingPrecisionConvertTestsViaGet PreprocessingPrecisionConvertTest::getTestCaseName); } // namespace + +#endif // ENABLE_GAPI_PREPROCESSING diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp index 59c68928a0a..80fa8703e56 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp @@ -4,6 +4,8 @@ #include "behavior/preprocessing/set_preprocess.hpp" +#ifdef ENABLE_GAPI_PREPROCESSING + using namespace BehaviorTestsDefinitions; namespace { @@ -89,4 +91,6 @@ INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestPreprocessDynamicallyI ::testing::ValuesIn(configs)), InferRequestPreprocessDynamicallyInSetBlobTest::getTestCaseName); -} // namespace \ No newline at end of file +} // namespace + +#endif // ENABLE_GAPI_PREPROCESSING diff --git a/docs/template_plugin/tests/functional/subgraph_reference/preprocess_legacy.cpp b/docs/template_plugin/tests/functional/subgraph_reference/preprocess_legacy.cpp index e0bfa67f902..53a800e83fd 100644 --- a/docs/template_plugin/tests/functional/subgraph_reference/preprocess_legacy.cpp +++ b/docs/template_plugin/tests/functional/subgraph_reference/preprocess_legacy.cpp @@ -13,6 +13,8 @@ #include "base_reference_cnn_test.hpp" #include "ngraph_functions/builders.hpp" +#ifdef ENABLE_GAPI_PREPROCESSING + using namespace ov; using namespace ov::preprocess; using namespace reference_tests; @@ -178,4 +180,6 @@ TEST_F(ConvertNV12WithLegacyTest, convert_nv12_full_color_range) { TEST_F(ConvertNV12WithLegacyTest, convert_nv12_colored) { auto input_yuv = std::vector {235, 81, 235, 81, 109, 184}; SetupAndExec(2, 2, input_yuv); -} \ No newline at end of file +} + +#endif // ENABLE_GAPI_PREPROCESSING diff --git a/inference-engine/ie_bridges/c/tests/CMakeLists.txt b/inference-engine/ie_bridges/c/tests/CMakeLists.txt index dd6bd3db021..97d213be740 100644 --- a/inference-engine/ie_bridges/c/tests/CMakeLists.txt +++ b/inference-engine/ie_bridges/c/tests/CMakeLists.txt @@ -13,16 +13,12 @@ endif() add_executable(${TARGET_NAME} ie_c_api_test.cpp test_model_repo.hpp) -target_link_libraries(${TARGET_NAME} - PRIVATE - inference_engine - inference_engine_c_api - ${OpenCV_LIBRARIES} - commonTestUtils - ) +target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_c_api ${OpenCV_LIBRARIES} + commonTestUtils gtest_main) target_compile_definitions(${TARGET_NAME} - PUBLIC ${ARGV} + PRIVATE + $<$:ENABLE_GAPI_PREPROCESSING> DATA_PATH=\"${DATA_PATH}\" MODELS_PATH=\"${MODELS_PATH}\" ) diff --git a/inference-engine/ie_bridges/c/tests/ie_c_api_test.cpp b/inference-engine/ie_bridges/c/tests/ie_c_api_test.cpp index d422448bc69..97b7e2dee86 100644 --- a/inference-engine/ie_bridges/c/tests/ie_c_api_test.cpp +++ b/inference-engine/ie_bridges/c/tests/ie_c_api_test.cpp @@ -1873,6 +1873,8 @@ TEST(ie_blob_make_memory_nv12, NV12BlobInvalidAfterDeallocateUVPlane) { ie_blob_free(&blob_nv12); } +#ifdef ENABLE_GAPI_PREPROCESSING + TEST(ie_blob_make_memory_nv12, inferRequestWithNV12Blob) { ie_core_t *core = nullptr; IE_ASSERT_OK(ie_core_create("", &core)); @@ -1944,6 +1946,8 @@ TEST(ie_blob_make_memory_nv12, inferRequestWithNV12Blob) { free(img_data); } +#endif // ENABLE_GAPI_PREPROCESSING + TEST(ie_blob_make_memory_i420, makeI420Blob) { dimensions_t dim_y = {4, {1, 1, 8, 12}}, dim_u = {4, {1, 1, 4, 6}}, dim_v = {4, {1, 1, 4, 6}}; tensor_desc tensor_y, tensor_u, tensor_v; @@ -2176,6 +2180,8 @@ TEST(ie_blob_make_memory_i420, I420BlobInvalidAfterDeallocateVPlane) { ie_blob_free(&blob_i420); } +#ifdef ENABLE_GAPI_PREPROCESSING + TEST(ie_blob_make_memory_i420, inferRequestWithI420) { ie_core_t *core = nullptr; IE_ASSERT_OK(ie_core_create("", &core)); @@ -2246,8 +2252,4 @@ TEST(ie_blob_make_memory_i420, inferRequestWithI420) { free(img_data); } -int main(int argc, char *argv[]){ - ::testing::InitGoogleTest(&argc, argv); - - return RUN_ALL_TESTS(); -} +#endif // ENABLE_GAPI_PREPROCESSING diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt index 0430c533661..90d2642b9d2 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt @@ -112,6 +112,9 @@ target_include_directories(${TARGET_NAME}_plugin_api INTERFACE $ $) +target_compile_definitions(${TARGET_NAME}_plugin_api INTERFACE + $) + target_link_libraries(${TARGET_NAME}_plugin_api INTERFACE pugixml::static openvino::itt openvino::util) set_ie_threading_interface_for(${TARGET_NAME}_plugin_api) @@ -134,7 +137,8 @@ ie_faster_build(${TARGET_NAME}_obj target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_API $ - $) + $ + $) target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $ $ diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt index 986e8281b16..007b2503d6f 100644 --- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt +++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt @@ -47,9 +47,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE mkldnn ov_shape_inference) target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_EXTENSION_API) - -target_include_directories(${TARGET_NAME} PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(${TARGET_NAME} SYSTEM PRIVATE $) @@ -86,6 +84,7 @@ set_ie_threading_interface_for(${TARGET_NAME}_obj) target_compile_definitions(${TARGET_NAME}_obj PRIVATE USE_STATIC_IE IMPLEMENT_INFERENCE_ENGINE_PLUGIN IMPLEMENT_INFERENCE_EXTENSION_API $ + $ ) set_target_properties(${TARGET_NAME}_obj PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt index 29e415e9ade..094de0cea1e 100644 --- a/inference-engine/src/preprocessing/CMakeLists.txt +++ b/inference-engine/src/preprocessing/CMakeLists.txt @@ -100,7 +100,8 @@ ie_faster_build(${TARGET_NAME}_obj target_compile_definitions(${TARGET_NAME}_obj PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN $ - $) + $ + $<$:ENABLE_GAPI_PREPROCESSING>) target_include_directories(${TARGET_NAME}_obj SYSTEM PRIVATE $ $ @@ -116,21 +117,30 @@ add_cpplint_target(${TARGET_NAME}_obj_cpplint FOR_TARGETS ${TARGET_NAME}_obj) # Create module library file from object library +set(library_sources $) + if(BUILD_SHARED_LIBS) set(library_type MODULE) else() - set(library_type STATIC) + if(ENABLE_GAPI_PREPROCESSING) + set(library_type STATIC) + else() + set(library_type INTERFACE) + unset(library_sources) + endif() endif() -add_library(${TARGET_NAME} ${library_type} - $) +add_library(${TARGET_NAME} ${library_type} ${library_sources}) ie_add_vs_version_file(NAME ${TARGET_NAME} FILEDESCRIPTION "Inference Engine Preprocessing plugin") set_ie_threading_interface_for(${TARGET_NAME}) -target_link_libraries(${TARGET_NAME} PRIVATE fluid openvino::itt openvino::util) +if(ENABLE_GAPI_PREPROCESSING) + target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_GAPI_PREPROCESSING) + target_link_libraries(${TARGET_NAME} PRIVATE fluid openvino::itt openvino::util) +endif() if(BUILD_SHARED_LIBS) # for static linkage the dependencies are in opposite order @@ -149,7 +159,7 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS_RELEASE "-Wno-error=maybe-uninitialized -Wno-maybe-uninitialized") endif() -if(WIN32) +if(WIN32 AND NOT library_type STREQUAL "INTERFACE") set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) endif() @@ -177,9 +187,14 @@ set_target_properties(${TARGET_NAME}_s PROPERTIES EXCLUDE_FROM_ALL ON) # LTO -set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj ${TARGET_NAME}_s +set_target_properties(${TARGET_NAME}_obj ${TARGET_NAME}_s PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) +if(NOT library_type STREQUAL "INTERFACE") + set_target_properties(${TARGET_NAME} + PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO}) +endif() + # developer package openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME}) diff --git a/inference-engine/src/preprocessing/ie_preprocess_data.hpp b/inference-engine/src/preprocessing/ie_preprocess_data.hpp index 4204aa69b54..3c99f0f23e8 100644 --- a/inference-engine/src/preprocessing/ie_preprocess_data.hpp +++ b/inference-engine/src/preprocessing/ie_preprocess_data.hpp @@ -70,9 +70,14 @@ class PreProcessDataPlugin { public: PreProcessDataPlugin() { #ifdef OPENVINO_STATIC_LIBRARY +# ifdef ENABLE_GAPI_PREPROCESSING CreatePreProcessData(_ptr); if (!_ptr) IE_THROW() << "Failed to create IPreProcessData for G-API based preprocessing"; +# else + IE_THROW() << "OpenVINO Runtime is compiled without G-API preprocessing support.\n" + "Use 'cmake -DENABLE_GAPI_PREPROCESSING=ON ...'"; +# endif // ENABLE_GAPI_PREPROCESSING #else ov::util::FilePath libraryName = ov::util::to_file_path(std::string("inference_engine_preproc") + std::string(IE_BUILD_POSTFIX)); ov::util::FilePath preprocLibraryPath = FileUtils::makePluginLibraryName(getInferenceEngineLibraryPath(), libraryName); diff --git a/inference-engine/tests/functional/inference_engine/CMakeLists.txt b/inference-engine/tests/functional/inference_engine/CMakeLists.txt index 31cc338ca54..b1ff44c46af 100644 --- a/inference-engine/tests/functional/inference_engine/CMakeLists.txt +++ b/inference-engine/tests/functional/inference_engine/CMakeLists.txt @@ -200,6 +200,8 @@ function(ie_headers_compilation_with_custom_flags) $) target_include_directories(${target_name} PRIVATE $) + target_compile_definitions(${target_name} PRIVATE + $) else() # OpenCL headers if any if(OPENCL_HEADERS_DIR) diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing/preprocessing.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing/preprocessing.cpp index f382fa3b6b1..4b37bcf90b7 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing/preprocessing.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing/preprocessing.cpp @@ -4,6 +4,8 @@ #include "behavior/preprocessing/preprocessing.hpp" +#ifdef ENABLE_GAPI_PREPROCESSING + using namespace BehaviorTestsDefinitions; namespace { @@ -35,3 +37,5 @@ INSTANTIATE_TEST_SUITE_P(BehaviourPreprocessingTestsViaGetBlob, PreprocessingPre ::testing::ValuesIn(configs)), PreprocessingPrecisionConvertTest::getTestCaseName); } // namespace + +#endif // ENABLE_GAPI_PREPROCESSING diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp index 389ff2c5c09..1e8bc4527bc 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp @@ -4,6 +4,8 @@ #include "behavior/preprocessing/set_preprocess.hpp" +#ifdef ENABLE_GAPI_PREPROCESSING + using namespace BehaviorTestsDefinitions; namespace { const std::vector netPrecisions = { @@ -180,4 +182,6 @@ namespace { ::testing::ValuesIn(multiConfigs)), InferRequestPreprocessDynamicallyInSetBlobTest::getTestCaseName); -} // namespace \ No newline at end of file +} // namespace + +#endif // ENABLE_GAPI_PREPROCESSING diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp index 950425675bc..0b5104a554c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp @@ -5,6 +5,8 @@ #include #include "behavior/preprocessing/set_preprocess.hpp" +#ifdef ENABLE_GAPI_PREPROCESSING + using namespace BehaviorTestsDefinitions; namespace { using PreprocessBehTest = BehaviorTestsUtils::BehaviorTestsBasic; @@ -92,3 +94,5 @@ namespace { InferRequestPreprocessDynamicallyInSetBlobTest::getTestCaseName); } // namespace + +#endif // ENABLE_GAPI_PREPROCESSING diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp index 882fdbf9b4a..81f7f1d804e 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/preprocessing/set_preprocess.cpp @@ -5,6 +5,8 @@ #include #include "behavior/preprocessing/set_preprocess.hpp" +#ifdef ENABLE_GAPI_PREPROCESSING + using namespace BehaviorTestsDefinitions; namespace { using PreprocessBehTest = BehaviorTestsUtils::BehaviorTestsBasic; @@ -77,4 +79,6 @@ namespace { InferRequestPreprocessDynamicallyInSetBlobTest::getTestCaseName); -} // namespace \ No newline at end of file +} // namespace + +#endif // ENABLE_GAPI_PREPROCESSING diff --git a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt index ef15e007bdf..825c0f66a2c 100644 --- a/inference-engine/tests/functional/plugin/shared/CMakeLists.txt +++ b/inference-engine/tests/functional/plugin/shared/CMakeLists.txt @@ -58,6 +58,10 @@ addIeTarget( ${DEPENDENCIES} ) +if(ENABLE_GAPI_PREPROCESSING) + target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_GAPI_PREPROCESSING) +endif() + # CVS-55376 set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/low_precision_transformations/layer_transformation.cpp" PROPERTIES INCLUDE_DIRECTORIES diff --git a/inference-engine/tests_deprecated/fluid_preproc/CMakeLists.txt b/inference-engine/tests_deprecated/fluid_preproc/CMakeLists.txt index b18876cc101..e54a2d75130 100644 --- a/inference-engine/tests_deprecated/fluid_preproc/CMakeLists.txt +++ b/inference-engine/tests_deprecated/fluid_preproc/CMakeLists.txt @@ -23,6 +23,9 @@ target_include_directories(${TARGET} PRIVATE $ $) +target_compile_definitions(${TARGET} PRIVATE + $) + target_link_libraries(${TARGET} PRIVATE opencv_core opencv_imgproc openvino::util inference_engine fluid_test_computations gtest gtest_main)