summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--020-openvino-cldnn-disable-werror.patch2
-rw-r--r--030-openvino-do-not-install-tbb.patch33
-rw-r--r--PKGBUILD26
-rw-r--r--openvino.conf1
-rw-r--r--setupvars.sh3
6 files changed, 24 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 960f8897fcd..be51fdf0614 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = openvino-git
pkgdesc = A toolkit for developing artificial inteligence and deep learning applications (git version)
- pkgver = 2020.2.r2088.g4f0720176
+ pkgver = 2020.2.r2962.g1ffeb24a41
pkgrel = 1
url = https://docs.openvinotoolkit.org/
arch = x86_64
@@ -8,6 +8,7 @@ pkgbase = openvino-git
makedepends = git
makedepends = git-lfs
makedepends = cmake
+ makedepends = intel-compute-runtime
makedepends = libusb
makedepends = ocl-icd
makedepends = opencv
@@ -17,7 +18,6 @@ pkgbase = openvino-git
makedepends = aria2
makedepends = wget
depends = protobuf
- depends = tbb
optdepends = intel-compute-runtime: for GPU (clDNN) plugin
optdepends = ocl-icd: for GPU (clDNN) plugin
optdepends = libusb: for Myriad plugin
@@ -38,23 +38,23 @@ pkgbase = openvino-git
source = git+https://github.com/openvinotoolkit/oneDNN.git
source = googletest-openvinotoolkit::git+https://github.com/openvinotoolkit/googletest.git
source = git+https://github.com/gflags/gflags.git
+ source = git+https://github.com/herumi/xbyak.git
source = openvino.conf
source = openvino.sh
source = setupvars.sh
source = 010-ade-disable-werror.patch
source = 020-openvino-cldnn-disable-werror.patch
- source = 030-openvino-do-not-install-tbb.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = f485aa97d88d424dd3a223e0eddbbc382ec6c8d5094d51cbd3f0524b915e3d68
+ sha256sums = SKIP
+ sha256sums = 66cbaab93a6097207ff0908db155d590ad30b5fe12b429473e0bdfa99d1fd37f
sha256sums = 49a1cdd2357ac3c657b28d72aea1294e4af46389e41ed0d55ccbd12bd995058d
- sha256sums = 093199ae759e8755166b9737562438866123eda9b1afbbef2f7107b3cf827be5
+ sha256sums = cfcc5af35d7a50f83c780716f69f8a800b14bcf143f7abafd31a7a0dcb8c9ae8
sha256sums = 502fcbb3fcbb66aa5149ad2cc5f1fa297b51ed12c5c9396a16b5795a03860ed0
- sha256sums = 013c96d0842d8778b0719ee29b9d9d7d8b61dc9b3b8b4e03d2293a8948e15377
- sha256sums = 53e7405d1118edb1717a15ba6ac0521bbd4c75e494a1aa32b4cfccf43498efec
+ sha256sums = abf90c7b324ba7c8931da620fa136ff1ff5e834532ddf076fa5c95735d10abef
pkgname = openvino-git
diff --git a/020-openvino-cldnn-disable-werror.patch b/020-openvino-cldnn-disable-werror.patch
index 73ea94d4dcd..de67602d50e 100644
--- a/020-openvino-cldnn-disable-werror.patch
+++ b/020-openvino-cldnn-disable-werror.patch
@@ -1,6 +1,6 @@
--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
-@@ -702,7 +702,7 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
+@@ -510,7 +510,7 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
MultiProcessorCompilation
DeadCodeEliminate
ExtensionsEnabled
diff --git a/030-openvino-do-not-install-tbb.patch b/030-openvino-do-not-install-tbb.patch
deleted file mode 100644
index b7b8204e8d0..00000000000
--- a/030-openvino-do-not-install-tbb.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/inference-engine/src/inference_engine/CMakeLists.txt
-+++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -223,30 +223,6 @@ ie_developer_export_targets(${TARGET_NAME} ${TARGET_NAME}_plugin_api)
-
- list(APPEND core_components ngraph)
-
--if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP})
-- ie_cpack_add_component(tbb REQUIRED)
-- list(APPEND core_components tbb)
--
-- install(DIRECTORY "${TBB}/include"
-- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-- COMPONENT tbb)
-- install(DIRECTORY "${TBB}/lib"
-- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-- COMPONENT tbb)
-- if(EXISTS "${TBB}/bin")
-- install(DIRECTORY "${TBB}/bin"
-- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-- COMPONENT tbb)
-- endif()
-- install(FILES "${TBB}/LICENSE"
-- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
-- COMPONENT tbb)
-- install(FILES "${TBB}/cmake/TBBConfig.cmake"
-- "${TBB}/cmake/TBBConfigVersion.cmake"
-- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb/cmake
-- COMPONENT tbb)
--endif()
--
- # Install Inference Engine
-
- ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
diff --git a/PKGBUILD b/PKGBUILD
index ec92da84519..457ea047578 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=openvino-git
-pkgver=2020.2.r2088.g4f0720176
+pkgver=2020.2.r2962.g1ffeb24a41
pkgrel=1
pkgdesc='A toolkit for developing artificial inteligence and deep learning applications (git version)'
arch=('x86_64')
url='https://docs.openvinotoolkit.org/'
license=('Apache')
-depends=('protobuf' 'tbb')
+depends=('protobuf')
# GPU (clDNN) plugin: only Intel GPUs are supported:
# https://github.com/openvinotoolkit/openvino/issues/452#issuecomment-722941119
optdepends=('intel-compute-runtime: for GPU (clDNN) plugin'
@@ -19,8 +19,8 @@ optdepends=('intel-compute-runtime: for GPU (clDNN) plugin'
'python-py-cpuinfo: for benchmark tool'
'python-progress: for benchmark tool'
'opencv: for benchmark and cross_check tools')
-makedepends=('git' 'git-lfs' 'cmake' 'libusb' 'ocl-icd' 'opencv' 'python'
- 'cython' 'shellcheck' 'aria2' 'wget')
+makedepends=('git' 'git-lfs' 'cmake' 'intel-compute-runtime' 'libusb' 'ocl-icd' 'opencv'
+ 'python' 'cython' 'shellcheck' 'aria2' 'wget')
provides=('openvino' 'intel-openvino-git')
conflicts=('openvino' 'intel-openvino-git')
replaces=('intel-openvino-git')
@@ -30,23 +30,23 @@ source=('git+https://github.com/openvinotoolkit/openvino.git'
'git+https://github.com/openvinotoolkit/oneDNN.git'
'googletest-openvinotoolkit'::'git+https://github.com/openvinotoolkit/googletest.git'
'git+https://github.com/gflags/gflags.git'
+ 'git+https://github.com/herumi/xbyak.git'
'openvino.conf'
'openvino.sh'
'setupvars.sh'
'010-ade-disable-werror.patch'
- '020-openvino-cldnn-disable-werror.patch'
- '030-openvino-do-not-install-tbb.patch')
+ '020-openvino-cldnn-disable-werror.patch')
sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'f485aa97d88d424dd3a223e0eddbbc382ec6c8d5094d51cbd3f0524b915e3d68'
+ 'SKIP'
+ '66cbaab93a6097207ff0908db155d590ad30b5fe12b429473e0bdfa99d1fd37f'
'49a1cdd2357ac3c657b28d72aea1294e4af46389e41ed0d55ccbd12bd995058d'
- '093199ae759e8755166b9737562438866123eda9b1afbbef2f7107b3cf827be5'
+ 'cfcc5af35d7a50f83c780716f69f8a800b14bcf143f7abafd31a7a0dcb8c9ae8'
'502fcbb3fcbb66aa5149ad2cc5f1fa297b51ed12c5c9396a16b5795a03860ed0'
- '013c96d0842d8778b0719ee29b9d9d7d8b61dc9b3b8b4e03d2293a8948e15377'
- '53e7405d1118edb1717a15ba6ac0521bbd4c75e494a1aa32b4cfccf43498efec')
+ 'abf90c7b324ba7c8931da620fa136ff1ff5e834532ddf076fa5c95735d10abef')
export GIT_LFS_SKIP_SMUDGE='1'
@@ -59,11 +59,11 @@ prepare() {
git -C openvino config --local submodule.inference-engine/thirdparty/mkl-dnn.url "${srcdir}/oneDNN"
git -C openvino config --local submodule.inference-engine/tests/ie_test_utils/common_test_utils/gtest.url "${srcdir}/googletest-openvinotoolkit"
git -C openvino config --local submodule.inference-engine/samples/thirdparty/gflags.url "${srcdir}/gflags"
+ git -C openvino config --local submodule.thirdparty/xbyak.url "${srcdir}/xbyak"
git -C openvino submodule update
patch -d openvino/inference-engine/thirdparty/ade -Np1 -i "${srcdir}/010-ade-disable-werror.patch"
patch -d openvino -Np1 -i "${srcdir}/020-openvino-cldnn-disable-werror.patch"
- patch -d openvino -Np1 -i "${srcdir}/030-openvino-do-not-install-tbb.patch"
}
pkgver() {
@@ -94,8 +94,6 @@ build() {
-DNGRAPH_TEST_UTIL_ENABLE:BOOL='OFF' \
-DNGRAPH_UNIT_TEST_ENABLE:BOOL='FALSE' \
-DNGRAPH_USE_SYSTEM_PROTOBUF:BOOL='ON' \
- -DTBBROOT:PATH='/usr' \
- -DTBB_DIR:PATH='/usr/lib/cmake/TBB' \
-DTREAT_WARNING_AS_ERROR:BOOL='OFF' \
-Wno-dev
make -C build
@@ -113,7 +111,7 @@ package() {
local _gnasover_full
local _gnadir="${pkgdir}/opt/intel/openvino/deployment_tools/inference_engine/external/gna"
_gnaver="$(find openvino/inference-engine/temp -type d -name 'gna_*' | sed 's/^.*gna_//')"
- _gnasover="$(find "${_gnadir}/lib" -type f -regextype 'posix-basic' -regex '.*/libgna\.so\.[0-9]*$' | sed 's/.*\.//')"
+ _gnasover="$(find "${_gnadir}/lib" -type f -regextype 'posix-basic' -regex '.*/libgna\.so\.[0-9]*$' | sed 's/.*\.so\.//')"
_gnasover_full="$(find "${_gnadir}/lib" -type f -regextype 'posix-basic' -regex '.*/libgna\.so\.[0-9]*\..*' | sed 's/.*\.so\.//')"
cp -dr --no-preserve='ownership' "openvino/inference-engine/temp/gna_${_gnaver}/include" "$_gnadir"
rm "${_gnadir}/lib"/libgna.so{,".${_gnasover}"}
diff --git a/openvino.conf b/openvino.conf
index a7ebeb4fa74..14288999b87 100644
--- a/openvino.conf
+++ b/openvino.conf
@@ -1,3 +1,4 @@
/opt/intel/openvino/deployment_tools/inference_engine/lib/intel64
/opt/intel/openvino/deployment_tools/inference_engine/external/gna/lib
+/opt/intel/openvino/deployment_tools/inference_engine/external/tbb/lib
/opt/intel/openvino/lib
diff --git a/setupvars.sh b/setupvars.sh
index 77ed913c001..9cf023a5bdb 100644
--- a/setupvars.sh
+++ b/setupvars.sh
@@ -11,12 +11,15 @@ fi
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/lib/intel64"
export LD_LIBRARY_PATH+=":${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/gna/lib"
+export LD_LIBRARY_PATH+=":${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/tbb/lib"
export LD_LIBRARY_PATH+=":${INTEL_OPENVINO_DIR}/lib"
export LIBRARY_PATH="${LIBRARY_PATH:+${LIBRARY_PATH}:}${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/lib/intel64"
export LIBRARY_PATH+=":${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/gna/lib"
+export LIBRARY_PATH+=":${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/tbb/lib"
export LIBRARY_PATH+=":${INTEL_OPENVINO_DIR}/lib"
export CPATH="${CPATH:+${CPATH}:}${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/include"
export CPATH+=":${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/gna/include"
+export CPATH+=":${INTEL_OPENVINO_DIR}/deployment_tools/inference_engine/external/tbb/include"
export CPATH+=":${INTEL_OPENVINO_DIR}/include"