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

Minimized usage of `IE_MAIN_SOURCE_DIR` (#6422) 

* Minimized IE_MAIN_SOURCE_DIR hardcode

* Used COMPILE_OPTIONS instead of COMPILE_FLAGS

* Fixed compilation

* Enabled NGRAPH_DYNAMIC_COMPONENTS_ENABLE by default

* Fixes

* Moved GNA related file

* Fixed backend compilation

* Fixed Windows for ngraph

* Fixed <root>/tests build

* More updates

* Fixed scripts install

* Fixed Windows

* Fixed Windows
This commit is contained in:
Ilya Lavrenov 2021-06-30 18:15:41 +03:00 committed by GitHub
parent 5c711cf8bb
commit 07f94ea602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
68 changed files with 354 additions and 467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/azure/linux_onnxruntime.yml
View File

@ -96,9 +96,7 @@ jobs:
-DENABLE_SPEECH_DEMO=OFF
-DNGRAPH_ONNX_IMPORT_ENABLE=ON
-DNGRAPH_ONNX_EDITOR_ENABLE=ON
-DNGRAPH_INTERPRETER_ENABLE=ON
-DNGRAPH_DEBUG_ENABLE=OFF
-DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=ON
$(REPO_DIR)
workingDirectory: $(BUILD_DIR)

2
.ci/openvino-onnx/Dockerfile
View File

@ -70,9 +70,7 @@ RUN cmake .. \
-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-DNGRAPH_ONNX_IMPORT_ENABLE=ON \
-DNGRAPH_ONNX_EDITOR_ENABLE=ON \
-DNGRAPH_INTERPRETER_ENABLE=ON \
-DNGRAPH_DEBUG_ENABLE=OFF \
-DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=ON \
-DCMAKE_INSTALL_PREFIX=/openvino/dist \
-DNGRAPH_USE_PROTOBUF_LITE=${PROTOBUF_LITE}
RUN make -j $(nproc) install

70
CMakeLists.txt
View File

@ -28,7 +28,6 @@ endif()
message (STATUS "PROJECT ............................... " ${PROJECT_NAME})
message (STATUS "CMAKE_BINARY_DIR ...................... " ${CMAKE_BINARY_DIR})
message (STATUS "OpenVINO_MAIN_SOURCE_DIR .............. " ${OpenVINO_MAIN_SOURCE_DIR})
message (STATUS "IE_MAIN_SOURCE_DIR .................... " ${IE_MAIN_SOURCE_DIR})
message (STATUS "CMAKE_GENERATOR ....................... " ${CMAKE_GENERATOR})
message (STATUS "CMAKE_C_COMPILER_ID ................... " ${CMAKE_C_COMPILER_ID})
message (STATUS "CMAKE_BUILD_TYPE ...................... " ${CMAKE_BUILD_TYPE})
@ -64,7 +63,6 @@ function(build_ngraph)
ngraph_set(NGRAPH_ONNX_IMPORT_ENABLE OFF)
ngraph_set(NGRAPH_PDPD_FRONTEND_ENABLE OFF)
endif()
ngraph_set(NGRAPH_INTERPRETER_ENABLE ON)
if(ENABLE_PYTHON)
ngraph_set(NGRAPH_PYTHON_BUILD_ENABLE ON)
@ -132,72 +130,18 @@ add_subdirectory(thirdparty)
add_subdirectory(openvino)
build_ngraph()
add_subdirectory(inference-engine)
# for Template plugin
openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph_backend interpreter_backend)
include(cmake/extra_modules.cmake)
add_subdirectory(model-optimizer)
add_subdirectory(docs)
add_subdirectory(tools)
add_subdirectory(scripts)
#
# Shellcheck
# CPack
#
ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
SKIP "${OpenVINO_MAIN_SOURCE_DIR}/bin"
"${OpenVINO_MAIN_SOURCE_DIR}/build"
"${OpenVINO_MAIN_SOURCE_DIR}/thirdparty"
"${IE_MAIN_SOURCE_DIR}/tests/ie_test_utils/common_test_utils/gtest"
"${IE_MAIN_SOURCE_DIR}/samples/thirdparty"
"${IE_MAIN_SOURCE_DIR}/thirdparty"
"${IE_MAIN_SOURCE_DIR}/temp"
# TODO fix and enable back:
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/scripts/dependencies.sh"
"${OpenVINO_MAIN_SOURCE_DIR}/scripts/install_dependencies/install_NEO_OCL_driver.sh"
"${OpenVINO_MAIN_SOURCE_DIR}/scripts/install_dependencies/install_openvino_dependencies.sh"
"${OpenVINO_MAIN_SOURCE_DIR}/ngraph/python/tests/test_onnx/model_zoo_preprocess.sh"
)
#
# cpack
#
# install setupvars
ie_cpack_add_component(setupvars REQUIRED)
if(UNIX)
install(PROGRAMS scripts/setupvars/setupvars.sh
DESTINATION bin
COMPONENT setupvars)
elseif(WIN32)
install(PROGRAMS scripts/setupvars/setupvars.bat
DESTINATION bin
COMPONENT setupvars)
endif()
# install install_dependencies
if(UNIX)
ie_cpack_add_component(install_dependencies REQUIRED)
install(DIRECTORY scripts/install_dependencies/
DESTINATION install_dependencies
COMPONENT install_dependencies)
endif()
# install files for demo
ie_cpack_add_component(demo_scripts DEPENDS core)
if(UNIX)
install(DIRECTORY scripts/demo/
DESTINATION deployment_tools/demo
COMPONENT demo_scripts
USE_SOURCE_PERMISSIONS
PATTERN *.bat EXCLUDE)
elseif(WIN32)
install(DIRECTORY scripts/demo/
DESTINATION deployment_tools/demo
COMPONENT demo_scripts
USE_SOURCE_PERMISSIONS
PATTERN *.sh EXCLUDE)
endif()
ie_cpack(${IE_CPACK_COMPONENTS_ALL})

34
cmake/developer_package/compile_flags/os_flags.cmake
View File

@ -67,15 +67,15 @@ function(ie_sse42_optimization_flags flags)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# No such option for MSVC 2019
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(${flags} "/arch:SSE4.2 /QxSSE4.2" PARENT_SCOPE)
set(${flags} /arch:SSE4.2 /QxSSE4.2 PARENT_SCOPE)
else()
message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
endif()
else()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(${flags} "-msse4.2 -xSSE4.2" PARENT_SCOPE)
set(${flags} -msse4.2 -xSSE4.2 PARENT_SCOPE)
else()
set(${flags} "-msse4.2" PARENT_SCOPE)
set(${flags} -msse4.2 PARENT_SCOPE)
endif()
endif()
endfunction()
@ -86,17 +86,17 @@ endfunction()
function(ie_avx2_optimization_flags flags)
if(WIN32)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(${flags} "/QxCORE-AVX2" PARENT_SCOPE)
set(${flags} /QxCORE-AVX2 PARENT_SCOPE)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(${flags} "/arch:AVX2" PARENT_SCOPE)
set(${flags} /arch:AVX2 PARENT_SCOPE)
else()
message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
endif()
else()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(${flags} "-march=core-avx2 -xCORE-AVX2 -mtune=core-avx2" PARENT_SCOPE)
set(${flags} -march=core-avx2 -xCORE-AVX2 -mtune=core-avx2 PARENT_SCOPE)
else()
set(${flags} "-mavx2 -mfma" PARENT_SCOPE)
set(${flags} -mavx2 -mfma PARENT_SCOPE)
endif()
endif()
endfunction()
@ -108,21 +108,21 @@ endfunction()
function(ie_avx512_optimization_flags flags)
if(WIN32)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(${flags} "/QxCOMMON-AVX512" PARENT_SCOPE)
set(${flags} /QxCOMMON-AVX512 PARENT_SCOPE)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(${flags} "/arch:AVX512" PARENT_SCOPE)
set(${flags} /arch:AVX512 PARENT_SCOPE)
else()
message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
endif()
else()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(${flags} "-xCOMMON-AVX512" PARENT_SCOPE)
set(${flags} -xCOMMON-AVX512 PARENT_SCOPE)
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(${flags} "-mavx512f -mfma" PARENT_SCOPE)
set(${flags} -mavx512f -mfma PARENT_SCOPE)
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "^(Clang|AppleClang)$")
set(${flags} "-mavx512f -mfma" PARENT_SCOPE)
set(${flags} -mavx512f -mfma PARENT_SCOPE)
endif()
endif()
endfunction()
@ -134,19 +134,19 @@ function(ie_arm_neon_optimization_flags flags)
# nothing
elseif(ANDROID)
if(ANDROID_ABI STREQUAL "arm64-v8a")
set(${flags} "-mfpu=neon" PARENT_SCOPE)
set(${flags} -mfpu=neon PARENT_SCOPE)
elseif(ANDROID_ABI STREQUAL "armeabi-v7a-hard with NEON")
set(${flags} "-march=armv7-a -mfloat-abi=hard -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=neon" PARENT_SCOPE)
set(${flags} -march=armv7-a -mfloat-abi=hard -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=neon PARENT_SCOPE)
elseif((ANDROID_ABI STREQUAL "armeabi-v7a with NEON") OR
(ANDROID_ABI STREQUAL "armeabi-v7a" AND
DEFINED CMAKE_ANDROID_ARM_NEON AND CMAKE_ANDROID_ARM_NEON))
set(${flags} "-march=armv7-a -mfloat-abi=softfp -mfpu=neon" PARENT_SCOPE)
set(${flags} -march=armv7-a -mfloat-abi=softfp -mfpu=neon PARENT_SCOPE)
endif()
else()
if(AARCH64)
set(${flags} "-O2 -ftree-vectorize" PARENT_SCOPE)
set(${flags} -O2 -ftree-vectorize PARENT_SCOPE)
elseif(ARM)
set(${flags} "-mfpu=neon" PARENT_SCOPE)
set(${flags} -mfpu=neon PARENT_SCOPE)
endif()
endif()
endfunction()

4
cmake/developer_package/cross_compile/cross_compiled_func.cmake
View File

@ -120,8 +120,8 @@ function(_clone_source_to_target TARGET SOURCE ARCH_SET)
VERBATIM
)
set_property(SOURCE ${ARCH_SOURCE} APPEND_STRING PROPERTY COMPILE_FLAGS
" ${_FLAGS_${_arch}}")
set_property(SOURCE ${ARCH_SOURCE} APPEND_STRING PROPERTY COMPILE_OPTIONS
"${_FLAGS_${_arch}}")
set_property(SOURCE ${ARCH_SOURCE} APPEND PROPERTY COMPILE_DEFINITIONS
${_DEFINE_${_arch}}

4
cmake/developer_package/version.cmake
View File

@ -42,7 +42,7 @@ macro(ie_parse_ci_build_number)
message(FATAL_ERROR "repo_root is not defined")
endif()
if(DEFINED IEDevScripts_DIR AND DEFINED IE_MAIN_SOURCE_DIR AND NOT DEFINED custom_build)
if(DEFINED IEDevScripts_DIR AND DEFINED OpeenVINO_SOURCE_DIR AND NOT DEFINED custom_build)
set(ie_version_hpp "${IE_MAIN_SOURCE_DIR}/include/ie_version.hpp")
if(NOT EXISTS ${ie_version_hpp})
message(FATAL_ERROR "File ie_version.hpp with IE_VERSION definitions is not found")
@ -67,7 +67,7 @@ macro(ie_parse_ci_build_number)
endif()
endforeach()
elseif(has_ci_version)
message(WARNING "IE_MAIN_SOURCE_DIR is not defined. No way to compare versions")
message(WARNING "OpeenVINO_SOURCE_DIR is not defined. No way to compare versions")
else()
message(WARNING "No way to detect OpenVINO version. Supposing 0.0.0.0")
endif()

88
cmake/extra_modules.cmake Normal file
View File

@ -0,0 +1,88 @@
function(ie_generate_dev_package_config)
# dummy check that OpenCV is here
find_package(OpenCV QUIET)
set(all_dev_targets gflags ie_libraries)
foreach(component IN LISTS openvino_export_components)
export(TARGETS ${${component}} NAMESPACE IE::
APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
list(APPEND all_dev_targets ${${component}})
endforeach()
add_custom_target(ie_dev_targets ALL DEPENDS ${all_dev_targets})
configure_package_config_file("${OpenVINO_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
INSTALL_DESTINATION share # not used
PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;gflags_BINARY_DIR"
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
configure_file("${OpenVINO_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
@ONLY)
endfunction()
ie_generate_dev_package_config()
#
# Add extra modules
#
function(register_extra_modules)
# post export
openvino_developer_export_targets(COMPONENT inference_engine TARGETS inference_engine)
openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph)
set(InferenceEngineDeveloperPackage_DIR "${CMAKE_CURRENT_BINARY_DIR}/runtime")
function(generate_fake_dev_package)
set(iedevconfig_file "${InferenceEngineDeveloperPackage_DIR}/InferenceEngineDeveloperPackageConfig.cmake")
file(REMOVE "${iedevconfig_file}")
file(WRITE "${iedevconfig_file}" "\# !! AUTOGENERATED: DON'T EDIT !!\n\n")
file(APPEND "${iedevconfig_file}" "ie_deprecated_no_errors()\n")
foreach(target IN LISTS ${openvino_export_components})
if(target)
file(APPEND "${iedevconfig_file}" "add_library(IE::${target} ALIAS ${target})\n")
endif()
endforeach()
endfunction()
generate_fake_dev_package()
# automatically import plugins from the 'plugins' folder
file(GLOB local_extra_modules "runtime/plugins/*")
# add template plugin
list(APPEND local_extra_modules "${OpenVINO_MAIN_SOURCE_DIR}/docs/template_plugin")
# detect where IE_EXTRA_MODULES contains folders with CMakeLists.txt
# other folders are supposed to have sub-folders with CMakeLists.txt
foreach(module_path IN LISTS IE_EXTRA_MODULES)
if(EXISTS "${module_path}/CMakeLists.txt")
list(APPEND extra_modules "${module_path}")
elseif(module_path)
file(GLOB extra_modules ${extra_modules} "${module_path}/*")
endif()
endforeach()
# add each extra module
foreach(module_path IN LISTS extra_modules local_extra_modules)
if(module_path)
get_filename_component(module_name "${module_path}" NAME)
set(build_module ON)
if(NOT EXISTS "${module_path}/CMakeLists.txt") # if module is built not using cmake
set(build_module OFF)
endif()
if(NOT DEFINED BUILD_${module_name})
set(BUILD_${module_name} ${build_module} CACHE BOOL "Build ${module_name} extra module" FORCE)
endif()
if(BUILD_${module_name})
message(STATUS "Register ${module_name} to be built in build-modules/${module_name}")
add_subdirectory("${module_path}" "build-modules/${module_name}")
endif()
endif()
endforeach()
endfunction()
register_extra_modules()

4
docs/CMakeLists.txt
View File

@ -46,10 +46,6 @@ if(NOT ENABLE_DOCKER)
install(TARGETS templatePlugin template_extension
LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL)
if(ENABLE_FUNCTIONAL_TESTS)
install(TARGETS templateFuncTests
RUNTIME DESTINATION tests COMPONENT tests EXCLUDE_FROM_ALL)
endif()
endif()
set(LINKCHECKER_PY "" CACHE FILEPATH "Path to linkchecker.py for documentation check")

5
docs/template_plugin/CMakeLists.txt
View File

@ -25,9 +25,8 @@ if(ENABLE_TESTS)
add_subdirectory(tests/functional)
endif()
endif()
# [cmake:main]
# install
# ATTENTION: uncomment to install component
# ie_cpack(template)
ie_cpack(template)
# [cmake:main]

1
docs/template_plugin/src/CMakeLists.txt
View File

@ -15,6 +15,7 @@ ie_add_plugin(NAME ${TARGET_NAME}
SKIP_INSTALL # ATTENTION: uncomment to install component
VERSION_DEFINES_FOR template_plugin.cpp
ADD_CLANG_FORMAT)
# Enable support of CC for the plugin
ie_mark_target_as_cc(${TARGET_NAME})

102
inference-engine/CMakeLists.txt
View File

@ -15,6 +15,8 @@ endif()
add_subdirectory(tools)
add_subdirectory(samples)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
if(ENABLE_TESTS)
add_subdirectory(tests_deprecated)
add_subdirectory(tests)
@ -85,103 +87,3 @@ if(SPEECH_LIBS_AND_DEMOS)
USE_SOURCE_PERMISSIONS
COMPONENT speech_demo_files)
endif()
#
# Developer package
#
openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
# for Template plugin
if(NGRAPH_INTERPRETER_ENABLE)
openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph_backend interpreter_backend)
endif()
function(ie_generate_dev_package_config)
# dummy check that OpenCV is here
find_package(OpenCV QUIET)
set(all_dev_targets gflags ie_libraries)
foreach(component IN LISTS openvino_export_components)
export(TARGETS ${${component}} NAMESPACE IE::
APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
list(APPEND all_dev_targets ${${component}})
endforeach()
add_custom_target(ie_dev_targets ALL DEPENDS ${all_dev_targets})
configure_package_config_file("${OpenVINO_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
INSTALL_DESTINATION share # not used
PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR;gflags_BINARY_DIR"
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
configure_file("${OpenVINO_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
"${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
@ONLY)
endfunction()
ie_generate_dev_package_config()
#
# Add extra modules
#
function(register_extra_modules)
# post export
openvino_developer_export_targets(COMPONENT inference_engine TARGETS inference_engine)
openvino_developer_export_targets(COMPONENT ngraph TARGETS ${NGRAPH_LIBRARIES})
set(InferenceEngineDeveloperPackage_DIR "${CMAKE_CURRENT_BINARY_DIR}/build-modules")
function(generate_fake_dev_package)
set(iedevconfig_file "${InferenceEngineDeveloperPackage_DIR}/InferenceEngineDeveloperPackageConfig.cmake")
file(REMOVE "${iedevconfig_file}")
file(WRITE "${iedevconfig_file}" "\# !! AUTOGENERATED: DON'T EDIT !!\n\n")
file(APPEND "${iedevconfig_file}" "ie_deprecated_no_errors()\n")
foreach(target IN LISTS ${openvino_export_components})
if(target)
file(APPEND "${iedevconfig_file}" "add_library(IE::${target} ALIAS ${target})\n")
endif()
endforeach()
endfunction()
generate_fake_dev_package()
# automatically import plugins from the 'plugins' folder
file(GLOB local_extra_modules "plugins/*")
if(NGRAPH_INTERPRETER_ENABLE)
list(APPEND local_extra_modules "${OpenVINO_MAIN_SOURCE_DIR}/docs/template_plugin")
endif()
# detect where IE_EXTRA_MODULES contains folders with CMakeLists.txt
# other folders are supposed to have sub-folders with CMakeLists.txt
foreach(module_path IN LISTS IE_EXTRA_MODULES)
if(EXISTS "${module_path}/CMakeLists.txt")
list(APPEND extra_modules "${module_path}")
elseif(module_path)
file(GLOB extra_modules ${extra_modules} "${module_path}/*")
endif()
endforeach()
# add each extra module
foreach(module_path IN LISTS extra_modules local_extra_modules)
if(module_path)
get_filename_component(module_name "${module_path}" NAME)
set(build_module ON)
if(NOT EXISTS "${module_path}/CMakeLists.txt") # if module is built not using cmake
set(build_module OFF)
endif()
if(NOT DEFINED BUILD_${module_name})
set(BUILD_${module_name} ${build_module} CACHE BOOL "Build ${module_name} extra module" FORCE)
endif()
if(BUILD_${module_name})
message(STATUS "Register ${module_name} to be built in build-modules/${module_name}")
add_subdirectory("${module_path}" "build-modules/${module_name}")
endif()
endif()
endforeach()
endfunction()
register_extra_modules()

2
inference-engine/ie_bridges/python/CMakeLists.txt
View File

@ -8,7 +8,7 @@ cmake_minimum_required (VERSION 3.13)
# Set the project name
project (ie_python_api)
if(DEFINED IE_MAIN_SOURCE_DIR)
if(DEFINED OpenVINO_SOURCE_DIR)
set(InferenceEngine_LIBRARIES inference_engine)
else()
find_package(InferenceEngineDeveloperPackage REQUIRED)

2
inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
View File

@ -44,7 +44,7 @@ endif()
function(python_disable_deprecated_warnings)
disable_deprecated_warnings()
set(pyx_file "${CMAKE_CURRENT_BINARY_DIR}/ie_api.cxx" "${CMAKE_CURRENT_BINARY_DIR}/constants.cxx")
set_source_files_properties(${pyx_file} PROPERTIES COMPILE_FLAGS ${ie_c_cxx_deprecated})
set_source_files_properties(${pyx_file} PROPERTIES COMPILE_OPTIONS ${ie_c_cxx_deprecated})
endfunction()
python_disable_deprecated_warnings()

6
inference-engine/samples/CMakeLists.txt
View File

@ -31,7 +31,7 @@ if (NOT BIN_FOLDER)
endif()
endif()
if(IE_MAIN_SOURCE_DIR)
if(OpenVINO_SOURCE_DIR)
# in case if samples are built from IE repo
set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
# hint for find_package(InferenceEngine in the samples folder)
@ -111,7 +111,7 @@ endif()
####################################
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags" AND
NOT DEFINED IE_MAIN_SOURCE_DIR)
NOT DEFINED OpenVINO_SOURCE_DIR)
function(add_gflags)
# common gflags settings
set(GFLAGS_IS_SUBPROJECT TRUE)
@ -152,7 +152,7 @@ elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/common/opencv_c_wrapper")
endif()
# samples build can be switched off during whole IE build
if (DEFINED IE_MAIN_SOURCE_DIR AND NOT ENABLE_SAMPLES)
if (DEFINED OpenVINO_SOURCE_DIR AND NOT ENABLE_SAMPLES)
return()
endif()

3
inference-engine/src/cldnn_engine/CMakeLists.txt
View File

@ -32,11 +32,10 @@ target_link_libraries(${TARGET_NAME} PRIVATE clDNN_lib pugixml
inference_engine_lp_transformations
${NGRAPH_LIBRARIES})
set(CLDNN_TOP_FOLDER "${IE_MAIN_SOURCE_DIR}/thirdparty/clDNN")
target_include_directories(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
$<TARGET_PROPERTY:inference_engine_transformations,INTERFACE_INCLUDE_DIRECTORIES>
${CLDNN_TOP_FOLDER}/api)
${clDNN_SOURCE_DIR}/api)
set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})

4
inference-engine/src/inference_engine/CMakeLists.txt
View File

@ -67,7 +67,7 @@ if(ENABLE_SSE42)
list(APPEND LIBRARY_SRC ${SSE_SRC})
ie_sse42_optimization_flags(sse4_2_flags)
set_source_files_properties(${SSE_SRC} PROPERTIES COMPILE_FLAGS "${sse4_2_flags}")
set_source_files_properties(${SSE_SRC} PROPERTIES COMPILE_OPTIONS "${sse4_2_flags}")
add_definitions(-DHAVE_SSE=1)
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.16")
@ -261,7 +261,7 @@ endif()
ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
ie_cpack_add_component(core_dev REQUIRED core ngraph_dev)
install(DIRECTORY "${IE_MAIN_SOURCE_DIR}/include" DESTINATION ${IE_CPACK_IE_DIR}
install(DIRECTORY "${PUBLIC_HEADERS_DIR}" DESTINATION ${IE_CPACK_IE_DIR}
COMPONENT core_dev)
install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets

27
inference-engine/src/preprocessing/CMakeLists.txt
View File

@ -14,32 +14,21 @@ file(GLOB LIBRARY_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
function(ie_avx512_core_optimization_flags flags)
if(WIN32)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(${flags} "/QxCORE-AVX512" PARENT_SCOPE)
set(${flags} /QxCORE-AVX512 PARENT_SCOPE)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(${flags} "/arch:AVX512" PARENT_SCOPE)
set(${flags} /arch:AVX512 PARENT_SCOPE)
else()
message(WARNING "Unsupported CXX compiler ${CMAKE_CXX_COMPILER_ID}")
endif()
else()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
set(${flags} "-xCORE-AVX512" PARENT_SCOPE)
set(${flags} -xCORE-AVX512 PARENT_SCOPE)
else()
set(${flags} "-mavx512f -mavx512bw -mavx512dq -mfma" PARENT_SCOPE)
set(${flags} -mavx512f -mavx512bw -mavx512dq -mfma PARENT_SCOPE)
endif()
endif()
endfunction()
function(set_ie_neon_optimization_flags neon_flags)
file(GLOB NEON_SRC ${CMAKE_CURRENT_SOURCE_DIR}/arm_neon/*.cpp)
file(GLOB NEON_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/arm_neon/*.hpp)
list(APPEND LIBRARY_HEADERS ${NEON_HEADERS})
list(APPEND LIBRARY_SRC ${NEON_SRC})
set_source_files_properties(${NEON_SRC} PROPERTIES COMPILE_FLAGS "${neon_flags}")
add_definitions(-DHAVE_NEON=1)
endfunction()
if(ENABLE_SSE42)
file(GLOB SSE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.cpp)
file(GLOB SSE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/cpu_x86_sse42/*.hpp)
@ -48,7 +37,7 @@ if(ENABLE_SSE42)
list(APPEND LIBRARY_SRC ${SSE_SRC})
ie_sse42_optimization_flags(sse4_2_flags)
set_source_files_properties(${SSE_SRC} PROPERTIES COMPILE_FLAGS "${sse4_2_flags}")
set_source_files_properties(${SSE_SRC} PROPERTIES COMPILE_OPTIONS "${sse4_2_flags}")
add_definitions(-DHAVE_SSE=1)
endif()
@ -60,7 +49,7 @@ if(ENABLE_AVX2)
list(APPEND LIBRARY_SRC ${AVX2_SRC})
ie_avx2_optimization_flags(avx2_flags)
set_source_files_properties(${AVX2_SRC} PROPERTIES COMPILE_FLAGS "${avx2_flags}")
set_source_files_properties(${AVX2_SRC} PROPERTIES COMPILE_OPTIONS "${avx2_flags}")
add_definitions(-DHAVE_AVX2=1)
endif()
@ -80,7 +69,7 @@ if(ENABLE_AVX512F AND NOT GNU_5_DEBUG_CASE)
list(APPEND LIBRARY_SRC ${AVX512_SRC})
ie_avx512_core_optimization_flags(avx512_flags)
set_source_files_properties(${AVX512_SRC} PROPERTIES COMPILE_FLAGS "${avx512_flags}")
set_source_files_properties(${AVX512_SRC} PROPERTIES COMPILE_OPTIONS "${avx512_flags}")
add_definitions(-DHAVE_AVX512=1)
endif()
@ -94,7 +83,7 @@ if(ARM OR AARCH64)
list(APPEND LIBRARY_HEADERS ${NEON_HEADERS})
list(APPEND LIBRARY_SRC ${NEON_SRC})
set_source_files_properties(${NEON_SRC} PROPERTIES COMPILE_FLAGS "${neon_flags}")
set_source_files_properties(${NEON_SRC} PROPERTIES COMPILE_OPTIONS "${neon_flags}")
add_definitions(-DHAVE_NEON=1)
endif()
endif()

3
inference-engine/src/readers/ir_reader/CMakeLists.txt
View File

@ -26,8 +26,7 @@ ie_add_vs_version_file(NAME ${TARGET_NAME}
target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN
IR_READER_V10)
target_include_directories(${TARGET_NAME} PRIVATE "${IE_MAIN_SOURCE_DIR}/src/inference_engine" # for CNNNetworkNgraphImpl
"${CMAKE_CURRENT_SOURCE_DIR}")
target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
target_link_libraries(${TARGET_NAME} PRIVATE ${NGRAPH_LIBRARIES}
inference_engine_reader_api

1
inference-engine/src/readers/ir_reader_v7/CMakeLists.txt
View File

@ -28,7 +28,6 @@ ie_add_vs_version_file(NAME ${TARGET_NAME}
target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLUGIN)
target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/"
"${IE_MAIN_SOURCE_DIR}/src/inference_engine"
"${IE_MAIN_SOURCE_DIR}/src/readers/ir_reader")
target_link_libraries(${TARGET_NAME} PRIVATE inference_engine_reader_api inference_engine_plugin_api

6
inference-engine/src/vpu/graph_transformer/CMakeLists.txt
View File

@ -39,8 +39,7 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
target_include_directories(${TARGET_NAME}
SYSTEM PUBLIC
$<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
"${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include")
$<TARGET_PROPERTY:mvnc,INTERFACE_INCLUDE_DIRECTORIES>)
if(STATIC_IE)
target_link_libraries(${TARGET_NAME} PUBLIC vpu_common_lib_test_static)
@ -51,6 +50,7 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
target_link_libraries(${TARGET_NAME}
PUBLIC
${NGRAPH_LIBRARIES}
inference_engine_plugin_api
PRIVATE
openvino::itt
mvnc # TODO: remove once all options are migrated
@ -58,13 +58,11 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
if(WIN32)
target_compile_definitions(${TARGET_NAME} PRIVATE NOMINMAX)
set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
endif()
if(NOT STATIC_IE)
add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME} CUSTOM_FILTERS "+runtime/explicit")
openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME})
endif()

20
inference-engine/tests/functional/inference_engine/CMakeLists.txt
View File

@ -90,9 +90,11 @@ function(ie_headers_compilation_with_custom_flags)
cmake_parse_arguments(IE_TEST "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
if(IE_TEST_PLUGIN_API)
set(IE_TEST_INCLUDE_DIRECTORY "${IE_MAIN_SOURCE_DIR}/src/plugin_api")
set(IE_TEST_INCLUDE_DIRECTORY
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>)
else()
set(IE_TEST_INCLUDE_DIRECTORY "${IE_MAIN_SOURCE_DIR}/include")
set(IE_TEST_INCLUDE_DIRECTORY
$<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>)
endif()
file(GLOB_RECURSE header_files RELATIVE "${IE_TEST_INCLUDE_DIRECTORY}"
@ -177,7 +179,7 @@ function(ie_headers_compilation_with_custom_flags)
if(IE_TEST_FLAGS)
set_target_properties(${target_name} PROPERTIES
COMPILE_FLAGS ${IE_TEST_FLAGS})
COMPILE_OPTIONS "${IE_TEST_FLAGS}")
endif()
if(IE_TEST_DEFINITIONS)
@ -201,16 +203,16 @@ ie_headers_compilation_with_custom_flags(TEST_SUFFIX Cxx17
if(UNIX)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
ie_headers_compilation_with_custom_flags(TEST_SUFFIX WarningsAreErrors
FLAGS "-Werror-all -Werror -Wall")
FLAGS -Werror-all -Werror -Wall)
else()
ie_headers_compilation_with_custom_flags(TEST_SUFFIX Pedantic FLAGS "-Wpedantic")
ie_headers_compilation_with_custom_flags(TEST_SUFFIX Pedantic FLAGS -Wpedantic)
endif()
else()
ie_headers_compilation_with_custom_flags(TEST_SUFFIX WindowsAreErrors
HEADERS_TO_SKIP "gpu/gpu_ocl_wrapper.hpp"
"gpu/gpu_context_api_ocl.hpp"
"gpu/gpu_context_api_dx.hpp"
FLAGS "/we4996 /W4 /WX")
FLAGS /we4996 /W4 /WX)
endif()
# compilation with -Wweak-vtables
@ -228,15 +230,15 @@ ie_headers_compilation_with_custom_flags(TEST_SUFFIX PluginApiCxx17
if(UNIX)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
ie_headers_compilation_with_custom_flags(TEST_SUFFIX PluginApiWarningsAreErrors
FLAGS "-Werror-all -Werror -Wall"
FLAGS -Werror-all -Werror -Wall
PLUGIN_API)
else()
ie_headers_compilation_with_custom_flags(TEST_SUFFIX PluginApiPedantic FLAGS "-Wpedantic"
ie_headers_compilation_with_custom_flags(TEST_SUFFIX PluginApiPedantic FLAGS -Wpedantic
PLUGIN_API)
endif()
else()
ie_headers_compilation_with_custom_flags(TEST_SUFFIX PluginApiWindowsAreErrors
FLAGS "/we4996 /W4 /WX"
FLAGS /we4996 /W4 /WX
PLUGIN_API)
endif()

1
inference-engine/tests/functional/plugin/myriad/CMakeLists.txt
View File

@ -13,7 +13,6 @@ addIeTargetTest(
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
INCLUDES
${CMAKE_CURRENT_SOURCE_DIR}
${IE_MAIN_SOURCE_DIR}/src/vpu/graph_transformer/include
${IE_MAIN_SOURCE_DIR}/tests_deprecated/behavior/vpu/myriad_tests/helpers
${XLINK_INCLUDE}
${XLINK_PLATFORM_INCLUDE}

1
inference-engine/tests/unit/cpu/CMakeLists.txt
View File

@ -9,7 +9,6 @@ addIeTargetTest(
ROOT ${CMAKE_CURRENT_SOURCE_DIR}
INCLUDES
${IE_MAIN_SOURCE_DIR}/src/mkldnn_plugin
${IE_MAIN_SOURCE_DIR}/src/transformations/include
OBJECT_FILES
$<TARGET_OBJECTS:MKLDNNPlugin_obj>
LINK_LIBRARIES

2
inference-engine/tests/unit/vpu/CMakeLists.txt
View File

@ -14,8 +14,6 @@ addIeTargetTest(
"${IE_TESTS_ROOT}/ngraph_helpers/ngraph_functions/src"
INCLUDES
"${IE_MAIN_SOURCE_DIR}/src/vpu/myriad_plugin"
"${IE_MAIN_SOURCE_DIR}/thirdparty/movidius"
"${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include/watchdog"
"${XLINK_INCLUDE}"
"${XLINK_PLATFORM_INCLUDE}"
"${CMAKE_CURRENT_SOURCE_DIR}/base"

3
inference-engine/tests_deprecated/behavior/shared_tests/CMakeLists.txt
View File

@ -20,8 +20,7 @@ target_link_libraries(${TARGET_NAME} PUBLIC
target_link_libraries(${TARGET_NAME} PUBLIC gmock)
target_include_directories(${TARGET_NAME} PUBLIC
${IE_MAIN_SOURCE_DIR}/src/vpu/graph_transformer/include
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine,INTERFACE_INCLUDE_DIRECTORIES>
${CMAKE_CURRENT_SOURCE_DIR}/plugin_tests)
# developer package

5
inference-engine/tests_deprecated/behavior/vpu/CMakeLists.txt
View File

@ -55,11 +55,10 @@ function(enable_vpu TARGET_NAME FLAG_NAME PLUGIN_NAME)
target_compile_definitions(${TARGET_NAME} PRIVATE __PC__)
target_include_directories(${TARGET_NAME} PRIVATE
${IE_MAIN_SOURCE_DIR}/src/vpu/common/include
$<TARGET_PROPERTY:vpu_graph_transformer,INTERFACE_INCLUDE_DIRECTORIES>
${CMAKE_CURRENT_SOURCE_DIR}/myriad_tests
${IE_MAIN_SOURCE_DIR}/thirdparty/movidius
${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include
${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include/watchdog
${IE_MAIN_SOURCE_DIR}/src/inference_engine
${XLINK_INCLUDE}
${XLINK_PLATFORM_INCLUDE})
target_link_libraries(${TARGET_NAME} PRIVATE mvnc)

3
inference-engine/tests_deprecated/functional/vpu/CMakeLists.txt
View File

@ -59,8 +59,7 @@ addIeTargetTest(
ADDITIONAL_SOURCE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/graph_transformer
INCLUDES
${IE_MAIN_SOURCE_DIR}/include/vpu
${IE_MAIN_SOURCE_DIR}/src/vpu/graph_transformer/include
$<TARGET_PROPERTY:vpu_graph_transformer,INTERFACE_INCLUDE_DIRECTORIES>
${CMAKE_CURRENT_BINARY_DIR}
LINK_LIBRARIES
IESharedTests

2
inference-engine/tests_deprecated/functional/vpu/vpu_base/myriad_layers_reference_functions.hpp
View File

@ -10,7 +10,7 @@
#include <iomanip> // std::setw
#include <vpu/utils/ie_helpers.hpp>
#include <graph_transformer/include/vpu/model/data_desc.hpp>
#include <vpu/model/data_desc.hpp>
typedef std::map<std::string, std::string> ParamsStruct;

2
inference-engine/tests_deprecated/functional/vpu/vpu_base/vpu_layers_tests.cpp
View File

@ -12,7 +12,7 @@
#include "ie_memcpy.h"
#include "common_layers_params.hpp"
#include <common/include/vpu/utils/error.hpp>
#include <vpu/utils/error.hpp>
#include "blob_factory.hpp"
#include "debug.h"

18
inference-engine/tests_deprecated/helpers/CMakeLists.txt
View File

@ -19,17 +19,13 @@ message("configuring file: ${CMAKE_CURRENT_BINARY_DIR}/test_model_repo.h")
function(add_helpers target_name)
add_library(${target_name} STATIC ${HELPERS_SRC})
target_include_directories(${target_name} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
"${IE_MAIN_SOURCE_DIR}/src/inference_engine"
$<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
"${IE_MAIN_SOURCE_DIR}/src/vpu/"
"${IE_MAIN_SOURCE_DIR}/src/plugin_api"
"${IE_MAIN_SOURCE_DIR}/src/legacy_api/include"
PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
# TODO: eliminate dependency on samples
target_include_directories(${target_name} PUBLIC
"${IE_MAIN_SOURCE_DIR}/samples/common/utils/include/samples/os/windows")
target_include_directories(${target_name}
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
$<TARGET_PROPERTY:ie_samples_utils,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:pugixml,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_plugin_api,INTERFACE_INCLUDE_DIRECTORIES>
PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
set_property(TARGET ${target_name} PROPERTY COMPILE_PDB_NAME ${target_name})

2
inference-engine/tests_deprecated/helpers/test_model_path.cpp
View File

@ -13,7 +13,7 @@
# include <libgen.h>
# include <dirent.h>
#else
# include <w_dirent.h>
# include <samples/os/windows/w_dirent.h>
#endif
#include <utility>

4
inference-engine/tests_deprecated/unit/CMakeLists.txt
View File

@ -15,7 +15,6 @@ SET (CMAKE_SKIP_RPATH OFF)
file(GLOB
TEST_SRC
graph_tools/*.cpp
inference_engine_tests/*.cpp
)
@ -24,6 +23,7 @@ if (ENABLE_GNA)
GNA_TESTS
engines/gna/*cpp
engines/gna/layers/*cpp
engines/gna/graph_tools/*cpp
)
source_group("gna" FILES ${GNA_TESTS})
list(APPEND TEST_SRC ${GNA_TESTS})
@ -69,7 +69,6 @@ if (ENABLE_MYRIAD)
engines/vpu/myriad_tests/helpers
${IE_MAIN_SOURCE_DIR}/src/vpu/myriad_plugin
${IE_MAIN_SOURCE_DIR}/thirdparty/movidius
${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/include/watchdog
${XLINK_INCLUDE}
${XLINK_PLATFORM_INCLUDE})
@ -86,7 +85,6 @@ source_group("include" FILES ${TEST_INCLUDE})
add_executable(${TARGET_NAME} ${TEST_SRC} ${TEST_INCLUDE})
target_include_directories(${TARGET_NAME} PRIVATE
${IE_MAIN_SOURCE_DIR}/src/gna_plugin
${CMAKE_CURRENT_SOURCE_DIR})
set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})

0
inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp → inference-engine/tests_deprecated/unit/engines/gna/graph_tools/graph_copy_tests.cpp
View File

0
inference-engine/tests_deprecated/unit/graph_tools/graph_test_base.hpp → inference-engine/tests_deprecated/unit/engines/gna/graph_tools/graph_test_base.hpp
View File

2
inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp → inference-engine/tests_deprecated/unit/engines/gna/graph_tools/graph_tools_test.cpp
View File

@ -4,8 +4,8 @@
#include <gtest/gtest.h>
#include <legacy/graph_tools.hpp>
#include <gna_graph_tools.hpp>
#include "graph_test_base.hpp"
#include <gna_graph_tools.hpp>
#include <unordered_set>
#include <gmock/gmock.h>
#include "ie_common.h"

10
inference-engine/thirdparty/movidius/CMakeLists.txt vendored
View File

@ -13,12 +13,14 @@ if (ENABLE_MYRIAD)
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
endif()
set(XLINK_DIR "${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/XLink" CACHE PATH "path to Xlink")
add_subdirectory("${XLINK_DIR}" "${CMAKE_BINARY_DIR}/thirdparty/movidius/XLink")
set(XLINK_DIR "${CMAKE_CURRENT_SOURCE_DIR}/XLink" CACHE PATH "path to Xlink")
add_subdirectory(
"${XLINK_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}/XLink")
add_subdirectory(
"${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc"
"${CMAKE_BINARY_DIR}/thirdparty/movidius/mvnc")
"${CMAKE_CURRENT_SOURCE_DIR}/mvnc"
"${CMAKE_CURRENT_BINARY_DIR}/mvnc")
if(ENABLE_TESTS)
add_subdirectory(tests)

8
inference-engine/thirdparty/movidius/mvnc/CMakeLists.txt vendored
View File

@ -15,11 +15,11 @@ add_library(${TARGET_NAME} STATIC ${MVNC_SOURCES})
target_include_directories(${TARGET_NAME}
PUBLIC
"include"
${WATCHDOG_INCLUDE}
"${CMAKE_CURRENT_SOURCE_DIR}/include"
${WATCHDOG_INCLUDE}
PRIVATE
${XLINK_INCLUDE}
${XLINK_PLATFORM_INCLUDE})
${XLINK_INCLUDE}
${XLINK_PLATFORM_INCLUDE})
target_compile_definitions(${TARGET_NAME}
PRIVATE

2
inference-engine/thirdparty/movidius/mvnc/tests/CMakeLists.txt vendored
View File

@ -16,8 +16,6 @@ file(GLOB MVNC_TESTS_COMMON_SOURCES
"cases/mvnc_common_test_cases.cpp")
set(PRIVATE_INCLUDE
${IE_MAIN_SOURCE_DIR}/tests_new/gtest/googletest/include
${IE_MAIN_SOURCE_DIR}/tests_new/gtest/googletest/
${XLINK_INCLUDE}
${XLINK_PLATFORM_INCLUDE}
${WATCHDOG_INCLUDE})

2
inference-engine/thirdparty/movidius/tests/XLink/CMakeLists.txt vendored
View File

@ -14,8 +14,6 @@ target_include_directories(${TARGET_NAME}
PRIVATE
helpers
cases
${IE_MAIN_SOURCE_DIR}/tests_new/gtest/googletest/include
${IE_MAIN_SOURCE_DIR}/tests_new/gtest/googletest/
${XLINK_INCLUDE}
${XLINK_PLATFORM_INCLUDE})

3
inference-engine/tools/compile_tool/CMakeLists.txt
View File

@ -11,10 +11,8 @@ file(GLOB SRCS
add_executable(${TARGET_NAME} ${SRCS})
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE
${IE_MAIN_SOURCE_DIR}/include
${IE_MAIN_SOURCE_DIR}/src/vpu/graph_transformer/include
${IE_MAIN_SOURCE_DIR}/src/vpu/common/include
${IE_MAIN_SOURCE_DIR}/src/plugin_api
)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@ -25,6 +23,7 @@ endif()
target_link_libraries(${TARGET_NAME} PRIVATE
inference_engine
inference_engine_plugin_api
gflags
ie_samples_utils
)

9
inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
View File

@ -5,7 +5,6 @@
set(TARGET_NAME myriad_compile)
file(GLOB SRCS
${IE_MAIN_SOURCE_DIR}/tools/vpu/common/*.cpp
${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
)
@ -17,13 +16,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
)
endif()
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE
${IE_MAIN_SOURCE_DIR}/tools/vpu/common
${IE_MAIN_SOURCE_DIR}/samples/common
)
target_link_libraries(${TARGET_NAME} PRIVATE
inference_engine vpu_graph_transformer
inference_engine
vpu_graph_transformer
gflags
ie_samples_utils
)

0
inference-engine/tools/vpu/common/vpu_tools_common.cpp → inference-engine/tools/vpu/vpu_compile/vpu_tools_common.cpp
View File

0
inference-engine/tools/vpu/common/vpu_tools_common.hpp → inference-engine/tools/vpu/vpu_compile/vpu_tools_common.hpp
View File

8
inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
View File

@ -16,13 +16,13 @@ function(add_perfcheck_target TARGET_NAME PLUGIN_NAME)
target_include_directories(${TARGET_NAME}
SYSTEM PRIVATE
"${IE_MAIN_SOURCE_DIR}/src/vpu/graph_transformer/include"
"${IE_MAIN_SOURCE_DIR}/src/plugin_api"
"${IE_MAIN_SOURCE_DIR}/samples/common/format_reader")
$<TARGET_PROPERTY:vpu_graph_transformer,INTERFACE_INCLUDE_DIRECTORIES>)
target_link_libraries(${TARGET_NAME}
PRIVATE
inference_engine format_reader
inference_engine
inference_engine_plugin_api
format_reader
Threads::Threads
ie_samples_utils)

25
ngraph/CMakeLists.txt
View File

@ -19,13 +19,11 @@ project (ngraph)
option(NGRAPH_UNIT_TEST_ENABLE "Control the building of unit tests" ON)
option(NGRAPH_UNIT_TEST_BACKENDS_ENABLE "Control the building of unit tests using backends" ON)
option(NGRAPH_INTERPRETER_ENABLE "Control the building of the INTERPRETER backend" ON)
option(NGRAPH_DEBUG_ENABLE "Enable output for NGRAPH_DEBUG statements" OFF)
option(NGRAPH_ONNX_IMPORT_ENABLE "Enable ONNX importer" OFF)
option(NGRAPH_ONNX_EDITOR_ENABLE "Enable ONNX Editor" OFF)
option(NGRAPH_PDPD_FRONTEND_ENABLE "Enable PaddlePaddle FrontEnd" OFF)
option(NGRAPH_PYTHON_BUILD_ENABLE "Enable build nGraph python package wheel" OFF)
option(NGRAPH_DYNAMIC_COMPONENTS_ENABLE "Enable dynamic loading of components" ON)
option(NGRAPH_USE_PROTOBUF_LITE "Compiles and links with protobuf-lite" OFF)
if (NGRAPH_ONNX_IMPORT_ENABLE OR NGRAPH_PDPD_FRONTEND_ENABLE)
@ -36,8 +34,6 @@ if(NGRAPH_ONNX_EDITOR_ENABLE AND NOT NGRAPH_ONNX_IMPORT_ENABLE)
endif()
message(STATUS "NGRAPH_DEBUG_ENABLE: ${NGRAPH_DEBUG_ENABLE}")
message(STATUS "NGRAPH_DYNAMIC_COMPONENTS_ENABLE: ${NGRAPH_DYNAMIC_COMPONENTS_ENABLE}")
message(STATUS "NGRAPH_INTERPRETER_ENABLE: ${NGRAPH_INTERPRETER_ENABLE}")
message(STATUS "NGRAPH_ONNX_IMPORT_ENABLE: ${NGRAPH_ONNX_IMPORT_ENABLE}")
message(STATUS "NGRAPH_ONNX_EDITOR_ENABLE: ${NGRAPH_ONNX_EDITOR_ENABLE}")
message(STATUS "NGRAPH_PDPD_FRONTEND_ENABLE: ${NGRAPH_PDPD_FRONTEND_ENABLE}")
@ -95,19 +91,11 @@ else()
set(CMAKE_INSTALL_BINDIR "bin" CACHE STRING "User executables (bin)")
set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Object code libraries (lib)")
set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE STRING "C header files (include)")
set(CMAKE_INSTALL_DOCDIR "doc" CACHE STRING "Document files (doc)")
mark_as_advanced(CMAKE_INSTALL_BINDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR, CMAKE_INSTALL_DOCDIR)
endif()
if (DEFINED NGRAPH_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX ${NGRAPH_INSTALL_PREFIX})
endif()
message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}")
# Destinations
set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}")
set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}")
set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}")
set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}")
#-----------------------------------------------------------------------------------------------
@ -118,19 +106,6 @@ if (WIN32)
string(REPLACE "/W3" "/W0" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif()
if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
endif()
if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
endif()
if (NGRAPH_DYNAMIC_COMPONENTS_ENABLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNGRAPH_DYNAMIC_COMPONENTS_ENABLE")
endif()
add_definitions(-DPROJECT_ROOT_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
#-----------------------------------------------------------------------------------------------

10
ngraph/cmake/external_protobuf.cmake
View File

@ -113,15 +113,17 @@ else()
set(_proto_libs ${Protobuf_LIBRARIES})
if(TARGET libprotoc)
list(APPEND _proto_libs libprotoc)
set_target_properties(libprotoc PROPERTIES
COMPILE_FLAGS "-Wno-all -Wno-unused-variable")
target_compile_options(libprotoc PRIVATE -Wno-all -Wno-unused-variable)
endif()
set_target_properties(${_proto_libs} PROPERTIES
CXX_VISIBILITY_PRESET default
C_VISIBILITY_PRESET default
VISIBILITY_INLINES_HIDDEN OFF)
set_target_properties(libprotobuf libprotobuf-lite PROPERTIES
COMPILE_FLAGS "-Wno-all -Wno-unused-variable -Wno-inconsistent-missing-override")
foreach(target libprotobuf libprotobuf-lite)
target_compile_options(${target}
PRIVATE -Wno-all -Wno-unused-variable -Wno-inconsistent-missing-override
PUBLIC -Wno-undef)
endforeach()
endif()
if(NGRAPH_USE_PROTOBUF_LITE)

4
ngraph/core/reference/src/runtime/reference/jit_generator.hpp
View File

@ -4,6 +4,10 @@
#pragma once
#if defined _WIN32 && !defined NOMINMAX
#define NOMINMAX
#endif
#include <functional>
#include <xbyak/xbyak.h>

3
ngraph/core/src/file_util.cpp
View File

@ -3,6 +3,9 @@
//
#ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#else
#include <dirent.h>

3
ngraph/frontend/frontend_manager/src/plugin_loader.cpp
View File

@ -3,6 +3,9 @@
//
#ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <Windows.h>
#include <direct.h>
#else // _WIN32

2
ngraph/frontend/paddlepaddle/CMakeLists.txt
View File

@ -52,7 +52,7 @@ add_custom_target(${TARGET_NAME}_proto DEPENDS ${PROTO_SRCS} ${PROTO_HDRS})
set_source_files_properties(${PROTO_SRCS} ${PROTO_HDRS} PROPERTIES GENERATED TRUE)
# Disable all warnings for generated code
set_source_files_properties(${PROTO_SRCS} ${PROTO_HDRS} PROPERTIES COMPILE_FLAGS -w)
set_source_files_properties(${PROTO_SRCS} ${PROTO_HDRS} PROPERTIES COMPILE_OPTIONS -w)
# Create shared library
add_library(${TARGET_NAME} SHARED ${LIBRARY_SRC} ${LIBRARY_HEADERS} ${LIBRARY_PUBLIC_HEADERS} ${PROTO_SRCS} ${PROTO_HDRS})

7
ngraph/test/CMakeLists.txt
View File

@ -327,7 +327,7 @@ if (ENABLE_CLDNN AND NGRAPH_UNIT_TEST_BACKENDS_ENABLE)
endif()
endif()
if (NGRAPH_INTERPRETER_ENABLE AND NGRAPH_UNIT_TEST_BACKENDS_ENABLE)
if (NGRAPH_UNIT_TEST_BACKENDS_ENABLE)
list(APPEND SRC
builder.cpp
backend_api.cpp)
@ -631,10 +631,7 @@ if (NGRAPH_ONNX_EDITOR_ENABLE)
target_link_libraries(unit-test PRIVATE onnx_editor)
endif()
if (NGRAPH_INTERPRETER_ENABLE)
target_compile_definitions(unit-test PRIVATE NGRAPH_INTERPRETER_ENABLE)
target_link_libraries(unit-test PRIVATE interpreter_backend)
endif()
target_link_libraries(unit-test PRIVATE interpreter_backend)
install(TARGETS unit-test
RUNTIME DESTINATION tests

8
ngraph/test/backend/reduce_sum.in.cpp
View File

@ -350,8 +350,6 @@ NGRAPH_TEST(${BACKEND_NAME}, reduce_sum_2d_to_scalar_int8)
EXPECT_EQ(std::vector<int8_t>{45}, read_vector<int8_t>(result));
}
#if NGRAPH_INTERPRETER_ENABLE
#ifndef _WIN32
NGRAPH_TEST(${BACKEND_NAME}, reduce_sum_stable_acc)
{
@ -418,8 +416,6 @@ NGRAPH_TEST(${BACKEND_NAME}, reduce_sum_stable_simple_float)
test::all_close_f(ref_results.at(0), bk_results.at(0), DEFAULT_FLOAT_TOLERANCE_BITS - 1));
}
#endif
NGRAPH_TEST(${BACKEND_NAME}, reduce_sum_inf)
{
Shape shape{7, 4};
@ -782,8 +778,6 @@ NGRAPH_TEST(${BACKEND_NAME}, reduce_sum_keep_2d_to_scalar_int8)
EXPECT_EQ(std::vector<int8_t>{45}, read_vector<int8_t>(result));
}
#if NGRAPH_INTERPRETER_ENABLE
#ifndef _WIN32
NGRAPH_TEST(${BACKEND_NAME}, reduce_sum_keep_stable_acc)
{
@ -851,8 +845,6 @@ NGRAPH_TEST(${BACKEND_NAME}, reduce_sum_keep_stable_simple_float)
test::all_close_f(ref_results.at(0), bk_results.at(0), DEFAULT_FLOAT_TOLERANCE_BITS - 1));
}
#endif
NGRAPH_TEST(${BACKEND_NAME}, reduce_sum_keep_inf)
{
Shape shape{7, 4};

4
ngraph/test/backend/reshape.in.cpp
View File

@ -362,8 +362,6 @@ NGRAPH_TEST(${BACKEND_NAME}, builder_reshape_to_same_shape)
test_case.run();
}
#if NGRAPH_INTERPRETER_ENABLE
NGRAPH_TEST(${BACKEND_NAME}, reshape_shufflenet_5d)
{
Shape shape_a{1, 112, 56, 56};
@ -396,5 +394,3 @@ NGRAPH_TEST(${BACKEND_NAME}, reshape_shufflenet_5d)
EXPECT_TRUE(test::all_close_f(ref_results.at(0), bk_results.at(0), MIN_FLOAT_TOLERANCE_BITS));
}
#endif // NGRAPH_INTERPRETER_ENABLE

2
ngraph/test/eval.cpp
View File

@ -183,7 +183,6 @@ TEST(eval, evaluate_dynamic_range_sum)
ASSERT_EQ(cval, seq);
}
#ifdef NGRAPH_INTERPRETER_ENABLE
TEST(eval, interpret_dynamic_range_sum)
{
auto p_start = make_shared<op::Parameter>(element::f32, PartialShape{});
@ -212,7 +211,6 @@ TEST(eval, interpret_dynamic_range_sum)
vector<float> seq{8.0f, 11.0f, 14.0f};
ASSERT_EQ(result_val, seq);
}
#endif
TEST(eval, evaluate_broadcast_v3_bidirectional)
{

7
ngraph/test/runtime/backend.cpp
View File

@ -3,6 +3,9 @@
//
#ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#if defined(WINAPI_FAMILY) && !WINAPI_PARTITION_DESKTOP
#error "Only WINAPI_PARTITION_DESKTOP is supported, because of LoadLibrary[A|W]"
@ -28,7 +31,6 @@ std::string runtime::Backend::s_backend_shared_library_search_directory;
// This finds the full path of the containing shared library
static string find_my_pathname()
{
#ifdef NGRAPH_DYNAMIC_COMPONENTS_ENABLE
#ifdef _WIN32
HMODULE hModule = GetModuleHandleW(L"ngraph.dll");
WCHAR wpath[MAX_PATH];
@ -46,9 +48,6 @@ static string find_my_pathname()
#else
#error "Unsupported OS"
#endif
#else
return {};
#endif
}
runtime::Backend::~Backend() {}

13
ngraph/test/runtime/backend_manager.cpp
View File

@ -3,6 +3,9 @@
//
#ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#else
#include <dlfcn.h>
@ -18,7 +21,6 @@
using namespace std;
using namespace ngraph;
#ifdef NGRAPH_DYNAMIC_COMPONENTS_ENABLE
#ifdef _WIN32
#define CLOSE_LIBRARY(a) FreeLibrary(a)
#define DLSYM(a, b) GetProcAddress(a, b)
@ -32,9 +34,6 @@ string DLERROR()
return error == nullptr ? "" : error;
}
#endif
#else
#define DLERROR() ""
#endif
unordered_map<string, runtime::BackendConstructor>& runtime::BackendManager::get_registry()
{
@ -80,7 +79,6 @@ shared_ptr<runtime::Backend> runtime::BackendManager::create_backend(std::string
auto& registry = get_registry();
auto it = registry.find(type);
string error;
#ifdef NGRAPH_DYNAMIC_COMPONENTS_ENABLE
if (it == registry.end())
{
DL_HANDLE handle = open_shared_library(type);
@ -115,7 +113,6 @@ shared_ptr<runtime::Backend> runtime::BackendManager::create_backend(std::string
}
}
}
#endif
if (it == registry.end())
{
@ -133,7 +130,6 @@ shared_ptr<runtime::Backend> runtime::BackendManager::create_backend(std::string
DL_HANDLE runtime::BackendManager::open_shared_library(string type)
{
DL_HANDLE handle = nullptr;
#ifdef NGRAPH_DYNAMIC_COMPONENTS_ENABLE
string lib_prefix = SHARED_LIB_PREFIX;
string lib_suffix = SHARED_LIB_SUFFIX;
@ -168,14 +164,12 @@ DL_HANDLE runtime::BackendManager::open_shared_library(string type)
}
throw runtime_error(ss.str());
}
#endif
return handle;
}
map<string, string> runtime::BackendManager::get_registered_device_map()
{
map<string, string> rc;
#ifdef NGRAPH_DYNAMIC_COMPONENTS_ENABLE
string my_directory =
file_util::get_directory(Backend::get_backend_shared_library_search_directory());
vector<string> backend_list;
@ -192,7 +186,6 @@ map<string, string> runtime::BackendManager::get_registered_device_map()
}
};
file_util::iterate_files(my_directory, f, false, true);
#endif
return rc;
}

3
ngraph/test/runtime/backend_manager.hpp
View File

@ -12,6 +12,9 @@
#include <vector>
#ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#define DL_HANDLE HMODULE
#else

1
ngraph/test/runtime/ie/CMakeLists.txt
View File

@ -26,7 +26,6 @@ if(COMMAND ie_add_vs_version_file)
endif()
add_dependencies(ie_backend inference_engine)
target_include_directories(ie_backend PUBLIC ${IE_MAIN_SOURCE_DIR}/include)
target_link_libraries(ie_backend PUBLIC ngraph_backend inference_engine)
install(TARGETS ie_backend

46
ngraph/test/runtime/interpreter/CMakeLists.txt
View File

@ -2,29 +2,27 @@
# SPDX-License-Identifier: Apache-2.0
#
if (NGRAPH_INTERPRETER_ENABLE)
add_library(interpreter_backend SHARED int_backend.cpp int_executable.cpp evaluates_map.cpp)
add_library(interpreter_backend SHARED int_backend.cpp int_executable.cpp evaluates_map.cpp)
if(COMMAND ie_faster_build)
ie_faster_build(interpreter_backend
UNITY
)
endif()
if(COMMAND ie_add_vs_version_file)
ie_add_vs_version_file(NAME interpreter_backend
FILEDESCRIPTION "nGraph interpreter backend library")
endif()
if(COMMAND ie_add_vs_version_file)
ie_add_vs_version_file(NAME interpreter_backend
FILEDESCRIPTION "nGraph interpreter backend library")
endif()
target_compile_definitions(interpreter_backend PRIVATE INTERPRETER_BACKEND_EXPORTS)
target_link_libraries(interpreter_backend PUBLIC ngraph_backend)
install(TARGETS interpreter_backend
RUNTIME DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT tests EXCLUDE_FROM_ALL
LIBRARY DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT tests EXCLUDE_FROM_ALL)
if(COMMAND ie_faster_build)
ie_faster_build(interpreter_backend
UNITY
)
endif()
if(COMMAND ie_add_vs_version_file)
ie_add_vs_version_file(NAME interpreter_backend
FILEDESCRIPTION "nGraph interpreter backend library")
endif()
if(COMMAND ie_add_vs_version_file)
ie_add_vs_version_file(NAME interpreter_backend
FILEDESCRIPTION "nGraph interpreter backend library")
endif()
target_compile_definitions(interpreter_backend PRIVATE INTERPRETER_BACKEND_EXPORTS)
target_link_libraries(interpreter_backend PUBLIC ngraph_backend)
install(TARGETS interpreter_backend
RUNTIME DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT tests EXCLUDE_FROM_ALL
LIBRARY DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT tests EXCLUDE_FROM_ALL)

5
ngraph/test/util.cpp
View File

@ -91,6 +91,9 @@ TEST(DISABLED_util, dump)
}
#ifdef _WIN32
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include "windows.h"
#define usleep(a) Sleep(a / 1000)
#endif
@ -128,7 +131,6 @@ TEST(util, trim)
EXPECT_STREQ("test", trim(" \t test \t ").c_str());
}
#if defined(NGRAPH_INTERPRETER_ENABLE)
TEST(util, all_close)
{
auto backend = runtime::Backend::create("INTERPRETER");
@ -151,7 +153,6 @@ TEST(util, all_close)
EXPECT_FALSE(ngraph::test::all_close<float>(c, a, .05f, 0));
EXPECT_TRUE(ngraph::test::all_close<float>(c, a, .11f, 0));
}
#endif
class CloneTest : public ::testing::Test
{

65
scripts/CMakeLists.txt Normal file
View File

@ -0,0 +1,65 @@
# Copyright (C) 2018-2021 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#
#
# Shellcheck
#
ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
SKIP "${OpenVINO_MAIN_SOURCE_DIR}/bin"
"${OpenVINO_MAIN_SOURCE_DIR}/build"
"${OpenVINO_MAIN_SOURCE_DIR}/thirdparty"
"${IE_MAIN_SOURCE_DIR}/thirdparty"
"${TEMP}"
# TODO fix and enable back:
"${OpenVINO_MAIN_SOURCE_DIR}/inference-engine/scripts/dependencies.sh"
"${OpenVINO_MAIN_SOURCE_DIR}/scripts/install_dependencies/install_NEO_OCL_driver.sh"
"${OpenVINO_MAIN_SOURCE_DIR}/scripts/install_dependencies/install_openvino_dependencies.sh"
"${OpenVINO_MAIN_SOURCE_DIR}/ngraph/python/tests/test_onnx/model_zoo_preprocess.sh"
)
#
# cpack
#
# install setupvars
ie_cpack_add_component(setupvars REQUIRED)
if(UNIX)
install(PROGRAMS setupvars/setupvars.sh
DESTINATION bin
COMPONENT setupvars)
elseif(WIN32)
install(PROGRAMS setupvars/setupvars.bat
DESTINATION bin
COMPONENT setupvars)
endif()
# install install_dependencies
if(UNIX)
ie_cpack_add_component(install_dependencies REQUIRED)
install(DIRECTORY install_dependencies/
DESTINATION install_dependencies
COMPONENT install_dependencies)
endif()
# install files for demo
ie_cpack_add_component(demo_scripts DEPENDS core)
if(UNIX)
install(DIRECTORY demo/
DESTINATION deployment_tools/demo
COMPONENT demo_scripts
USE_SOURCE_PERMISSIONS
PATTERN *.bat EXCLUDE)
elseif(WIN32)
install(DIRECTORY demo/
DESTINATION deployment_tools/demo
COMPONENT demo_scripts
USE_SOURCE_PERMISSIONS
PATTERN *.sh EXCLUDE)
endif()

1
tests/stress_tests/CMakeLists.txt
View File

@ -29,6 +29,7 @@ if(EXISTS "${OpenVINO_MAIN_SOURCE_DIR}/thirdparty/gflags")
add_gflags()
endif()
add_subdirectory(common)
add_subdirectory(unittests)
add_subdirectory(memleaks_tests)
add_subdirectory(memcheck_tests)

20
tests/stress_tests/common/CMakeLists.txt Normal file
View File

@ -0,0 +1,20 @@
# Copyright (C) 2018-2021 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
#
set(TARGET_NAME StressTestsCommon)
file (GLOB_RECURSE SRC *.cpp)
file (GLOB_RECURSE HDR *.h)
add_library(${TARGET_NAME} STATIC ${SRC} ${HDR})
target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${TARGET_NAME}
PUBLIC
IE::gtest
IE::pugixml
${InferenceEngine_LIBRARIES}
PRIVATE
IE::gtest_main)

31
tests/stress_tests/memcheck_tests/CMakeLists.txt
View File

@ -4,32 +4,17 @@
set (TARGET_NAME "MemCheckTests")
file (GLOB SRC
../common/*.cpp
../common/ie_pipelines/*.cpp
*.cpp
tests_pipelines/*.cpp)
file (GLOB HDR
../common/*.h
../common/ie_pipelines/*.h
*.h
tests_pipelines/*.h)
file (GLOB_RECURSE SRC *.cpp)
file (GLOB_RECURSE HDR *.h)
# Create library file from sources.
add_executable(${TARGET_NAME} ${HDR} ${SRC})
target_link_libraries(${TARGET_NAME}
IE::gtest
IE::gtest_main
IE::pugixml
gflags
${InferenceEngine_LIBRARIES}
)
target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
"${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${TARGET_NAME} PRIVATE StressTestsCommon gflags)
# Copy local configs to BIN_FOLDER
configure_file(local_configs/test_config.xml ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/stress_tests_configs/memcheck_tests/test_config.xml COPYONLY)
configure_file(local_configs/references_config.xml ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/stress_tests_configs/memcheck_tests/references_config.xml COPYONLY)
configure_file(local_configs/test_config.xml
${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/stress_tests_configs/memcheck_tests/test_config.xml COPYONLY)
configure_file(local_configs/references_config.xml
${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/stress_tests_configs/memcheck_tests/references_config.xml COPYONLY)

29
tests/stress_tests/memleaks_tests/CMakeLists.txt
View File

@ -4,33 +4,14 @@
set (TARGET_NAME "StressMemLeaksTests")
file (GLOB SRC
../common/*.cpp
../common/ie_pipelines/*.cpp
*.cpp
tests_pipelines/*.cpp)
file (GLOB HDR
../common/*.h
../common/managers/*.h
../common/ie_pipelines/*.h
*.h
tests_pipelines/*.h)
file (GLOB_RECURSE SRC *.cpp)
file (GLOB_RECURSE HDR *.h)
# Create library file from sources.
add_executable(${TARGET_NAME} ${HDR} ${SRC})
target_link_libraries(${TARGET_NAME}
IE::gtest
IE::gtest_main
IE::pugixml
gflags
Threads::Threads
${InferenceEngine_LIBRARIES}
)
target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
"${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
target_link_libraries(${TARGET_NAME} PRIVATE StressTestsCommon gflags)
# Copy local configs to BIN_FOLDER
configure_file(local_configs/test_config.xml ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/stress_tests_configs/memleaks_tests/test_config.xml COPYONLY)
configure_file(local_configs/test_config.xml
${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/stress_tests_configs/memleaks_tests/test_config.xml COPYONLY)

29
tests/stress_tests/unittests/CMakeLists.txt
View File

@ -4,33 +4,14 @@
set (TARGET_NAME "StressUnitTests")
file (GLOB SRC
../common/*.cpp
../common/ie_pipelines/*.cpp
*.cpp
tests_pipelines/*.cpp)
file (GLOB HDR
../common/*.h
../common/managers/*.h
../common/ie_pipelines/*.h
*.h
tests_pipelines/*.h)
file (GLOB_RECURSE SRC *.cpp)
file (GLOB_RECURSE HDR *.h)
# Create library file from sources.
add_executable(${TARGET_NAME} ${HDR} ${SRC})
target_link_libraries(${TARGET_NAME}
IE::gtest
IE::gtest_main
IE::pugixml
gflags
Threads::Threads
${InferenceEngine_LIBRARIES}
)
target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
"${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
target_link_libraries(${TARGET_NAME} PRIVATE StressTestsCommon gflags)
# Copy local configs to BIN_FOLDER
configure_file(local_configs/test_config.xml ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/stress_tests_configs/unittests/test_config.xml COPYONLY)
configure_file(local_configs/test_config.xml
${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/stress_tests_configs/unittests/test_config.xml COPYONLY)

22
tests/time_tests/CMakeLists.txt
View File

@ -10,19 +10,19 @@ project(time_tests)
set(OpenVINO_MAIN_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
# Search OpenVINO Inference Engine via InferenceEngine_DIR
find_package(IEDevScripts REQUIRED
PATHS "${OpenVINO_MAIN_SOURCE_DIR}/cmake/developer_package"
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
# Search OpenVINO Inference Engine installed
find_package(InferenceEngine)
if (NOT InferenceEngine_FOUND)
# Search OpenVINO Inference Engine via InferenceEngine_DIR
find_package(IEDevScripts
PATHS "${OpenVINO_MAIN_SOURCE_DIR}/cmake/developer_package"
NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH)
if (NOT InferenceEngine_FOUND)
# Search OpenVINO Inference Engine via InferenceEngineDeveloperPackage_DIR
# in order to provide backward compatibility with old OpenVINO packages
find_package(InferenceEngineDeveloperPackage REQUIRED)
endif()
if(NOT InferenceEngine_FOUND)
# Search OpenVINO Inference Engine via InferenceEngineDeveloperPackage_DIR
# in order to provide backward compatibility with old OpenVINO packages
find_package(InferenceEngineDeveloperPackage REQUIRED)
endif()
add_subdirectory(src)

4
thirdparty/CMakeLists.txt vendored
View File

@ -75,12 +75,12 @@ function(add_gtest_libraries)
set(gtest_targets "gtest;gtest_main;gmock;gmock_main")
foreach(target_name ${gtest_targets})
if(TARGET "${target_name}")
get_target_property(_target_cxx_flags ${target_name} COMPILE_FLAGS)
get_target_property(_target_cxx_flags ${target_name} COMPILE_OPTIONS)
if(_target_cxx_flags)
if(CMAKE_CXX_FLAGS_DEBUG MATCHES ".+/Z7.+" OR CMAKE_CXX_FLAGS_RELWITHDEBINFO MATCHES ".+/Z7.+")
string(REPLACE "-Zi" " " _target_cxx_flags ${_target_cxx_flags})
message(STATUS "Removing -Zi flag from target " ${target_name})
set_target_properties(${target_name} PROPERTIES COMPILE_FLAGS "${_target_cxx_flags}")
set_target_properties(${target_name} PROPERTIES COMPILE_OPTIONS "${_target_cxx_flags}")
endif()
endif()
endif()