Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
cd3939a1
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cd3939a1
编写于
12月 18, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19158 from alalek:build_opencv_winpack_dldt_2021.2.0
上级
9f5463ce
8df0f132
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
366 addition
and
2 deletion
+366
-2
platforms/winpack_dldt/2021.2/20200413-dldt-pdb.patch
platforms/winpack_dldt/2021.2/20200413-dldt-pdb.patch
+14
-0
platforms/winpack_dldt/2021.2/20200604-dldt-disable-multidevice.patch
...npack_dldt/2021.2/20200604-dldt-disable-multidevice.patch
+13
-0
platforms/winpack_dldt/2021.2/20201217-dldt-disable-unused-targets.patch
...ck_dldt/2021.2/20201217-dldt-disable-unused-targets.patch
+250
-0
platforms/winpack_dldt/2021.2/20201218-dldt-vs-version.patch
platforms/winpack_dldt/2021.2/20201218-dldt-vs-version.patch
+16
-0
platforms/winpack_dldt/2021.2/build.config.py
platforms/winpack_dldt/2021.2/build.config.py
+3
-0
platforms/winpack_dldt/2021.2/patch.config.py
platforms/winpack_dldt/2021.2/patch.config.py
+4
-0
platforms/winpack_dldt/2021.2/sysroot.config.py
platforms/winpack_dldt/2021.2/sysroot.config.py
+54
-0
platforms/winpack_dldt/build_package.py
platforms/winpack_dldt/build_package.py
+12
-2
未找到文件。
platforms/winpack_dldt/2021.2/20200413-dldt-pdb.patch
0 → 100644
浏览文件 @
cd3939a1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f981ed2..90eb500a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,9 @@
endif()
project(OpenVINO)
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi /FS")
+set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
+
set(OpenVINO_MAIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(IE_MAIN_SOURCE_DIR ${OpenVINO_MAIN_SOURCE_DIR}/inference-engine)
list(APPEND CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake")
platforms/winpack_dldt/2021.2/20200604-dldt-disable-multidevice.patch
0 → 100644
浏览文件 @
cd3939a1
diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt
index 0ba0dd78..7d34e7cb 100644
--- a/inference-engine/src/CMakeLists.txt
+++ b/inference-engine/src/CMakeLists.txt
@@ -26,7 +26,7 @@
endif()
add_subdirectory(hetero_plugin)
-add_subdirectory(multi_device)
+#add_subdirectory(multi_device)
add_subdirectory(transformations)
platforms/winpack_dldt/2021.2/20201217-dldt-disable-unused-targets.patch
0 → 100644
浏览文件 @
cd3939a1
diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
index a3e4f74c..190305a6 100644
--- a/inference-engine/CMakeLists.txt
+++ b/inference-engine/CMakeLists.txt
@@ -69,7 +69,7 @@
if(ENABLE_TESTS)
add_subdirectory(tests)
endif()
-add_subdirectory(tools)
+#add_subdirectory(tools)
function(ie_build_samples)
# samples should be build with the same flags as from OpenVINO package,
@@ -88,7 +88,7 @@
endfunction()
# gflags and format_reader targets are kept inside of samples directory and
# they must be built even if samples build is disabled (required for tests and tools).
-ie_build_samples()
+#ie_build_samples()
file(GLOB_RECURSE SAMPLES_SOURCES samples/*.cpp samples/*.hpp samples/*.h)
add_cpplint_target(sample_cpplint
@@ -179,7 +179,7 @@
endif()
# Developer package
#
-ie_developer_export_targets(format_reader)
+#ie_developer_export_targets(format_reader)
ie_developer_export_targets(${NGRAPH_LIBRARIES})
# for Template plugin
@@ -187,7 +187,7 @@
if(NGRAPH_INTERPRETER_ENABLE)
ie_developer_export_targets(ngraph_backend interpreter_backend)
endif()
-ie_developer_export()
+#ie_developer_export()
configure_file(
"${IE_MAIN_SOURCE_DIR}/cmake/developer_package_config.cmake.in"
diff --git a/inference-engine/cmake/add_ie_target.cmake b/inference-engine/cmake/add_ie_target.cmake
index 35b96542..48dacfb3 100644
--- a/inference-engine/cmake/add_ie_target.cmake
+++ b/inference-engine/cmake/add_ie_target.cmake
@@ -91,7 +91,7 @@
function(addIeTarget)
if (ARG_TYPE STREQUAL EXECUTABLE)
add_executable(${ARG_NAME} ${all_sources})
elseif(ARG_TYPE STREQUAL STATIC OR ARG_TYPE STREQUAL SHARED)
- add_library(${ARG_NAME} ${ARG_TYPE} ${all_sources})
+ add_library(${ARG_NAME} ${ARG_TYPE} EXCLUDE_FROM_ALL ${all_sources})
else()
message(SEND_ERROR "Invalid target type ${ARG_TYPE} specified for target name ${ARG_NAME}")
endif()
diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
index f012a038..5204fb6a 100644
--- a/inference-engine/src/inference_engine/CMakeLists.txt
+++ b/inference-engine/src/inference_engine/CMakeLists.txt
@@ -99,7 +99,7 @@
add_cpplint_target(${TARGET_NAME}_plugin_api_cpplint FOR_SOURCES ${plugin_api_sr
# Create object library
-add_library(${TARGET_NAME}_obj OBJECT
+add_library(${TARGET_NAME}_obj OBJECT EXCLUDE_FROM_ALL
${LIBRARY_SRC}
${LIBRARY_HEADERS}
${PUBLIC_HEADERS})
@@ -162,7 +162,7 @@
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
# Static library used for unit tests which are always built
-add_library(${TARGET_NAME}_s STATIC
+add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
$<TARGET_OBJECTS:${TARGET_NAME}_legacy_obj>
$<TARGET_OBJECTS:${TARGET_NAME}_obj>
${IE_STATIC_DEPENDENT_FILES})
diff --git a/inference-engine/src/legacy_api/CMakeLists.txt b/inference-engine/src/legacy_api/CMakeLists.txt
index fab2f68d..864953a1 100644
--- a/inference-engine/src/legacy_api/CMakeLists.txt
+++ b/inference-engine/src/legacy_api/CMakeLists.txt
@@ -22,7 +22,7 @@
endif()
# Create object library
-add_library(${TARGET_NAME}_obj OBJECT
+add_library(${TARGET_NAME}_obj OBJECT EXCLUDE_FROM_ALL
${LIBRARY_SRC}
${PUBLIC_HEADERS})
diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
index f52926d6..dd039e29 100644
--- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt
+++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
@@ -194,7 +194,7 @@
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
# add test object library
-add_library(${TARGET_NAME}_obj OBJECT ${SOURCES} ${HEADERS})
+add_library(${TARGET_NAME}_obj OBJECT EXCLUDE_FROM_ALL ${SOURCES} ${HEADERS})
target_include_directories(${TARGET_NAME}_obj PRIVATE $<TARGET_PROPERTY:inference_engine_preproc_s,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:inference_engine_legacy,INTERFACE_INCLUDE_DIRECTORIES>
diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt
index d47dfb35..a9046654 100644
--- a/inference-engine/src/preprocessing/CMakeLists.txt
+++ b/inference-engine/src/preprocessing/CMakeLists.txt
@@ -101,7 +101,7 @@
endif()
# Create object library
-add_library(${TARGET_NAME}_obj OBJECT
+add_library(${TARGET_NAME}_obj OBJECT EXCLUDE_FROM_ALL
${LIBRARY_SRC}
${LIBRARY_HEADERS})
@@ -153,7 +153,7 @@
ie_add_api_validator_post_build_step(TARGET ${TARGET_NAME})
# Static library used for unit tests which are always built
-add_library(${TARGET_NAME}_s STATIC
+add_library(${TARGET_NAME}_s STATIC EXCLUDE_FROM_ALL
$<TARGET_OBJECTS:${TARGET_NAME}_obj>)
set_ie_threading_interface_for(${TARGET_NAME}_s)
diff --git a/inference-engine/src/vpu/common/CMakeLists.txt b/inference-engine/src/vpu/common/CMakeLists.txt
index bd97c2c6..d89cdaa5 100644
--- a/inference-engine/src/vpu/common/CMakeLists.txt
+++ b/inference-engine/src/vpu/common/CMakeLists.txt
@@ -5,7 +5,7 @@
file(GLOB_RECURSE SOURCES *.cpp *.hpp *.h)
function(add_common_target TARGET_NAME STATIC_IE)
- add_library(${TARGET_NAME} STATIC ${SOURCES})
+ add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${SOURCES})
ie_faster_build(${TARGET_NAME}
UNITY
@@ -62,7 +62,7 @@
add_common_target("vpu_common_lib" FALSE)
# Unit tests support for graph transformer
if(WIN32)
- add_common_target("vpu_common_lib_test_static" TRUE)
+ #add_common_target("vpu_common_lib_test_static" TRUE)
else()
add_library("vpu_common_lib_test_static" ALIAS "vpu_common_lib")
endif()
diff --git a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
index 797ef975..0cc5a65a 100644
--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
@@ -5,7 +5,7 @@
file(GLOB_RECURSE SOURCES *.cpp *.hpp *.h *.inc)
function(add_graph_transformer_target TARGET_NAME STATIC_IE)
- add_library(${TARGET_NAME} STATIC ${SOURCES})
+ add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${SOURCES})
set_ie_threading_interface_for(${TARGET_NAME})
@@ -63,7 +63,7 @@
add_graph_transformer_target("vpu_graph_transformer" FALSE)
# Unit tests support for graph transformer
if(WIN32)
- add_graph_transformer_target("vpu_graph_transformer_test_static" TRUE)
+ #add_graph_transformer_target("vpu_graph_transformer_test_static" TRUE)
else()
add_library("vpu_graph_transformer_test_static" ALIAS "vpu_graph_transformer")
endif()
diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
index fa2a4d02..c2ca41cd 100644
--- a/inference-engine/thirdparty/CMakeLists.txt
+++ b/inference-engine/thirdparty/CMakeLists.txt
@@ -61,11 +61,11 @@
else()
target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
endif()
-add_subdirectory(stb_lib)
+#add_subdirectory(stb_lib)
add_subdirectory(ade)
add_subdirectory(fluid/modules/gapi)
-set_target_properties(ade fluid stb_image PROPERTIES FOLDER thirdparty)
+set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
# developer package
diff --git a/inference-engine/thirdparty/mkldnn.cmake b/inference-engine/thirdparty/mkldnn.cmake
index 0c2e936e..f36e7beb 100644
--- a/inference-engine/thirdparty/mkldnn.cmake
+++ b/inference-engine/thirdparty/mkldnn.cmake
@@ -117,7 +117,7 @@
if(WIN32)
endif()
endif()
-add_library(${TARGET} STATIC ${HDR} ${SRC})
+add_library(${TARGET} STATIC EXCLUDE_FROM_ALL ${HDR} ${SRC})
set_ie_threading_interface_for(${TARGET})
if(GEMM STREQUAL "OPENBLAS")
diff --git a/inference-engine/thirdparty/pugixml/CMakeLists.txt b/inference-engine/thirdparty/pugixml/CMakeLists.txt
index 8bcb2801..380fb468 100644
--- a/inference-engine/thirdparty/pugixml/CMakeLists.txt
+++ b/inference-engine/thirdparty/pugixml/CMakeLists.txt
@@ -41,7 +41,7 @@
if(BUILD_SHARED_LIBS)
else()
add_library(pugixml STATIC ${SOURCES})
if (MSVC)
- add_library(pugixml_mt STATIC ${SOURCES})
+ #add_library(pugixml_mt STATIC ${SOURCES})
#if (WIN32)
# set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
# set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
diff --git a/ngraph/core/builder/CMakeLists.txt b/ngraph/core/builder/CMakeLists.txt
index 4c5a4766..6f5f2535 100644
--- a/ngraph/core/builder/CMakeLists.txt
+++ b/ngraph/core/builder/CMakeLists.txt
@@ -28,7 +28,7 @@
source_group("src" FILES ${LIBRARY_SRC})
source_group("include" FILES ${PUBLIC_HEADERS})
# Create shared library
-add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
+add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${LIBRARY_SRC} ${PUBLIC_HEADERS})
if(COMMAND ie_faster_build)
ie_faster_build(${TARGET_NAME}
diff --git a/ngraph/core/reference/CMakeLists.txt b/ngraph/core/reference/CMakeLists.txt
index 2fa49195..ce68fdc8 100644
--- a/ngraph/core/reference/CMakeLists.txt
+++ b/ngraph/core/reference/CMakeLists.txt
@@ -28,7 +28,7 @@
source_group("src" FILES ${LIBRARY_SRC})
source_group("include" FILES ${PUBLIC_HEADERS})
# Create shared library
-add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
+add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${LIBRARY_SRC} ${PUBLIC_HEADERS})
if(COMMAND ie_faster_build)
ie_faster_build(${TARGET_NAME}
diff --git a/openvino/itt/CMakeLists.txt b/openvino/itt/CMakeLists.txt
index 766521a1..04240a89 100644
--- a/openvino/itt/CMakeLists.txt
+++ b/openvino/itt/CMakeLists.txt
@@ -56,7 +56,7 @@
if(ENABLE_PROFILING_ITT)
endif()
endif()
-add_library(${TARGET_NAME} STATIC ${SOURCES})
+add_library(${TARGET_NAME} STATIC EXCLUDE_FROM_ALL ${SOURCES})
add_library(openvino::itt ALIAS ${TARGET_NAME})
platforms/winpack_dldt/2021.2/20201218-dldt-vs-version.patch
0 → 100644
浏览文件 @
cd3939a1
diff --git a/cmake/vs_version/vs_version.cmake b/cmake/vs_version/vs_version.cmake
index d857e2e4..453903fd 100644
--- a/cmake/vs_version/vs_version.cmake
+++ b/cmake/vs_version/vs_version.cmake
@@ -22,9 +22,9 @@
if(IE_VS_VER_HAS_VERSION)
endif()
set(IE_VS_VER_PRODUCTVERSION_STR "${CI_BUILD_NUMBER}")
-set(IE_VS_VER_PRODUCTNAME_STR "OpenVINO toolkit")
+set(IE_VS_VER_PRODUCTNAME_STR "OpenVINO toolkit (for OpenCV Windows package)")
set(IE_VS_VER_COPYRIGHT_STR "Copyright (C) 2018-2020, Intel Corporation")
-set(IE_VS_VER_COMMENTS_STR "https://docs.openvinotoolkit.org/")
+set(IE_VS_VER_COMMENTS_STR "https://github.com/opencv/opencv/wiki/Intel%27s-Deep-Learning-Inference-Engine-backend")
#
# ie_add_vs_version_file(NAME <name>
platforms/winpack_dldt/2021.2/build.config.py
0 → 100644
浏览文件 @
cd3939a1
os
.
environ
[
'CI_BUILD_NUMBER'
]
=
'2021.2.0-opencv_winpack_dldt'
cmake_vars
[
'ENABLE_V10_SERIALIZE'
]
=
'ON'
platforms/winpack_dldt/2021.2/patch.config.py
0 → 100644
浏览文件 @
cd3939a1
applyPatch
(
'20201217-dldt-disable-unused-targets.patch'
)
applyPatch
(
'20200413-dldt-pdb.patch'
)
applyPatch
(
'20200604-dldt-disable-multidevice.patch'
)
applyPatch
(
'20201218-dldt-vs-version.patch'
)
platforms/winpack_dldt/2021.2/sysroot.config.py
0 → 100644
浏览文件 @
cd3939a1
sysroot_bin_dir
=
prepare_dir
(
self
.
sysrootdir
/
'bin'
)
copytree
(
self
.
build_dir
/
'install'
,
self
.
sysrootdir
/
'ngraph'
)
#rm_one(self.sysrootdir / 'ngraph' / 'lib' / 'ngraph.dll')
build_config
=
'Release'
if
not
self
.
config
.
build_debug
else
'Debug'
build_bin_dir
=
self
.
build_dir
/
'bin'
/
'intel64'
/
build_config
def
copy_bin
(
name
):
global
build_bin_dir
,
sysroot_bin_dir
copytree
(
build_bin_dir
/
name
,
sysroot_bin_dir
/
name
)
dll_suffix
=
'd'
if
self
.
config
.
build_debug
else
''
def
copy_dll
(
name
):
global
copy_bin
,
dll_suffix
copy_bin
(
name
+
dll_suffix
+
'.dll'
)
copy_bin
(
name
+
dll_suffix
+
'.pdb'
)
copy_bin
(
'cache.json'
)
copy_dll
(
'clDNNPlugin'
)
copy_dll
(
'HeteroPlugin'
)
copy_dll
(
'inference_engine'
)
copy_dll
(
'inference_engine_ir_reader'
)
copy_dll
(
'inference_engine_legacy'
)
copy_dll
(
'inference_engine_transformations'
)
# runtime
copy_dll
(
'inference_engine_lp_transformations'
)
# runtime
copy_dll
(
'MKLDNNPlugin'
)
# runtime
copy_dll
(
'myriadPlugin'
)
# runtime
#copy_dll('MultiDevicePlugin') # runtime, not used
copy_dll
(
'ngraph'
)
copy_bin
(
'plugins.xml'
)
copy_bin
(
'pcie-ma2x8x.elf'
)
copy_bin
(
'usb-ma2x8x.mvcmd'
)
copytree
(
self
.
srcdir
/
'inference-engine'
/
'temp'
/
'tbb'
/
'bin'
,
sysroot_bin_dir
)
copytree
(
self
.
srcdir
/
'inference-engine'
/
'temp'
/
'tbb'
,
self
.
sysrootdir
/
'tbb'
)
sysroot_ie_dir
=
prepare_dir
(
self
.
sysrootdir
/
'deployment_tools'
/
'inference_engine'
)
sysroot_ie_lib_dir
=
prepare_dir
(
sysroot_ie_dir
/
'lib'
/
'intel64'
)
copytree
(
self
.
srcdir
/
'inference-engine'
/
'include'
,
sysroot_ie_dir
/
'include'
)
if
not
self
.
config
.
build_debug
:
copytree
(
self
.
build_dir
/
'install'
/
'lib'
/
'ngraph.lib'
,
sysroot_ie_lib_dir
/
'ngraph.lib'
)
copytree
(
build_bin_dir
/
'inference_engine.lib'
,
sysroot_ie_lib_dir
/
'inference_engine.lib'
)
copytree
(
build_bin_dir
/
'inference_engine_ir_reader.lib'
,
sysroot_ie_lib_dir
/
'inference_engine_ir_reader.lib'
)
copytree
(
build_bin_dir
/
'inference_engine_legacy.lib'
,
sysroot_ie_lib_dir
/
'inference_engine_legacy.lib'
)
else
:
copytree
(
self
.
build_dir
/
'install'
/
'lib'
/
'ngraphd.lib'
,
sysroot_ie_lib_dir
/
'ngraphd.lib'
)
copytree
(
build_bin_dir
/
'inference_engined.lib'
,
sysroot_ie_lib_dir
/
'inference_engined.lib'
)
copytree
(
build_bin_dir
/
'inference_engine_ir_readerd.lib'
,
sysroot_ie_lib_dir
/
'inference_engine_ir_readerd.lib'
)
copytree
(
build_bin_dir
/
'inference_engine_legacyd.lib'
,
sysroot_ie_lib_dir
/
'inference_engine_legacyd.lib'
)
sysroot_license_dir
=
prepare_dir
(
self
.
sysrootdir
/
'etc'
/
'licenses'
)
copytree
(
self
.
srcdir
/
'LICENSE'
,
sysroot_license_dir
/
'dldt-LICENSE'
)
copytree
(
self
.
sysrootdir
/
'tbb/LICENSE'
,
sysroot_license_dir
/
'tbb-LICENSE'
)
platforms/winpack_dldt/build_package.py
浏览文件 @
cd3939a1
...
...
@@ -151,6 +151,9 @@ def git_apply_patch(src_dir, patch_file):
assert
os
.
path
.
exists
(
patch_file
),
patch_file
execute
(
cmd
=
[
'git'
,
'apply'
,
'--3way'
,
'-v'
,
'--ignore-space-change'
,
str
(
patch_file
)],
cwd
=
src_dir
)
execute
(
cmd
=
[
'git'
,
'--no-pager'
,
'diff'
,
'HEAD'
],
cwd
=
src_dir
)
os
.
environ
[
'GIT_AUTHOR_NAME'
]
=
os
.
environ
[
'GIT_COMMITTER_NAME'
]
=
'build'
os
.
environ
[
'GIT_AUTHOR_EMAIL'
]
=
os
.
environ
[
'GIT_COMMITTER_EMAIL'
]
=
'build@opencv.org'
execute
(
cmd
=
[
'git'
,
'commit'
,
'-am'
,
'apply opencv patch'
],
cwd
=
src_dir
)
#===================================================================================================
...
...
@@ -278,6 +281,13 @@ class BuilderDLDT:
OUTPUT_ROOT
=
str
(
self
.
build_dir
),
# 2020.4+
)
self
.
build_config_file
=
str
(
self
.
cpath
/
'build.config.py'
)
# Python 3.5 may not handle Path
if
os
.
path
.
exists
(
str
(
self
.
build_config_file
)):
with
open
(
self
.
build_config_file
,
'r'
)
as
f
:
cfg
=
f
.
read
()
exec
(
compile
(
cfg
,
str
(
self
.
build_config_file
),
'exec'
))
log
.
info
(
'DLDT processed build configuration script'
)
cmd
+=
[
'-D%s=%s'
%
(
k
,
v
)
for
(
k
,
v
)
in
cmake_vars
.
items
()
if
v
is
not
None
]
if
self
.
config
.
cmake_option_dldt
:
cmd
+=
self
.
config
.
cmake_option_dldt
...
...
@@ -443,8 +453,8 @@ class Builder:
def
main
():
dldt_src_url
=
'https://github.com/openvinotoolkit/openvino'
dldt_src_commit
=
'2021.
1
'
dldt_release
=
'20210
1
0000'
dldt_src_commit
=
'2021.
2
'
dldt_release
=
'20210
2
0000'
build_cache_dir_default
=
os
.
environ
.
get
(
'BUILD_CACHE_DIR'
,
'.build_cache'
)
build_subst_drive
=
os
.
environ
.
get
(
'BUILD_SUBST_DRIVE'
,
None
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录