Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 54c3bae

Browse files
banderlogbanderlog
committed
dldt bugfix
1 parent f16a1c5 commit 54c3bae

5 files changed

Lines changed: 232 additions & 8 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ build/opencv/*
1818
!build/dldt
1919
build/dldt/*
2020
!build/dldt/dldt_setup.sh
21+
!build/dldt/*.patch
2122

2223
!build/ffmpeg
2324
build/ffmpeg/*

‎TODO.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
# TODO list
22

33

4-
+ OpenBLAS 0.3.12 version
5-
+ opencv 4.5.1
6-
+ dldt 2021.2
74
+ add [OpenCV's Apache 2 license](https://github.com/opencv/opencv/blob/master/LICENSE) into python package
85
+ remove `LICENSE-INTEL`, `LICENSE-3RD-PARTY`
96
+ add Ubuntu version check in tests
107
+ do we still need `sudo ln -s /usr/bin/python3 /usr/bin/python`?
118
+ Auto value for `-D INF_ENGINE_RELEASE`: https://github.com/openvinotoolkit/openvino/issues/1435
129
+ check JIT speed
13-
+ Make `git clone` for submodules faster
14-
+ https://stackoverflow.com/questions/64313825/what-the-difference-between-the-opencv-cv-version-status-values
10+
+ https://answers.opencv.org/question/236271/what-the-difference-between-cv_version_status-values/
1511
+ add examples
1612
+ versioning change

‎build/dldt/dependencies.patch‎

Lines changed: 227 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
7,10c7
2+
< include(models)
3+
<
4+
< #we have number of dependencies stored on ftp
5+
< include(dependency_solver)
6+
---
7+
> # we have number of dependencies stored on ftp
8+
35d31
9+
< include(linux_name)
10+
43c39
11+
< include(vpu_dependencies)
12+
---
13+
> include(cmake/vpu_dependencies.cmake)
14+
63c59,60
15+
< ENVIRONMENT "OpenBLAS_DIR")
16+
---
17+
> ENVIRONMENT "OpenBLAS_DIR"
18+
> SHA256 "c75aac901d5297d6d60a4b1f941f0335d8fd7f52e0dff8c445f644e2e45e6fba")
19+
109c106,107
20+
< VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
21+
---
22+
> VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*"
23+
> SHA256 "62c68646747fb10f19b53217cb04a1e10ff93606f992e6b35eb8c31187c68fbf")
24+
115c113,114
25+
< VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
26+
---
27+
> VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*"
28+
> SHA256 "7832b16d82513ee880d97c27c7626f9525ebd678decf6a8fe6c38550f73227d9")
29+
121c120,121
30+
< VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
31+
---
32+
> VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*"
33+
> SHA256 "591ea4a7e08bbe0062648916f42bded71d24c27f00af30a8f31a29b5878ea0cc")
34+
127a128,134
35+
>
36+
> ie_cpack_add_component(omp)
37+
> file(GLOB_RECURSE source_list "${OMP}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
38+
> install(FILES ${source_list}
39+
> DESTINATION "deployment_tools/inference_engine/external/omp/lib"
40+
> COMPONENT omp)
41+
>
42+
132c139
43+
< reset_deps_cache(TBBROOT)
44+
---
45+
> reset_deps_cache(TBBROOT TBB_DIR)
46+
134,162c141,170
47+
< if(NOT DEFINED TBB_DIR AND NOT DEFINED ENV{TBB_DIR})
48+
< if (WIN32 AND X86_64)
49+
< #TODO: add target_path to be platform specific as well, to avoid following if
50+
< RESOLVE_DEPENDENCY(TBB
51+
< ARCHIVE_WIN "tbb2020_20200415_win.zip"
52+
< TARGET_PATH "${TEMP}/tbb"
53+
< ENVIRONMENT "TBBROOT")
54+
< elseif(ANDROID) # Should be before LINUX due LINUX is detected as well
55+
< RESOLVE_DEPENDENCY(TBB
56+
< ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
57+
< TARGET_PATH "${TEMP}/tbb"
58+
< ENVIRONMENT "TBBROOT")
59+
< elseif(LINUX AND X86_64)
60+
< RESOLVE_DEPENDENCY(TBB
61+
< ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
62+
< TARGET_PATH "${TEMP}/tbb")
63+
< elseif(LINUX AND AARCH64)
64+
< RESOLVE_DEPENDENCY(TBB
65+
< ARCHIVE_LIN "keembay/tbb2020_38404_kmb.tgz"
66+
< TARGET_PATH "${TEMP}/tbb_yocto"
67+
< ENVIRONMENT "TBBROOT")
68+
< elseif(APPLE AND X86_64)
69+
< RESOLVE_DEPENDENCY(TBB
70+
< ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
71+
< TARGET_PATH "${TEMP}/tbb"
72+
< ENVIRONMENT "TBBROOT")
73+
< else()
74+
< message(FATAL_ERROR "TBB is not available on current platform")
75+
< endif()
76+
---
77+
> if (WIN32 AND X86_64)
78+
> #TODO: add target_path to be platform specific as well, to avoid following if
79+
> RESOLVE_DEPENDENCY(TBB
80+
> ARCHIVE_WIN "tbb2020_20200415_win.zip"
81+
> TARGET_PATH "${TEMP}/tbb"
82+
> ENVIRONMENT "TBBROOT"
83+
> SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
84+
> elseif(ANDROID) # Should be before LINUX due LINUX is detected as well
85+
> RESOLVE_DEPENDENCY(TBB
86+
> ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
87+
> TARGET_PATH "${TEMP}/tbb"
88+
> ENVIRONMENT "TBBROOT"
89+
> SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
90+
> elseif(LINUX AND X86_64)
91+
> RESOLVE_DEPENDENCY(TBB
92+
> ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
93+
> TARGET_PATH "${TEMP}/tbb"
94+
> SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
95+
> elseif(LINUX AND AARCH64)
96+
> RESOLVE_DEPENDENCY(TBB
97+
> ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
98+
> TARGET_PATH "${TEMP}/tbb_yocto"
99+
> ENVIRONMENT "TBBROOT"
100+
> SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
101+
> elseif(APPLE AND X86_64)
102+
> RESOLVE_DEPENDENCY(TBB
103+
> ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
104+
> TARGET_PATH "${TEMP}/tbb"
105+
> ENVIRONMENT "TBBROOT"
106+
> SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
107+
164,168c172
108+
< if(DEFINED TBB_DIR)
109+
< get_filename_component(TBB ${TBB_DIR} DIRECTORY)
110+
< else()
111+
< get_filename_component(TBB $ENV{TBB_DIR} DIRECTORY)
112+
< endif()
113+
---
114+
> message(FATAL_ERROR "TBB is not available on current platform")
115+
171a176
116+
> update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder")
117+
184,185c189,190
118+
< set(OPENCV_VERSION "4.5.0")
119+
< set(OPENCV_BUILD "36")
120+
---
121+
> set(OPENCV_VERSION "4.5.1")
122+
> set(OPENCV_BUILD "044")
123+
205c210,211
124+
< VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*")
125+
---
126+
> VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*"
127+
> SHA256 "b5239e0e50b9009f95a29cb11f0840ec085fa07f6c4d3349adf090f1e51b0787")
128+
215c221,222
129+
< VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*")
130+
---
131+
> VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*"
132+
> SHA256 "5250bfe5860c15eb1b31963c78804ee9b301a19d8d6e920c06ef41de681cb99e")
133+
221c228,229
134+
< VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*")
135+
---
136+
> VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*"
137+
> SHA256 "f3ebc5cc72c86106c30cc711ac689e02281556bb43c09a89cd45cb99b6bef9a8")
138+
228c236,238
139+
< elseif (LINUX_OS_NAME STREQUAL "CentOS 7" OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
140+
---
141+
> set(OPENCV_HASH "0e787d6738092993bc92bb55975f52caabae45dc73473b5196d15e65e87d6b9d")
142+
> elseif ((LINUX_OS_NAME STREQUAL "CentOS 7" OR
143+
> CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") AND X86_64)
144+
230c240,241
145+
< elseif (LINUX_OS_NAME MATCHES "CentOS 8")
146+
---
147+
> set(OPENCV_HASH "9b813af064d463b31fa1603b11b6559532a031d59bb0782d234380955fd397e0")
148+
> elseif (LINUX_OS_NAME MATCHES "CentOS 8" AND X86_64)
149+
232c243,244
150+
< elseif (LINUX_OS_NAME STREQUAL "Ubuntu 16.04")
151+
---
152+
> set(OPENCV_HASH "8ec3e3552500dee334162386b98cc54a5608de1f1a18f283523fc0cc13ee2f83")
153+
> elseif (LINUX_OS_NAME STREQUAL "Ubuntu 16.04" AND X86_64)
154+
234c246,247
155+
< elseif (LINUX_OS_NAME STREQUAL "Ubuntu 18.04")
156+
---
157+
> set(OPENCV_HASH "cd46831b4d8d1c0891d8d22ff5b2670d0a465a8a8285243059659a50ceeae2c3")
158+
> elseif (LINUX_OS_NAME STREQUAL "Ubuntu 18.04" AND X86_64)
159+
236c249,250
160+
< elseif (LINUX_OS_NAME STREQUAL "Ubuntu 20.04")
161+
---
162+
> set(OPENCV_HASH "8ec3e3552500dee334162386b98cc54a5608de1f1a18f283523fc0cc13ee2f83")
163+
> elseif ((LINUX_OS_NAME STREQUAL "Ubuntu 20.04" OR LINUX_OS_NAME STREQUAL "LinuxMint 20.1") AND X86_64)
164+
238c252,253
165+
< else()
166+
---
167+
> set(OPENCV_HASH "2b7808d002864acdc5fc0b19cd30dadc31a37cc267931cad605f23f2383bfc21")
168+
> elseif(NOT DEFINED OpenCV_DIR AND NOT DEFINED ENV{OpenCV_DIR})
169+
245c260,261
170+
< VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*")
171+
---
172+
> VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*"
173+
> SHA256 ${OPENCV_HASH})
174+
265a282,283
175+
> else()
176+
> reset_deps_cache(OpenCV_DIR)
177+
268c286,288
178+
< include(ie_parallel)
179+
---
180+
> # TODO: remove global CMAKE_MODULE_PATH
181+
> list(APPEND CMAKE_MODULE_PATH "${IEDevScripts_DIR}")
182+
> include(cmake/ie_parallel.cmake)
183+
282c302,303
184+
< TARGET_PATH "${TEMP}/gna")
185+
---
186+
> TARGET_PATH "${TEMP}/gna"
187+
> SHA256 "b631d6cc5f6cca4a89a3f5dfa383066f3282fee25d633d9085c605bdd8090210")
188+
285a307
189+
> set(GNA_HASH "cc954e67525006bf8bd353a6682e38bf208f6d74e973e0fc292850e721f17452")
190+
288a311
191+
> set(GNA_HASH "20820e07392a1e876cf5577430c1c4c74b924d8f34cc17bfa3e36e641555e05d")
192+
293c316,317
193+
< VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+.[0-9]+).*")
194+
---
195+
> VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+.[0-9]+).*"
196+
> SHA256 ${GNA_HASH})
197+
313c337,338
198+
< TARGET_PATH "${TEMP}/speech_demo_1.0.0.755")
199+
---
200+
> TARGET_PATH "${TEMP}/speech_demo_1.0.0.755"
201+
> SHA256 "58adef14b8a749f70fa83888614cee34b941956e6e958e445e3f48885b3c20a0")
202+
320c345,346
203+
< TARGET_PATH "${TEMP}/speech_demo_1.0.0.755")
204+
---
205+
> TARGET_PATH "${TEMP}/speech_demo_1.0.0.755"
206+
> SHA256 "716201e377714ac50f3909c445d36d47a089de50a557d8ef65232de040671188")
207+
326c352,353
208+
< TARGET_PATH "${TEMP}/speech_demo_1.0.0.755")
209+
---
210+
> TARGET_PATH "${TEMP}/speech_demo_1.0.0.755"
211+
> SHA256 "7714b8776ec0183ed73eed6d3d965ee6d5c15d2dc49ee5ae118cc368c89c7a9d")
212+
336,350d362
213+
<
214+
< configure_file(
215+
< "${IE_MAIN_SOURCE_DIR}/cmake/share/InferenceEngineConfig.cmake.in"
216+
< "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
217+
< @ONLY)
218+
<
219+
< configure_file(
220+
< "${IE_MAIN_SOURCE_DIR}/cmake/share/InferenceEngineConfig-version.cmake.in"
221+
< "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
222+
< COPYONLY)
223+
<
224+
< configure_file(
225+
< "${IE_MAIN_SOURCE_DIR}/cmake/ie_parallel.cmake"
226+
< "${CMAKE_BINARY_DIR}/share/ie_parallel.cmake"
227+
< COPYONLY)

‎dldt‎

Submodule dldt updated 1268 files

‎download_all_stuff.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ red () {
1818
ROOT_DIR=$(pwd)
1919

2020
green "RESET GIT SUBMODULES"
21-
# use `git pull && git checkout tags/<tag>` for update
21+
# use `git fetch --unshallow && git checkout tags/<tag>` for update
2222
git submodule update --init --recursive --depth=1 --jobs=4
2323

2424
green "CLEAN BUILD DIRS"
25-
find build/dldt/ -mindepth 1 -not -name 'dldt_setup.sh' -delete
25+
find build/dldt/ -mindepth 1 -not -name 'dldt_setup.sh' -not -name '*.patch' -delete
2626
find build/opencv/ -mindepth 1 -not -name 'opencv_setup.sh' -delete
2727
find build/ffmpeg/ -mindepth 1 -not -name 'ffmpeg_*.sh' -delete
2828
find build/openblas/ -mindepth 1 -not -name 'openblas_setup.sh' -delete

0 commit comments

Comments
 (0)