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

Revert "Fixed manylinux2014 with system TBB (#14076)" (#14113)

Browse Source 
This reverts commit cfb21de775.
This commit is contained in:
Alina Kladieva 2022-11-21 09:56:24 +01:00 committed by GitHub
parent cfb21de775
commit 0b97ab48a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install_build_dependencies.sh
View File

@ -120,8 +120,8 @@ elif [ -f /etc/redhat-release ]; then
git \ git \
git-lfs \ git-lfs \
boost-devel \ boost-devel \
python3-pip \ python-pip \
python3-devel \ python-devel \
libtool \ libtool \
tbb-devel \ tbb-devel \
pugixml-devel \ pugixml-devel \
@ -134,6 +134,7 @@ elif [ -f /etc/redhat-release ]; then
file \ file \
zlib-devel \ zlib-devel \
gflags-devel \ gflags-devel \
python3-pip \
libva-devel libva-devel
elif [ -f /etc/os-release ] && grep -q "raspbian" /etc/os-release; then elif [ -f /etc/os-release ] && grep -q "raspbian" /etc/os-release; then
# Raspbian # Raspbian

3
src/cmake/ie_parallel.cmake
View File

@ -45,6 +45,7 @@ macro(ov_find_package_tbb)
# don't set NO_CMAKE_PATH to allow -DTBB_DIR=XXX # don't set NO_CMAKE_PATH to allow -DTBB_DIR=XXX
# don't set NO_CMAKE_ENVIRONMENT_PATH to allow env TBB_DIR=XXX # don't set NO_CMAKE_ENVIRONMENT_PATH to allow env TBB_DIR=XXX
set(_find_package_no_args NO_PACKAGE_ROOT_PATH set(_find_package_no_args NO_PACKAGE_ROOT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_SYSTEM_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_PACKAGE_REGISTRY NO_CMAKE_PACKAGE_REGISTRY
NO_CMAKE_SYSTEM_PATH NO_CMAKE_SYSTEM_PATH
@ -111,7 +112,7 @@ macro(ov_find_package_tbb)
if(NOT TBB_FOUND) if(NOT TBB_FOUND)
# system TBB failed to be found # system TBB failed to be found
set(ENABLE_SYSTEM_TBB OFF CACHE BOOL "" FORCE) set(ENABLE_SYSTEM_TBB OFF)
# TBB on system is not found, download prebuilt one # TBB on system is not found, download prebuilt one
# if TBBROOT env variable is not defined # if TBBROOT env variable is not defined

1
src/cmake/install_tbb.cmake
View File

@ -99,6 +99,7 @@ if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND
if(ENABLE_SYSTEM_TBB) if(ENABLE_SYSTEM_TBB)
# TODO: what's about tbbbind for cases U22 with >= TBB 20221 # TODO: what's about tbbbind for cases U22 with >= TBB 20221
# it seems that oneTBB from U22 distro does not contains tbbbind library # it seems that oneTBB from U22 distro does not contains tbbbind library
# the same situation for conda-forge distribution of TBB / oneTBB
# for system libraries we still need to install TBB libraries # for system libraries we still need to install TBB libraries
# so, need to take locations of actual libraries and install them # so, need to take locations of actual libraries and install them