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

Added option to disable compile_tool (#13903)

Browse Source 
* Updated pugixml

* Added option to disable compile_tool
This commit is contained in:
Ilya Lavrenov 2022-11-08 15:04:57 +04:00 committed by GitHub
parent d2871fd52c
commit ce7455ddb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/developer_package/ncc_naming_style/requirements_dev.txt
View File

@ -2,4 +2,5 @@ clang==11.1.0; python_version == '3.7'
clang==12.0.1; python_version == '3.8' clang==12.0.1; python_version == '3.8'
clang==12.0.1; python_version == '3.9' clang==12.0.1; python_version == '3.9'
clang==14.0; python_version == '3.10' clang==14.0; python_version == '3.10'
clang==14.0; python_version == '3.11'
pyyaml pyyaml

2
cmake/features.cmake
View File

@ -10,6 +10,8 @@ ie_dependent_option (ENABLE_INTEL_CPU "CPU plugin for inference engine" ON "X86_
ie_option (ENABLE_TESTS "unit, behavior and functional tests" OFF) ie_option (ENABLE_TESTS "unit, behavior and functional tests" OFF)
ie_option (ENABLE_COMPILE_TOOL "Enables compile_tool" ON)
ie_option (ENABLE_STRICT_DEPENDENCIES "Skip configuring \"convinient\" dependencies for efficient parallel builds" ON) ie_option (ENABLE_STRICT_DEPENDENCIES "Skip configuring \"convinient\" dependencies for efficient parallel builds" ON)
ie_dependent_option (ENABLE_CLDNN "clDnn based plugin for inference engine" ON "X86_64;NOT APPLE;NOT MINGW;NOT WINDOWS_STORE;NOT WINDOWS_PHONE" OFF) ie_dependent_option (ENABLE_CLDNN "clDnn based plugin for inference engine" ON "X86_64;NOT APPLE;NOT MINGW;NOT WINDOWS_STORE;NOT WINDOWS_PHONE" OFF)

60
thirdparty/CMakeLists.txt vendored
View File

@ -171,39 +171,41 @@ endif()
# Gflags # Gflags
# #
if(NOT APPLE OR CPACK_GENERATOR MATCHES "^(BREW|CONDA-FORGE)$") if(ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL)
# - on Apple only dynamic libraries are available if(NOT APPLE OR CPACK_GENERATOR MATCHES "^(BREW|CONDA-FORGE)$")
# also, we can easily mix arm64 and x86_64 binaries when cross-compile for Intel CPU # - on Apple only dynamic libraries are available
# also, we can easily mix arm64 and x86_64 binaries when cross-compile for Intel CPU
if(CPACK_GENERATOR MATCHES "^(BREW|CONDA-FORGE)$" OR DEFINED ENV{HOMEBREW_PREFIX} OR LINUX_OS_NAME MATCHES "(Fedora|CentOS)") if(CPACK_GENERATOR MATCHES "^(BREW|CONDA-FORGE)$" OR DEFINED ENV{HOMEBREW_PREFIX} OR LINUX_OS_NAME MATCHES "(Fedora|CentOS)")
# conda-forge and brew contains only shared version of gflags # conda-forge and brew contains only shared version of gflags
find_package(gflags QUIET COMPONENTS nothreads_shared) find_package(gflags QUIET COMPONENTS nothreads_shared)
else() else()
find_package(gflags QUIET COMPONENTS nothreads_static) find_package(gflags QUIET COMPONENTS nothreads_static)
endif()
endif() endif()
endif()
if(gflags_FOUND) if(gflags_FOUND)
if(TARGET gflags) if(TARGET gflags)
set_target_properties(gflags PROPERTIES IMPORTED_GLOBAL ON) set_target_properties(gflags PROPERTIES IMPORTED_GLOBAL ON)
elseif(TARGET gflags_nothreads-shared) elseif(TARGET gflags_nothreads-shared)
# gflags shared case for CentOS/RHEL8 # gflags shared case for CentOS/RHEL8
set_target_properties(gflags_nothreads-shared PROPERTIES IMPORTED_GLOBAL ON) set_target_properties(gflags_nothreads-shared PROPERTIES IMPORTED_GLOBAL ON)
add_library(gflags ALIAS gflags_nothreads-shared) add_library(gflags ALIAS gflags_nothreads-shared)
elseif(TARGET gflags_nothreads-static) elseif(TARGET gflags_nothreads-static)
# debian_9_arm case # debian_9_arm case
set_target_properties(gflags_nothreads-static PROPERTIES IMPORTED_GLOBAL ON) set_target_properties(gflags_nothreads-static PROPERTIES IMPORTED_GLOBAL ON)
add_library(gflags ALIAS gflags_nothreads-static) add_library(gflags ALIAS gflags_nothreads-static)
elseif(TARGET ${GFLAGS_TARGET}) elseif(TARGET ${GFLAGS_TARGET})
set_target_properties(${GFLAGS_TARGET} PROPERTIES IMPORTED_GLOBAL ON) set_target_properties(${GFLAGS_TARGET} PROPERTIES IMPORTED_GLOBAL ON)
add_library(gflags ALIAS ${GFLAGS_TARGET}) add_library(gflags ALIAS ${GFLAGS_TARGET})
else()
message(FATAL_ERROR "Internal error: failed to find imported target 'gflags'")
endif()
message(STATUS "gflags (${gflags_VERSION}) is found at ${gflags_DIR}")
else() else()
message(FATAL_ERROR "Internal error: failed to find imported target 'gflags'") add_subdirectory(gflags EXCLUDE_FROM_ALL)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
endif() endif()
message(STATUS "gflags (${gflags_VERSION}) is found at ${gflags_DIR}")
else()
add_subdirectory(gflags EXCLUDE_FROM_ALL)
openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
endif() endif()
# #
@ -295,7 +297,7 @@ ov_install_static_lib(nlohmann_json_schema_validator ${OV_CPACK_COMP_CORE})
if(CPACK_GENERATOR MATCHES "^(DEB|RPM|CONDA-FORGE|BREW)$") if(CPACK_GENERATOR MATCHES "^(DEB|RPM|CONDA-FORGE|BREW)$")
# These libraries are dependencies for openvino-samples package # These libraries are dependencies for openvino-samples package
if(NOT gflags_FOUND) if((ENABLE_SAMPLES OR ENABLE_COMPILE_TOOL) AND NOT gflags_FOUND)
message(FATAL_ERROR "gflags must be used as a ${CPACK_GENERATOR} package. Install libgflags-dev / gflags-devel") message(FATAL_ERROR "gflags must be used as a ${CPACK_GENERATOR} package. Install libgflags-dev / gflags-devel")
endif() endif()
if(NOT zlib_FOUND) if(NOT zlib_FOUND)

2
thirdparty/pugixml vendored

@ -1 +1 @@
Subproject commit 08b3433180727ea2f78fe02e860a08471db1e03c Subproject commit a0e064336317c9347a91224112af9933598714e9

4
tools/CMakeLists.txt
View File

@ -5,7 +5,9 @@
# C++ tools # C++ tools
# #
add_subdirectory(compile_tool) if(ENABLE_COMPILE_TOOL)
add_subdirectory(compile_tool)
endif()
if(ENABLE_SAMPLES) if(ENABLE_SAMPLES)
add_subdirectory(legacy/benchmark_app) add_subdirectory(legacy/benchmark_app)