1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Compare commits

...

3 Commits

Author SHA1 Message Date
Alexander Alekhin 4d34934d25 gapi(simd): initialize accumulator values
original commit: 99502e99cc
2020-03-30 19:36:30 +03:00
Alexander Alekhin 1b5c2bb363 OpenCV version '-openvino' 2020-03-24 16:17:01 +03:00
Alexander Alekhin 45263d7642 dnn: use OpenVINO 2020.2 defines 2020-03-24 16:17:01 +03:00
5 changed files with 9 additions and 8 deletions
+2 -2
View File
@@ -92,9 +92,9 @@ endif()
if(INF_ENGINE_TARGET) if(INF_ENGINE_TARGET)
if(NOT INF_ENGINE_RELEASE) if(NOT INF_ENGINE_RELEASE)
message(WARNING "InferenceEngine version has not been set, 2020.1 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.") message(WARNING "InferenceEngine version has not been set, 2020.2 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.")
endif() endif()
set(INF_ENGINE_RELEASE "2020010000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2020.1.0.2 -> 2020010002)") set(INF_ENGINE_RELEASE "2020020000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2020.1.0.2 -> 2020010002)")
set_target_properties(${INF_ENGINE_TARGET} PROPERTIES set_target_properties(${INF_ENGINE_TARGET} PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "HAVE_INF_ENGINE=1;INF_ENGINE_RELEASE=${INF_ENGINE_RELEASE}" INTERFACE_COMPILE_DEFINITIONS "HAVE_INF_ENGINE=1;INF_ENGINE_RELEASE=${INF_ENGINE_RELEASE}"
) )
@@ -8,7 +8,7 @@
#define CV_VERSION_MAJOR 4 #define CV_VERSION_MAJOR 4
#define CV_VERSION_MINOR 3 #define CV_VERSION_MINOR 3
#define CV_VERSION_REVISION 0 #define CV_VERSION_REVISION 0
#define CV_VERSION_STATUS "-pre" #define CV_VERSION_STATUS "-openvino"
#define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A) #define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
+1 -1
View File
@@ -2228,7 +2228,7 @@ struct Net::Impl
auto ieInpNode = inputNodes[i].dynamicCast<InfEngineNgraphNode>(); auto ieInpNode = inputNodes[i].dynamicCast<InfEngineNgraphNode>();
CV_Assert(oid < ieInpNode->node->get_output_size()); CV_Assert(oid < ieInpNode->node->get_output_size());
inputNodes[i] = Ptr<BackendNode>(new InfEngineNgraphNode(ieInpNode->node->get_output_as_single_output_node(oid, false))); inputNodes[i] = Ptr<BackendNode>(new InfEngineNgraphNode(ieInpNode->node->get_output_as_single_output_node(oid/*, false*/)));
} }
if (layer->supportBackend(preferableBackend)) if (layer->supportBackend(preferableBackend))
+3 -2
View File
@@ -24,10 +24,11 @@
#define INF_ENGINE_RELEASE_2019R2 2019020000 #define INF_ENGINE_RELEASE_2019R2 2019020000
#define INF_ENGINE_RELEASE_2019R3 2019030000 #define INF_ENGINE_RELEASE_2019R3 2019030000
#define INF_ENGINE_RELEASE_2020_1 2020010000 #define INF_ENGINE_RELEASE_2020_1 2020010000
#define INF_ENGINE_RELEASE_2020_2 2020020000
#ifndef INF_ENGINE_RELEASE #ifndef INF_ENGINE_RELEASE
#warning("IE version have not been provided via command-line. Using 2019.1 by default") #warning("IE version have not been provided via command-line. Using 2020.2 by default")
#define INF_ENGINE_RELEASE INF_ENGINE_RELEASE_2020_1 #define INF_ENGINE_RELEASE INF_ENGINE_RELEASE_2020_2
#endif #endif
#define INF_ENGINE_VER_MAJOR_GT(ver) (((INF_ENGINE_RELEASE) / 10000) > ((ver) / 10000)) #define INF_ENGINE_VER_MAJOR_GT(ver) (((INF_ENGINE_RELEASE) / 10000) > ((ver) / 10000))
@@ -1831,7 +1831,7 @@ static void run_sepfilter5x5_char2short(short out[], const uchar *in[], int widt
for (; l <= length - nlanes; l += nlanes) for (; l <= length - nlanes; l += nlanes)
{ {
v_uint16 t[kxLen]; v_uint16 t[kxLen];
v_int16 sum; v_int16 sum = vx_setzero_s16();
for (int i = 0; i < kxLen; ++i) for (int i = 0; i < kxLen; ++i)
{ {
@@ -1862,7 +1862,7 @@ static void run_sepfilter5x5_char2short(short out[], const uchar *in[], int widt
for (; l <= length - nlanes; l += nlanes) for (; l <= length - nlanes; l += nlanes)
{ {
v_int16 s[buffSize]; v_int16 s[buffSize];
v_int16 sum; v_int16 sum = vx_setzero_s16();
for (int i = 0; i < kyLen; ++i) for (int i = 0; i < kyLen; ++i)
{ {