Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
95a07ca1
Commit
95a07ca1
authored
Mar 27, 2020
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
parents
72c5ac37
222a4857
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
381 additions
and
13 deletions
+381
-13
OpenCVDetectInferenceEngine.cmake
cmake/OpenCVDetectInferenceEngine.cmake
+47
-10
OpenCVModule.cmake
cmake/OpenCVModule.cmake
+23
-2
parallel.cpp
modules/core/src/parallel.cpp
+1
-1
.gitattributes
platforms/winpack_dldt/.gitattributes
+1
-0
20200313-dldt-disable-unused-targets.patch
...ck_dldt/2020.1/20200313-dldt-disable-unused-targets.patch
+158
-0
20200313-dldt-fix-binaries-location.patch
...ack_dldt/2020.1/20200313-dldt-fix-binaries-location.patch
+13
-0
20200313-ngraph-disable-tests-examples.patch
..._dldt/2020.1/20200313-ngraph-disable-tests-examples.patch
+25
-0
20200318-dldt-pdb.patch
platforms/winpack_dldt/2020.1/20200318-dldt-pdb.patch
+14
-0
20200319-dldt-fix-msvs2019-v16.5.0.patch
...pack_dldt/2020.1/20200319-dldt-fix-msvs2019-v16.5.0.patch
+13
-0
patch.config.py
platforms/winpack_dldt/2020.1/patch.config.py
+5
-0
sysroot.config.py
platforms/winpack_dldt/2020.1/sysroot.config.py
+51
-0
build_package.py
platforms/winpack_dldt/build_package.py
+0
-0
POST_FINALIZE.cmake
...orms/winpack_dldt/cmake-opencv-checks/POST_FINALIZE.cmake
+17
-0
test_dnn_backends.py
platforms/winpack_dldt/package-tests/test_dnn_backends.py
+13
-0
No files found.
cmake/OpenCVDetectInferenceEngine.cmake
View file @
95a07ca1
...
@@ -17,10 +17,34 @@
...
@@ -17,10 +17,34 @@
# INF_ENGINE_TARGET - set to name of imported library target representing InferenceEngine
# INF_ENGINE_TARGET - set to name of imported library target representing InferenceEngine
#
#
macro
(
ocv_ie_find_extra_libraries find_prefix find_suffix
)
file
(
GLOB libraries
"
${
INF_ENGINE_LIB_DIRS
}
/
${
find_prefix
}
inference_engine*
${
find_suffix
}
"
)
foreach
(
full_path IN LISTS libraries
)
get_filename_component
(
library
"
${
full_path
}
"
NAME_WE
)
string
(
REPLACE
"
${
find_prefix
}
"
""
library
"
${
library
}
"
)
if
(
library STREQUAL
"inference_engine"
OR library STREQUAL
"inference_engined"
)
# skip
else
()
add_library
(
${
library
}
UNKNOWN IMPORTED
)
set_target_properties
(
${
library
}
PROPERTIES
IMPORTED_LOCATION
"
${
full_path
}
"
)
list
(
APPEND custom_libraries
${
library
}
)
endif
()
endforeach
()
endmacro
()
function
(
add_custom_ie_build _inc _lib _lib_rel _lib_dbg _msg
)
function
(
add_custom_ie_build _inc _lib _lib_rel _lib_dbg _msg
)
if
(
NOT _inc OR
NOT
(
_lib OR _lib_rel OR _lib_dbg
))
if
(
NOT _inc OR
NOT
(
_lib OR _lib_rel OR _lib_dbg
))
return
()
return
()
endif
()
endif
()
if
(
NOT _lib
)
if
(
_lib_rel
)
set
(
_lib
"
${
_lib_rel
}
"
)
else
()
set
(
_lib
"
${
_lib_dbg
}
"
)
endif
()
endif
()
add_library
(
inference_engine UNKNOWN IMPORTED
)
add_library
(
inference_engine UNKNOWN IMPORTED
)
set_target_properties
(
inference_engine PROPERTIES
set_target_properties
(
inference_engine PROPERTIES
IMPORTED_LOCATION
"
${
_lib
}
"
IMPORTED_LOCATION
"
${
_lib
}
"
...
@@ -30,24 +54,31 @@ function(add_custom_ie_build _inc _lib _lib_rel _lib_dbg _msg)
...
@@ -30,24 +54,31 @@ function(add_custom_ie_build _inc _lib _lib_rel _lib_dbg _msg)
)
)
set
(
custom_libraries
""
)
set
(
custom_libraries
""
)
file
(
GLOB libraries
"
${
INF_ENGINE_LIB_DIRS
}
/
${
CMAKE_SHARED_LIBRARY_PREFIX
}
inference_engine_*
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
"
)
set
(
__prefixes
"
${
CMAKE_FIND_LIBRARY_PREFIXES
}
"
)
foreach
(
full_path IN LISTS libraries
)
if
(
NOT __prefixes
)
get_filename_component
(
library
"
${
full_path
}
"
NAME_WE
)
set
(
__prefixes
"_empty_"
)
string
(
REPLACE
"
${
CMAKE_SHARED_LIBRARY_PREFIX
}
"
""
library
"
${
library
}
"
)
endif
()
add_library
(
${
library
}
UNKNOWN IMPORTED
)
foreach
(
find_prefix
${
__prefixes
}
)
set_target_properties
(
${
library
}
PROPERTIES
if
(
find_prefix STREQUAL
"_empty_"
)
# foreach doesn't iterate over empty elements
IMPORTED_LOCATION
"
${
full_path
}
"
)
set
(
find_prefix
""
)
list
(
APPEND custom_libraries
${
library
}
)
endif
()
foreach
(
find_suffix
${
CMAKE_FIND_LIBRARY_SUFFIXES
}
)
ocv_ie_find_extra_libraries
(
"
${
find_prefix
}
"
"
${
find_suffix
}
"
)
endforeach
()
if
(
NOT CMAKE_FIND_LIBRARY_SUFFIXES
)
ocv_ie_find_extra_libraries
(
"
${
find_prefix
}
"
""
)
endif
()
endforeach
()
endforeach
()
if
(
NOT INF_ENGINE_RELEASE VERSION_GREATER
"2018050000"
)
if
(
NOT INF_ENGINE_RELEASE VERSION_GREATER
"2018050000"
)
find_library
(
INF_ENGINE_OMP_LIBRARY iomp5 PATHS
"
${
INF_ENGINE_OMP_DIR
}
"
NO_DEFAULT_PATH
)
find_library
(
INF_ENGINE_OMP_LIBRARY iomp5 PATHS
"
${
INF_ENGINE_OMP_DIR
}
"
NO_DEFAULT_PATH
)
if
(
NOT INF_ENGINE_OMP_LIBRARY
)
if
(
NOT INF_ENGINE_OMP_LIBRARY
)
message
(
WARNING
"OpenMP for IE have not been found. Set INF_ENGINE_OMP_DIR variable if you experience build errors."
)
message
(
WARNING
"OpenMP for IE have not been found. Set INF_ENGINE_OMP_DIR variable if you experience build errors."
)
else
()
set_target_properties
(
inference_engine PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES
"
${
INF_ENGINE_OMP_LIBRARY
}
"
)
endif
()
endif
()
endif
()
endif
()
if
(
EXISTS
"
${
INF_ENGINE_OMP_LIBRARY
}
"
)
set_target_properties
(
inference_engine PROPERTIES IMPORTED_LINK_INTERFACE_LIBRARIES
"
${
INF_ENGINE_OMP_LIBRARY
}
"
)
endif
()
set
(
INF_ENGINE_VERSION
"Unknown"
CACHE STRING
""
)
set
(
INF_ENGINE_VERSION
"Unknown"
CACHE STRING
""
)
set
(
INF_ENGINE_TARGET
"inference_engine;
${
custom_libraries
}
"
PARENT_SCOPE
)
set
(
INF_ENGINE_TARGET
"inference_engine;
${
custom_libraries
}
"
PARENT_SCOPE
)
message
(
STATUS
"Detected InferenceEngine:
${
_msg
}
"
)
message
(
STATUS
"Detected InferenceEngine:
${
_msg
}
"
)
...
@@ -64,6 +95,9 @@ endif()
...
@@ -64,6 +95,9 @@ endif()
if
(
NOT INF_ENGINE_TARGET AND INF_ENGINE_LIB_DIRS AND INF_ENGINE_INCLUDE_DIRS
)
if
(
NOT INF_ENGINE_TARGET AND INF_ENGINE_LIB_DIRS AND INF_ENGINE_INCLUDE_DIRS
)
find_path
(
ie_custom_inc
"inference_engine.hpp"
PATHS
"
${
INF_ENGINE_INCLUDE_DIRS
}
"
NO_DEFAULT_PATH
)
find_path
(
ie_custom_inc
"inference_engine.hpp"
PATHS
"
${
INF_ENGINE_INCLUDE_DIRS
}
"
NO_DEFAULT_PATH
)
if
(
CMAKE_BUILD_TYPE STREQUAL
"Debug"
)
find_library
(
ie_custom_lib_dbg
"inference_engined"
PATHS
"
${
INF_ENGINE_LIB_DIRS
}
"
NO_DEFAULT_PATH
)
# Win32 and MacOSX
endif
()
find_library
(
ie_custom_lib
"inference_engine"
PATHS
"
${
INF_ENGINE_LIB_DIRS
}
"
NO_DEFAULT_PATH
)
find_library
(
ie_custom_lib
"inference_engine"
PATHS
"
${
INF_ENGINE_LIB_DIRS
}
"
NO_DEFAULT_PATH
)
find_library
(
ie_custom_lib_rel
"inference_engine"
PATHS
"
${
INF_ENGINE_LIB_DIRS
}
/Release"
NO_DEFAULT_PATH
)
find_library
(
ie_custom_lib_rel
"inference_engine"
PATHS
"
${
INF_ENGINE_LIB_DIRS
}
/Release"
NO_DEFAULT_PATH
)
find_library
(
ie_custom_lib_dbg
"inference_engine"
PATHS
"
${
INF_ENGINE_LIB_DIRS
}
/Debug"
NO_DEFAULT_PATH
)
find_library
(
ie_custom_lib_dbg
"inference_engine"
PATHS
"
${
INF_ENGINE_LIB_DIRS
}
/Debug"
NO_DEFAULT_PATH
)
...
@@ -82,6 +116,9 @@ if(NOT INF_ENGINE_TARGET AND _loc)
...
@@ -82,6 +116,9 @@ if(NOT INF_ENGINE_TARGET AND _loc)
endif
()
endif
()
set
(
INF_ENGINE_PLATFORM
"
${
INF_ENGINE_PLATFORM_DEFAULT
}
"
CACHE STRING
"InferenceEngine platform (library dir)"
)
set
(
INF_ENGINE_PLATFORM
"
${
INF_ENGINE_PLATFORM_DEFAULT
}
"
CACHE STRING
"InferenceEngine platform (library dir)"
)
find_path
(
ie_custom_env_inc
"inference_engine.hpp"
PATHS
"
${
_loc
}
/deployment_tools/inference_engine/include"
NO_DEFAULT_PATH
)
find_path
(
ie_custom_env_inc
"inference_engine.hpp"
PATHS
"
${
_loc
}
/deployment_tools/inference_engine/include"
NO_DEFAULT_PATH
)
if
(
CMAKE_BUILD_TYPE STREQUAL
"Debug"
)
find_library
(
ie_custom_env_lib_dbg
"inference_engined"
PATHS
"
${
_loc
}
/deployment_tools/inference_engine/lib/
${
INF_ENGINE_PLATFORM
}
/intel64"
NO_DEFAULT_PATH
)
endif
()
find_library
(
ie_custom_env_lib
"inference_engine"
PATHS
"
${
_loc
}
/deployment_tools/inference_engine/lib/
${
INF_ENGINE_PLATFORM
}
/intel64"
NO_DEFAULT_PATH
)
find_library
(
ie_custom_env_lib
"inference_engine"
PATHS
"
${
_loc
}
/deployment_tools/inference_engine/lib/
${
INF_ENGINE_PLATFORM
}
/intel64"
NO_DEFAULT_PATH
)
find_library
(
ie_custom_env_lib_rel
"inference_engine"
PATHS
"
${
_loc
}
/deployment_tools/inference_engine/lib/intel64/Release"
NO_DEFAULT_PATH
)
find_library
(
ie_custom_env_lib_rel
"inference_engine"
PATHS
"
${
_loc
}
/deployment_tools/inference_engine/lib/intel64/Release"
NO_DEFAULT_PATH
)
find_library
(
ie_custom_env_lib_dbg
"inference_engine"
PATHS
"
${
_loc
}
/deployment_tools/inference_engine/lib/intel64/Debug"
NO_DEFAULT_PATH
)
find_library
(
ie_custom_env_lib_dbg
"inference_engine"
PATHS
"
${
_loc
}
/deployment_tools/inference_engine/lib/intel64/Debug"
NO_DEFAULT_PATH
)
...
...
cmake/OpenCVModule.cmake
View file @
95a07ca1
...
@@ -1087,6 +1087,17 @@ macro(ocv_check_dependencies)
...
@@ -1087,6 +1087,17 @@ macro(ocv_check_dependencies)
endforeach
()
endforeach
()
endmacro
()
endmacro
()
################################################################################
# OpenCV tests
################################################################################
if
(
DEFINED OPENCV_BUILD_TEST_MODULES_LIST
)
string
(
REPLACE
","
";"
OPENCV_BUILD_TEST_MODULES_LIST
"
${
OPENCV_BUILD_TEST_MODULES_LIST
}
"
)
# support comma-separated list (,) too
endif
()
if
(
DEFINED OPENCV_BUILD_PERF_TEST_MODULES_LIST
)
string
(
REPLACE
","
";"
OPENCV_BUILD_PERF_TEST_MODULES_LIST
"
${
OPENCV_BUILD_PERF_TEST_MODULES_LIST
}
"
)
# support comma-separated list (,) too
endif
()
# auxiliary macro to parse arguments of ocv_add_accuracy_tests and ocv_add_perf_tests commands
# auxiliary macro to parse arguments of ocv_add_accuracy_tests and ocv_add_perf_tests commands
macro
(
__ocv_parse_test_sources tests_type
)
macro
(
__ocv_parse_test_sources tests_type
)
set
(
OPENCV_
${
tests_type
}
_
${
the_module
}
_SOURCES
""
)
set
(
OPENCV_
${
tests_type
}
_
${
the_module
}
_SOURCES
""
)
...
@@ -1127,7 +1138,12 @@ function(ocv_add_perf_tests)
...
@@ -1127,7 +1138,12 @@ function(ocv_add_perf_tests)
endif
()
endif
()
set
(
perf_path
"
${
CMAKE_CURRENT_LIST_DIR
}
/perf"
)
set
(
perf_path
"
${
CMAKE_CURRENT_LIST_DIR
}
/perf"
)
if
(
BUILD_PERF_TESTS AND EXISTS
"
${
perf_path
}
"
)
if
(
BUILD_PERF_TESTS AND EXISTS
"
${
perf_path
}
"
AND
(
NOT DEFINED OPENCV_BUILD_PERF_TEST_MODULES_LIST
OR OPENCV_BUILD_PERF_TEST_MODULES_LIST STREQUAL
"all"
OR
";
${
OPENCV_BUILD_PERF_TEST_MODULES_LIST
}
;"
MATCHES
";
${
name
}
;"
)
)
__ocv_parse_test_sources
(
PERF
${
ARGN
}
)
__ocv_parse_test_sources
(
PERF
${
ARGN
}
)
# opencv_imgcodecs is required for imread/imwrite
# opencv_imgcodecs is required for imread/imwrite
...
@@ -1212,7 +1228,12 @@ function(ocv_add_accuracy_tests)
...
@@ -1212,7 +1228,12 @@ function(ocv_add_accuracy_tests)
ocv_debug_message
(
"ocv_add_accuracy_tests("
${
ARGN
}
")"
)
ocv_debug_message
(
"ocv_add_accuracy_tests("
${
ARGN
}
")"
)
set
(
test_path
"
${
CMAKE_CURRENT_LIST_DIR
}
/test"
)
set
(
test_path
"
${
CMAKE_CURRENT_LIST_DIR
}
/test"
)
if
(
BUILD_TESTS AND EXISTS
"
${
test_path
}
"
)
if
(
BUILD_TESTS AND EXISTS
"
${
test_path
}
"
AND
(
NOT DEFINED OPENCV_BUILD_TEST_MODULES_LIST
OR OPENCV_BUILD_TEST_MODULES_LIST STREQUAL
"all"
OR
";
${
OPENCV_BUILD_TEST_MODULES_LIST
}
;"
MATCHES
";
${
name
}
;"
)
)
__ocv_parse_test_sources
(
TEST
${
ARGN
}
)
__ocv_parse_test_sources
(
TEST
${
ARGN
}
)
# opencv_imgcodecs is required for imread/imwrite
# opencv_imgcodecs is required for imread/imwrite
...
...
modules/core/src/parallel.cpp
View file @
95a07ca1
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
#endif
#endif
#if defined __linux__ || defined __APPLE__ || defined __GLIBC__ \
#if defined __linux__ || defined __APPLE__ || defined __GLIBC__ \
|| defined __HAIKU__ || defined __EMSCRIPTEN__
|| defined __HAIKU__ || defined __EMSCRIPTEN__
|| defined __FreeBSD__
#include <unistd.h>
#include <unistd.h>
#include <stdio.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/types.h>
...
...
platforms/winpack_dldt/.gitattributes
0 → 100644
View file @
95a07ca1
*.patch text eol=crlf -whitespace
platforms/winpack_dldt/2020.1/20200313-dldt-disable-unused-targets.patch
0 → 100644
View file @
95a07ca1
diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
index d5feedb..1b7aa7e 100644
--- a/inference-engine/CMakeLists.txt
+++ b/inference-engine/CMakeLists.txt
@@ -59,11 +59,11 @@ if(ENABLE_TESTS)
add_subdirectory(tests)
endif()
-add_subdirectory(tools)
+#add_subdirectory(tools)
# 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).
-add_subdirectory(samples)
+#add_subdirectory(samples)
file(GLOB_RECURSE SAMPLES_SOURCES samples/*.cpp samples/*.hpp samples/*.h)
add_cpplint_target(sample_cpplint
@@ -134,7 +134,7 @@ install(DIRECTORY ${ie_python_api_SOURCE_DIR}/sample/
add_custom_target(ie_dev_targets ALL DEPENDS inference_engine HeteroPlugin)
# Developer package
-ie_developer_export_targets(format_reader)
+#ie_developer_export_targets(format_reader)
if (ENABLE_NGRAPH)
ie_developer_export_targets(${NGRAPH_LIBRARIES})
diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
index 54e264c..c0b7495 100644
--- a/inference-engine/src/inference_engine/CMakeLists.txt
+++ b/inference-engine/src/inference_engine/CMakeLists.txt
@@ -228,7 +228,7 @@ target_include_directories(${TARGET_NAME}_nn_builder PRIVATE "${CMAKE_CURRENT_SO
# 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>
${NN_BUILDER_LIBRARY_SRC})
diff --git a/inference-engine/src/mkldnn_plugin/CMakeLists.txt b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
index cd727fd..2f09b44 100644
--- a/inference-engine/src/mkldnn_plugin/CMakeLists.txt
+++ b/inference-engine/src/mkldnn_plugin/CMakeLists.txt
@@ -184,9 +184,9 @@ endif()
add_library(mkldnn_plugin_layers_no_opt OBJECT ${CROSS_COMPILED_SOURCES})
set_ie_threading_interface_for(mkldnn_plugin_layers_no_opt)
-add_library(mkldnn_plugin_layers_no_opt_s OBJECT ${CROSS_COMPILED_SOURCES})
-set_ie_threading_interface_for(mkldnn_plugin_layers_no_opt_s)
-target_compile_definitions(mkldnn_plugin_layers_no_opt_s PRIVATE USE_STATIC_IE)
+#add_library(mkldnn_plugin_layers_no_opt_s OBJECT ${CROSS_COMPILED_SOURCES})
+#set_ie_threading_interface_for(mkldnn_plugin_layers_no_opt_s)
+#target_compile_definitions(mkldnn_plugin_layers_no_opt_s PRIVATE USE_STATIC_IE)
set(object_libraries mkldnn_plugin_layers_no_opt)
set(mkldnn_plugin_object_libraries mkldnn_plugin_layers_no_opt_s)
@@ -220,7 +220,7 @@ if (ENABLE_SSE42)
endfunction()
mkldnn_create_sse42_layers(mkldnn_plugin_layers_sse42)
- mkldnn_create_sse42_layers(mkldnn_plugin_layers_sse42_s)
+ #mkldnn_create_sse42_layers(mkldnn_plugin_layers_sse42_s)
list(APPEND object_libraries mkldnn_plugin_layers_sse42)
list(APPEND mkldnn_plugin_object_libraries mkldnn_plugin_layers_sse42_s)
@@ -259,7 +259,7 @@ if (ENABLE_AVX2)
endfunction()
mkldnn_create_avx2_layers(mkldnn_plugin_layers_avx2)
- mkldnn_create_avx2_layers(mkldnn_plugin_layers_avx2_s)
+ #mkldnn_create_avx2_layers(mkldnn_plugin_layers_avx2_s)
list(APPEND object_libraries mkldnn_plugin_layers_avx2)
list(APPEND mkldnn_plugin_object_libraries mkldnn_plugin_layers_avx2_s)
@@ -297,7 +297,7 @@ if (ENABLE_AVX512F)
endfunction()
mkldnn_create_avx512f_layers(mkldnn_plugin_layers_avx512)
- mkldnn_create_avx512f_layers(mkldnn_plugin_layers_avx512_s)
+ #mkldnn_create_avx512f_layers(mkldnn_plugin_layers_avx512_s)
list(APPEND object_libraries mkldnn_plugin_layers_avx512)
list(APPEND mkldnn_plugin_object_libraries mkldnn_plugin_layers_avx512_s)
@@ -317,7 +317,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE inference_engine ${INTEL_ITT_LIBS}
# 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>)
diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt
index 41f14a9..0e1b4f6 100644
--- a/inference-engine/src/preprocessing/CMakeLists.txt
+++ b/inference-engine/src/preprocessing/CMakeLists.txt
@@ -81,7 +81,7 @@ endif()
# 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 8995390..8413faf 100644
--- a/inference-engine/src/vpu/common/CMakeLists.txt
+++ b/inference-engine/src/vpu/common/CMakeLists.txt
@@ -49,7 +49,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 e77296e..333f560 100644
--- a/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
+++ b/inference-engine/src/vpu/graph_transformer/CMakeLists.txt
@@ -60,7 +60,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 ec22761..8bb3325 100644
--- a/inference-engine/thirdparty/CMakeLists.txt
+++ b/inference-engine/thirdparty/CMakeLists.txt
@@ -36,7 +36,7 @@ function(build_with_lto)
endif()
add_subdirectory(pugixml)
- add_subdirectory(stb_lib)
+ #add_subdirectory(stb_lib)
add_subdirectory(ade)
add_subdirectory(fluid/modules/gapi)
diff --git a/inference-engine/thirdparty/pugixml/CMakeLists.txt b/inference-engine/thirdparty/pugixml/CMakeLists.txt
index 8bcb280..5a17fa3 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")
platforms/winpack_dldt/2020.1/20200313-dldt-fix-binaries-location.patch
0 → 100644
View file @
95a07ca1
diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
index e59edb2..e42ac19 100644
--- a/cmake/developer_package.cmake
+++ b/cmake/developer_package.cmake
@@ -99,7 +99,7 @@ if(UNIX)
SET(LIB_DL ${CMAKE_DL_LIBS})
endif()
-set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
+set(OUTPUT_ROOT ${CMAKE_BINARY_DIR})
# Enable postfixes for Debug/Release builds
set(IE_DEBUG_POSTFIX_WIN "d")
platforms/winpack_dldt/2020.1/20200313-ngraph-disable-tests-examples.patch
0 → 100644
View file @
95a07ca1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 631465f..723153b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -567,7 +567,7 @@ if (NGRAPH_ONNX_IMPORT_ENABLE)
endif()
endif()
-include(cmake/external_gtest.cmake)
+#include(cmake/external_gtest.cmake)
if(NGRAPH_JSON_ENABLE)
include(cmake/external_json.cmake)
endif()
@@ -623,8 +623,8 @@ endif()
add_subdirectory(src)
-add_subdirectory(test)
-add_subdirectory(doc/examples)
+#add_subdirectory(test)
+#add_subdirectory(doc/examples)
if (NGRAPH_DOC_BUILD_ENABLE)
add_subdirectory(doc)
platforms/winpack_dldt/2020.1/20200318-dldt-pdb.patch
0 → 100644
View file @
95a07ca1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e48cee5..5823e92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,9 @@ endif()
project(OpenVINO)
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
+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(CMAKE_MODULE_PATH "${OpenVINO_MAIN_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
platforms/winpack_dldt/2020.1/20200319-dldt-fix-msvs2019-v16.5.0.patch
0 → 100644
View file @
95a07ca1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7900b382..b5c53d09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,8 @@ include(features)
# include developer package
include(developer_package)
+disable_deprecated_warnings()
+
# These options are shared with 3rdparty plugins
# by means of developer package
include(check_features)
platforms/winpack_dldt/2020.1/patch.config.py
0 → 100644
View file @
95a07ca1
applyPatch
(
'20200313-ngraph-disable-tests-examples.patch'
,
'ngraph'
)
applyPatch
(
'20200313-dldt-disable-unused-targets.patch'
)
applyPatch
(
'20200313-dldt-fix-binaries-location.patch'
)
applyPatch
(
'20200318-dldt-pdb.patch'
)
applyPatch
(
'20200319-dldt-fix-msvs2019-v16.5.0.patch'
)
platforms/winpack_dldt/2020.1/sysroot.config.py
0 → 100644
View file @
95a07ca1
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
(
'cldnn_global_custom_kernels'
)
copy_bin
(
'cache.json'
)
copy_dll
(
'clDNNPlugin'
)
copy_dll
(
'HeteroPlugin'
)
copy_dll
(
'inference_engine'
)
copy_dll
(
'inference_engine_nn_builder'
)
copy_dll
(
'MKLDNNPlugin'
)
copy_dll
(
'myriadPlugin'
)
copy_dll
(
'ngraph'
)
copy_bin
(
'plugins.xml'
)
copytree
(
self
.
build_dir
/
'bin'
/
'intel64'
/
'pcie-ma248x.elf'
,
sysroot_bin_dir
/
'pcie-ma248x.elf'
)
copytree
(
self
.
build_dir
/
'bin'
/
'intel64'
/
'usb-ma2x8x.mvcmd'
,
sysroot_bin_dir
/
'usb-ma2x8x.mvcmd'
)
copytree
(
self
.
build_dir
/
'bin'
/
'intel64'
/
'usb-ma2450.mvcmd'
,
sysroot_bin_dir
/
'usb-ma2450.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_nn_builder.lib'
,
sysroot_ie_lib_dir
/
'inference_engine_nn_builder.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_nn_builderd.lib'
,
sysroot_ie_lib_dir
/
'inference_engine_nn_builderd.lib'
)
sysroot_license_dir
=
prepare_dir
(
self
.
sysrootdir
/
'etc'
/
'licenses'
)
copytree
(
self
.
srcdir
/
'LICENSE'
,
sysroot_license_dir
/
'dldt-LICENSE'
)
copytree
(
self
.
srcdir
/
'ngraph/LICENSE'
,
sysroot_license_dir
/
'ngraph-LICENSE'
)
copytree
(
self
.
sysrootdir
/
'tbb/LICENSE'
,
sysroot_license_dir
/
'tbb-LICENSE'
)
platforms/winpack_dldt/build_package.py
0 → 100644
View file @
95a07ca1
This diff is collapsed.
Click to expand it.
platforms/winpack_dldt/cmake-opencv-checks/POST_FINALIZE.cmake
0 → 100644
View file @
95a07ca1
message
(
STATUS
"Winpack-DLDT: Validating OpenCV build configuration..."
)
if
(
NOT INF_ENGINE_TARGET
)
message
(
SEND_ERROR
"Inference engine must be detected"
)
set
(
HAS_ERROR 1
)
endif
()
if
(
NOT HAVE_NGRAPH
)
message
(
SEND_ERROR
"Inference engine nGraph must be detected"
)
set
(
HAS_ERROR 1
)
endif
()
if
(
HAS_ERROR
)
ocv_cmake_dump_vars
(
"^IE_|INF_|INFERENCE|ngraph"
)
message
(
FATAL_ERROR
"Winpack-DLDT: Validating OpenCV build configuration... FAILED"
)
endif
()
message
(
STATUS
"Winpack-DLDT: Validating OpenCV build configuration... DONE"
)
platforms/winpack_dldt/package-tests/test_dnn_backends.py
0 → 100644
View file @
95a07ca1
import
sys
print
(
sys
.
version_info
)
try
:
import
cv2
as
cv
print
(
cv
.
__version__
)
print
(
cv
.
dnn
.
getAvailableTargets
(
cv
.
dnn
.
DNN_BACKEND_INFERENCE_ENGINE
))
except
:
print
(
sys
.
path
)
import
os
print
(
os
.
environ
.
get
(
'PATH'
,
''
))
raise
print
(
'OK'
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment