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

Several fixes for compilation fixes (#13674)

Browse Source 
* Added i386 support

* Cross-compiled wheel package

* Fixes

* Try to use cross-env

* Fixed path to crossenv

* Strict dependency

* Removed numpy dependency

* explicitly activate crossenv

* Don't install ONNX for tests conversions during cross-compilation

* Updates

* Extra improvements

* Fixed compilation with strict flags

* Fixes

* Revert changesin .ci/azure/linux_arm64.yml
This commit is contained in:
Ilya Lavrenov 2022-10-27 17:30:24 +04:00 committed by GitHub
parent 84710e4440
commit fbd6d14c3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/features.cmake
View File

@ -174,7 +174,7 @@ ie_dependent_option(ENABLE_SYSTEM_PROTOBUF "Use system protobuf" OFF
ie_dependent_option(ENABLE_OV_CORE_UNIT_TESTS "Enables OpenVINO core unit tests" ON "ENABLE_TESTS" OFF)
ie_option(ENABLE_OPENVINO_DEBUG "Enable output for OPENVINO_DEBUG statements" OFF)
ie_dependent_option(ENABLE_REQUIREMENTS_INSTALL "Dynamic dependencies install" ON "ENABLE_TESTS" OFF)
ie_dependent_option(ENABLE_REQUIREMENTS_INSTALL "Dynamic dependencies install" ON "ENABLE_TESTS;NOT CMAKE_CROSSCOMPILING" OFF)
if(NOT BUILD_SHARED_LIBS AND ENABLE_OV_TF_FRONTEND)
set(FORCE_FRONTENDS_USE_PROTOBUF ON)

3
cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in
View File

@ -14,8 +14,9 @@ set_and_check(OpenVINO_MAIN_SOURCE_DIR "@OpenVINO_SOURCE_DIR@") # KMB
set(ie_options "@IE_OPTIONS@")
list(APPEND ie_options CMAKE_CXX_COMPILER_LAUNCHER CMAKE_C_COMPILER_LAUNCHER
CMAKE_CXX_LINKER_LAUNCHER CMAKE_C_LINKER_LAUNCHER
CMAKE_BUILD_TYPE CMAKE_SKIP_RPATH CMAKE_INSTALL_PREFIX
CMAKE_OSX_ARCHITECTURES)
CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET)
file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}" cache_path)
message(STATUS "The following CMake options are exported from Inference Engine Developer package")

3
cmake/templates/OpenVINODeveloperPackageConfig.cmake.in
View File

@ -12,8 +12,9 @@ set_and_check(OpenVINO_SOURCE_DIR "@OpenVINO_SOURCE_DIR@")
set(ov_options "@IE_OPTIONS@")
list(APPEND ov_options CMAKE_CXX_COMPILER_LAUNCHER CMAKE_C_COMPILER_LAUNCHER
CMAKE_CXX_LINKER_LAUNCHER CMAKE_C_LINKER_LAUNCHER
CMAKE_BUILD_TYPE CMAKE_SKIP_RPATH CMAKE_INSTALL_PREFIX
CMAKE_OSX_ARCHITECTURES)
CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET)
file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}" cache_path)
message(STATUS "The following CMake options are exported from OpenVINO Developer package")

4
src/bindings/python/wheel/CMakeLists.txt
View File

@ -61,7 +61,7 @@ if(APPLE AND DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
if(_arch AND _macos_min_version)
set(PLATFORM_TAG "macosx_${_macos_min_version}_${_arch}")
endif()
elseif(LINUX)
elseif(LINUX AND OFF)
_ov_platform_arch()
execute_process(COMMAND ldd --version
@ -74,7 +74,7 @@ elseif(LINUX)
endif()
# common pattern manylinux_<libc major>_<libc minor>_<arch>
if(_libc_version AND _arch)
if(_libc_major AND _libc_minor AND _arch)
set(PLATFORM_TAG "manylinux_${_libc_major}_${_libc_minor}_${_arch}")
endif()
endif()

2
src/bindings/python/wheel/setup.py
View File

@ -32,7 +32,7 @@ CONFIG = "Release" if platform.system() in {"Windows", "Darwin"} else ""
machine = platform.machine()
if machine == "x86_64" or machine == "AMD64":
ARCH = "intel64"
elif machine == "X86":
elif machine == "X86" or machine == "i686":
ARCH = "ia32"
elif machine == "arm" or machine == "armv7l":
ARCH = "arm"

2
thirdparty/protobuf/CMakeLists.txt vendored
View File

@ -103,6 +103,8 @@ if(NOT protobuf_BUILD_PROTOC_BINARIES)
NO_DEFAULT_PATH)
else()
set(HOST_CMAKE_COMMAND "${CMAKE_COMMAND}")
# if env has CMAKE_TOOLCHAIN_FILE, we need to skip it
list(APPEND cmake_env --unset=CMAKE_TOOLCHAIN_FILE)
endif()
# compile flags