Skip to content

Commit cd3939a

Browse files
alalekalalek
committed
Merge pull request opencv#19158 from alalek:build_opencv_winpack_dldt_2021.2.0
2 parents 9f5463c + 8df0f13 commit cd3939a

8 files changed

+366
-2
lines changed

‎platforms/winpack_dldt/2021.2/20200413-dldt-pdb.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 1f981ed2..90eb500a 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -22,6 +22,9 @@ endif()
6+
7+
project(OpenVINO)
8+
9+
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /FS")
10+
+set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
11+
+
12+
set(OpenVINO_MAIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
13+
set(IE_MAIN_SOURCE_DIR ${OpenVINO_MAIN_SOURCE_DIR}/inference-engine)
14+
list(APPEND CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake")

‎platforms/winpack_dldt/2021.2/20200604-dldt-disable-multidevice.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt
2+
index 0ba0dd78..7d34e7cb 100644
3+
--- a/inference-engine/src/CMakeLists.txt
4+
+++ b/inference-engine/src/CMakeLists.txt
5+
@@ -26,7 +26,7 @@ endif()
6+
7+
add_subdirectory(hetero_plugin)
8+
9+
-add_subdirectory(multi_device)
10+
+#add_subdirectory(multi_device)
11+
12+
add_subdirectory(transformations)
13+

‎platforms/winpack_dldt/2021.2/20201217-dldt-disable-unused-targets.patch

Lines changed: 250 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,250 @@
1+
diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
2+
index a3e4f74c..190305a6 100644
3+
--- a/inference-engine/CMakeLists.txt
4+
+++ b/inference-engine/CMakeLists.txt
5+
@@ -69,7 +69,7 @@ if(ENABLE_TESTS)
6+
add_subdirectory(tests)
7+
endif()
8+
9+
-add_subdirectory(tools)
10+
+#add_subdirectory(tools)
11+
12+
function(ie_build_samples)
13+
# samples should be build with the same flags as from OpenVINO package,
14+
@@ -88,7 +88,7 @@ endfunction()
15+
16+
# gflags and format_reader targets are kept inside of samples directory and
17+
# they must be built even if samples build is disabled (required for tests and tools).
18+
-ie_build_samples()
19+
+#ie_build_samples()
20+
21+
file(GLOB_RECURSE SAMPLES_SOURCES samples/*.cpp samples/*.hpp samples/*.h)
22+
add_cpplint_target(sample_cpplint
23+
@@ -179,7 +179,7 @@ endif()
24+
# Developer package
25+
#
26+
27+
-ie_developer_export_targets(format_reader)
28+
+#ie_developer_export_targets(format_reader)
29+
ie_developer_export_targets(${NGRAPH_LIBRARIES})
30+
31+
# for Template plugin
32+
@@ -187,7 +187,7 @@ if(NGRAPH_INTERPRETER_ENABLE)
33+
ie_developer_export_targets(ngraph_backend interpreter_backend)
34+
endif()
35+
36+
-ie_developer_export()
37+
+#ie_developer_export()
38+
39+
configure_file(
40+
"${IE_MAIN_SOURCE_DIR}/cmake/developer_package_config.cmake.in"
41+
diff --git a/inference-engine/cmake/add_ie_target.cmake b/inference-engine/cmake/add_ie_target.cmake
42+
index 35b96542..48dacfb3 100644
43+
--- a/inference-engine/cmake/add_ie_target.cmake
44+
+++ b/inference-engine/cmake/add_ie_target.cmake
45+
@@ -91,7 +91,7 @@ function(addIeTarget)
46+
if (ARG_TYPE STREQUAL EXECUTABLE)
47+
add_executable(${ARG_NAME} ${all_sources})
48+
elseif(ARG_TYPE STREQUAL STATIC OR ARG_TYPE STREQUAL SHARED)
49+
- add_library(${ARG_NAME} ${ARG_TYPE} ${all_sources})
50+
+ add_library(${ARG_NAME} ${ARG_TYPE} EXCLUDE_FROM_ALL ${all_sources})
51+
else()
52+
message(SEND_ERROR "Invalid target type ${ARG_TYPE} specified for target name ${ARG_NAME}")
53+
endif()
54+
diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
55+
index f012a038..5204fb6a 100644
56+
--- a/inference-engine/src/inference_engine/CMakeLists.txt
57+
+++ b/inference-engine/src/inference_engine/CMakeLists.txt
58+
@@ -99,7 +99,7 @@ add_cpplint_target(${TARGET_NAME}_plugin_api_cpplint FOR_SOURCES ${plugin_api_sr
59+
60+
# Create object library
61+
62+
-add_library(${TARGET_NAME}_obj OBJECT
63+
+add_library(${TARGET_NAME}_obj OBJECT EXCLUDE_FROM_ALL
64+
${LIBRARY_SRC}
65+
${LIBRARY_HEADERS}
66+
${PUBLIC_HEADERS})
67+
@@ -162,7 +162,7 @@ ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
68+
69+
# Static library used for unit tests which are always built
70+
71+
-add_library(${TARGET_NAME}_s STATIC
72+
+add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
73+
$<TARGET_OBJECTS:${TARGET_NAME}_legacy_obj>
74+
$<TARGET_OBJECTS:${TARGET_NAME}_obj>
75+
${IE_STATIC_DEPENDENT_FILES})
76+
diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt
77+
index fab2f68d..864953a1 100644
78+
--- a/inference-engine/src/legacy_api/CMakeLists.txt
79+
+++ b/inference-engine/src/legacy_api/CMakeLists.txt
80+
@@ -22,7 +22,7 @@ endif()
81+
82+
# Create object library
83+
84+
-add_library(${TARGET_NAME}_obj OBJECT
85+
+add_library(${TARGET_NAME}_obj OBJECT EXCLUDE_FROM_ALL
86+
${LIBRARY_SRC}
87+
${PUBLIC_HEADERS})
88+
89+
diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
90+
index f52926d6..dd039e29 100644
91+
--- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt
92+
+++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
93+
@@ -194,7 +194,7 @@ ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
94+
95+
# add test object library
96+
97+
-add_library(${TARGET_NAME}_obj OBJECT ${SOURCES} ${HEADERS})
98+
+add_library(${TARGET_NAME}_obj OBJECT EXCLUDE_FROM_ALL ${SOURCES} ${HEADERS})
99+
100+
target_include_directories(${TARGET_NAME}_obj PRIVATE $<TARGET_PROPERTY:inference_engine_preproc_s,INTERFACE_INCLUDE_DIRECTORIES>
101+
$<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>
102+
diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt
103+
index d47dfb35..a9046654 100644
104+
--- a/inference-engine/src/preprocessing/CMakeLists.txt
105+
+++ b/inference-engine/src/preprocessing/CMakeLists.txt
106+
@@ -101,7 +101,7 @@ endif()
107+
108+
# Create object library
109+
110+
-add_library(${TARGET_NAME}_obj OBJECT
111+
+add_library(${TARGET_NAME}_obj OBJECT EXCLUDE_FROM_ALL
112+
${LIBRARY_SRC}
113+
${LIBRARY_HEADERS})
114+
115+
@@ -153,7 +153,7 @@ ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
116+
117+
# Static library used for unit tests which are always built
118+
119+
-add_library(${TARGET_NAME}_s STATIC
120+
+add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
121+
$<TARGET_OBJECTS:${TARGET_NAME}_obj>)
122+
123+
set_ie_threading_interface_for(${TARGET_NAME}_s)
124+
diff --git a/inference-engine/src/vpu/common/CMakeLists.txt b/inference-engine/src/vpu/common/CMakeLists.txt
125+
index bd97c2c6..d89cdaa5 100644
126+
--- a/inference-engine/src/vpu/common/CMakeLists.txt
127+
+++ b/inference-engine/src/vpu/common/CMakeLists.txt
128+
@@ -5,7 +5,7 @@
129+
file(GLOB_RECURSE SOURCES *.cpp *.hpp *.h)
130+
131+
function(add_common_target TARGET_NAME STATIC_IE)
132+
- add_library(${TARGET_NAME} STATIC ${SOURCES})
133+
+ add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${SOURCES})
134+
135+
ie_faster_build(${TARGET_NAME}
136+
UNITY
137+
@@ -62,7 +62,7 @@ add_common_target("vpu_common_lib" FALSE)
138+
139+
# Unit tests support for graph transformer
140+
if(WIN32)
141+
- add_common_target("vpu_common_lib_test_static" TRUE)
142+
+ #add_common_target("vpu_common_lib_test_static" TRUE)
143+
else()
144+
add_library("vpu_common_lib_test_static" ALIAS "vpu_common_lib")
145+
endif()
146+
diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
147+
index 797ef975..0cc5a65a 100644
148+
--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
149+
+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
150+
@@ -5,7 +5,7 @@
151+
file(GLOB_RECURSE SOURCES *.cpp *.hpp *.h *.inc)
152+
153+
function(add_graph_transformer_target TARGET_NAME STATIC_IE)
154+
- add_library(${TARGET_NAME} STATIC ${SOURCES})
155+
+ add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${SOURCES})
156+
157+
set_ie_threading_interface_for(${TARGET_NAME})
158+
159+
@@ -63,7 +63,7 @@ add_graph_transformer_target("vpu_graph_transformer" FALSE)
160+
161+
# Unit tests support for graph transformer
162+
if(WIN32)
163+
- add_graph_transformer_target("vpu_graph_transformer_test_static" TRUE)
164+
+ #add_graph_transformer_target("vpu_graph_transformer_test_static" TRUE)
165+
else()
166+
add_library("vpu_graph_transformer_test_static" ALIAS "vpu_graph_transformer")
167+
endif()
168+
diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
169+
index fa2a4d02..c2ca41cd 100644
170+
--- a/inference-engine/thirdparty/CMakeLists.txt
171+
+++ b/inference-engine/thirdparty/CMakeLists.txt
172+
@@ -61,11 +61,11 @@ else()
173+
target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
174+
endif()
175+
176+
-add_subdirectory(stb_lib)
177+
+#add_subdirectory(stb_lib)
178+
add_subdirectory(ade)
179+
add_subdirectory(fluid/modules/gapi)
180+
181+
-set_target_properties(ade fluid stb_image PROPERTIES FOLDER thirdparty)
182+
+set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
183+
184+
# developer package
185+
186+
diff --git a/inference-engine/thirdparty/mkldnn.cmake b/inference-engine/thirdparty/mkldnn.cmake
187+
index 0c2e936e..f36e7beb 100644
188+
--- a/inference-engine/thirdparty/mkldnn.cmake
189+
+++ b/inference-engine/thirdparty/mkldnn.cmake
190+
@@ -117,7 +117,7 @@ if(WIN32)
191+
endif()
192+
endif()
193+
194+
-add_library(${TARGET} STATIC ${HDR} ${SRC})
195+
+add_library(${TARGET} STATIC EXCLUDE_FROM_ALL ${HDR} ${SRC})
196+
set_ie_threading_interface_for(${TARGET})
197+
198+
if(GEMM STREQUAL "OPENBLAS")
199+
diff --git a/inference-engine/thirdparty/pugixml/CMakeLists.txt b/inference-engine/thirdparty/pugixml/CMakeLists.txt
200+
index 8bcb2801..380fb468 100644
201+
--- a/inference-engine/thirdparty/pugixml/CMakeLists.txt
202+
+++ b/inference-engine/thirdparty/pugixml/CMakeLists.txt
203+
@@ -41,7 +41,7 @@ if(BUILD_SHARED_LIBS)
204+
else()
205+
add_library(pugixml STATIC ${SOURCES})
206+
if (MSVC)
207+
- add_library(pugixml_mt STATIC ${SOURCES})
208+
+ #add_library(pugixml_mt STATIC ${SOURCES})
209+
#if (WIN32)
210+
# set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
211+
# set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
212+
diff --git a/ngraph/core/builder/CMakeLists.txt b/ngraph/core/builder/CMakeLists.txt
213+
index 4c5a4766..6f5f2535 100644
214+
--- a/ngraph/core/builder/CMakeLists.txt
215+
+++ b/ngraph/core/builder/CMakeLists.txt
216+
@@ -28,7 +28,7 @@ source_group("src" FILES ${LIBRARY_SRC})
217+
source_group("include" FILES ${PUBLIC_HEADERS})
218+
219+
# Create shared library
220+
-add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
221+
+add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${LIBRARY_SRC} ${PUBLIC_HEADERS})
222+
223+
if(COMMAND ie_faster_build)
224+
ie_faster_build(${TARGET_NAME}
225+
diff --git a/ngraph/core/reference/CMakeLists.txt b/ngraph/core/reference/CMakeLists.txt
226+
index 2fa49195..ce68fdc8 100644
227+
--- a/ngraph/core/reference/CMakeLists.txt
228+
+++ b/ngraph/core/reference/CMakeLists.txt
229+
@@ -28,7 +28,7 @@ source_group("src" FILES ${LIBRARY_SRC})
230+
source_group("include" FILES ${PUBLIC_HEADERS})
231+
232+
# Create shared library
233+
-add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
234+
+add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${LIBRARY_SRC} ${PUBLIC_HEADERS})
235+
236+
if(COMMAND ie_faster_build)
237+
ie_faster_build(${TARGET_NAME}
238+
diff --git a/openvino/itt/CMakeLists.txt b/openvino/itt/CMakeLists.txt
239+
index 766521a1..04240a89 100644
240+
--- a/openvino/itt/CMakeLists.txt
241+
+++ b/openvino/itt/CMakeLists.txt
242+
@@ -56,7 +56,7 @@ if(ENABLE_PROFILING_ITT)
243+
endif()
244+
endif()
245+
246+
-add_library(${TARGET_NAME} STATIC ${SOURCES})
247+
+add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${SOURCES})
248+
249+
add_library(openvino::itt ALIAS ${TARGET_NAME})
250+

‎platforms/winpack_dldt/2021.2/20201218-dldt-vs-version.patch

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/cmake/vs_version/vs_version.cmake b/cmake/vs_version/vs_version.cmake
2+
index d857e2e4..453903fd 100644
3+
--- a/cmake/vs_version/vs_version.cmake
4+
+++ b/cmake/vs_version/vs_version.cmake
5+
@@ -22,9 +22,9 @@ if(IE_VS_VER_HAS_VERSION)
6+
endif()
7+
8+
set(IE_VS_VER_PRODUCTVERSION_STR "${CI_BUILD_NUMBER}")
9+
-set(IE_VS_VER_PRODUCTNAME_STR "OpenVINO toolkit")
10+
+set(IE_VS_VER_PRODUCTNAME_STR "OpenVINO toolkit (for OpenCV Windows package)")
11+
set(IE_VS_VER_COPYRIGHT_STR "Copyright (C) 2018-2020, Intel Corporation")
12+
-set(IE_VS_VER_COMMENTS_STR "https://docs.openvinotoolkit.org/")
13+
+set(IE_VS_VER_COMMENTS_STR "https://github.com/opencv/opencv/wiki/Intel%27s-Deep-Learning-Inference-Engine-backend")
14+
15+
#
16+
# ie_add_vs_version_file(NAME <name>

‎platforms/winpack_dldt/2021.2/build.config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
os.environ['CI_BUILD_NUMBER'] = '2021.2.0-opencv_winpack_dldt'
2+
3+
cmake_vars['ENABLE_V10_SERIALIZE'] = 'ON'

‎platforms/winpack_dldt/2021.2/patch.config.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
applyPatch('20201217-dldt-disable-unused-targets.patch')
2+
applyPatch('20200413-dldt-pdb.patch')
3+
applyPatch('20200604-dldt-disable-multidevice.patch')
4+
applyPatch('20201218-dldt-vs-version.patch')

‎platforms/winpack_dldt/2021.2/sysroot.config.py

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
sysroot_bin_dir = prepare_dir(self.sysrootdir / 'bin')
2+
copytree(self.build_dir / 'install', self.sysrootdir / 'ngraph')
3+
#rm_one(self.sysrootdir / 'ngraph' / 'lib' / 'ngraph.dll')
4+
5+
build_config = 'Release' if not self.config.build_debug else 'Debug'
6+
build_bin_dir = self.build_dir / 'bin' / 'intel64' / build_config
7+
8+
def copy_bin(name):
9+
global build_bin_dir, sysroot_bin_dir
10+
copytree(build_bin_dir / name, sysroot_bin_dir / name)
11+
12+
dll_suffix = 'd' if self.config.build_debug else ''
13+
def copy_dll(name):
14+
global copy_bin, dll_suffix
15+
copy_bin(name + dll_suffix + '.dll')
16+
copy_bin(name + dll_suffix + '.pdb')
17+
18+
copy_bin('cache.json')
19+
copy_dll('clDNNPlugin')
20+
copy_dll('HeteroPlugin')
21+
copy_dll('inference_engine')
22+
copy_dll('inference_engine_ir_reader')
23+
copy_dll('inference_engine_legacy')
24+
copy_dll('inference_engine_transformations') # runtime
25+
copy_dll('inference_engine_lp_transformations') # runtime
26+
copy_dll('MKLDNNPlugin') # runtime
27+
copy_dll('myriadPlugin') # runtime
28+
#copy_dll('MultiDevicePlugin') # runtime, not used
29+
copy_dll('ngraph')
30+
copy_bin('plugins.xml')
31+
copy_bin('pcie-ma2x8x.elf')
32+
copy_bin('usb-ma2x8x.mvcmd')
33+
34+
copytree(self.srcdir / 'inference-engine' / 'temp' / 'tbb' / 'bin', sysroot_bin_dir)
35+
copytree(self.srcdir / 'inference-engine' / 'temp' / 'tbb', self.sysrootdir / 'tbb')
36+
37+
sysroot_ie_dir = prepare_dir(self.sysrootdir / 'deployment_tools' / 'inference_engine')
38+
sysroot_ie_lib_dir = prepare_dir(sysroot_ie_dir / 'lib' / 'intel64')
39+
40+
copytree(self.srcdir / 'inference-engine' / 'include', sysroot_ie_dir / 'include')
41+
if not self.config.build_debug:
42+
copytree(self.build_dir / 'install' / 'lib' / 'ngraph.lib', sysroot_ie_lib_dir / 'ngraph.lib')
43+
copytree(build_bin_dir / 'inference_engine.lib', sysroot_ie_lib_dir / 'inference_engine.lib')
44+
copytree(build_bin_dir / 'inference_engine_ir_reader.lib', sysroot_ie_lib_dir / 'inference_engine_ir_reader.lib')
45+
copytree(build_bin_dir / 'inference_engine_legacy.lib', sysroot_ie_lib_dir / 'inference_engine_legacy.lib')
46+
else:
47+
copytree(self.build_dir / 'install' / 'lib' / 'ngraphd.lib', sysroot_ie_lib_dir / 'ngraphd.lib')
48+
copytree(build_bin_dir / 'inference_engined.lib', sysroot_ie_lib_dir / 'inference_engined.lib')
49+
copytree(build_bin_dir / 'inference_engine_ir_readerd.lib', sysroot_ie_lib_dir / 'inference_engine_ir_readerd.lib')
50+
copytree(build_bin_dir / 'inference_engine_legacyd.lib', sysroot_ie_lib_dir / 'inference_engine_legacyd.lib')
51+
52+
sysroot_license_dir = prepare_dir(self.sysrootdir / 'etc' / 'licenses')
53+
copytree(self.srcdir / 'LICENSE', sysroot_license_dir / 'dldt-LICENSE')
54+
copytree(self.sysrootdir / 'tbb/LICENSE', sysroot_license_dir / 'tbb-LICENSE')

‎platforms/winpack_dldt/build_package.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ def git_apply_patch(src_dir, patch_file):
151151
assert os.path.exists(patch_file), patch_file
152152
execute(cmd=['git', 'apply', '--3way', '-v', '--ignore-space-change', str(patch_file)], cwd=src_dir)
153153
execute(cmd=['git', '--no-pager', 'diff', 'HEAD'], cwd=src_dir)
154+
os.environ['GIT_AUTHOR_NAME'] = os.environ['GIT_COMMITTER_NAME']='build'
155+
os.environ['GIT_AUTHOR_EMAIL'] = os.environ['GIT_COMMITTER_EMAIL']='build@opencv.org'
156+
execute(cmd=['git', 'commit', '-am', 'apply opencv patch'], cwd=src_dir)
154157

155158

156159
#===================================================================================================
@@ -278,6 +281,13 @@ def build(self):
278281
OUTPUT_ROOT=str(self.build_dir), # 2020.4+
279282
)
280283

284+
self.build_config_file = str(self.cpath / 'build.config.py') # Python 3.5 may not handle Path
285+
if os.path.exists(str(self.build_config_file)):
286+
with open(self.build_config_file, 'r') as f:
287+
cfg = f.read()
288+
exec(compile(cfg, str(self.build_config_file), 'exec'))
289+
log.info('DLDT processed build configuration script')
290+
281291
cmd += [ '-D%s=%s' % (k, v) for (k, v) in cmake_vars.items() if v is not None]
282292
if self.config.cmake_option_dldt:
283293
cmd += self.config.cmake_option_dldt
@@ -443,8 +453,8 @@ def package_sources(self):
443453
def main():
444454

445455
dldt_src_url = 'https://github.com/openvinotoolkit/openvino'
446-
dldt_src_commit = '2021.1'
447-
dldt_release = '2021010000'
456+
dldt_src_commit = '2021.2'
457+
dldt_release = '2021020000'
448458

449459
build_cache_dir_default = os.environ.get('BUILD_CACHE_DIR', '.build_cache')
450460
build_subst_drive = os.environ.get('BUILD_SUBST_DRIVE', None)

0 commit comments

Comments
 (0)