potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2024-02-26 18:05:36 +03:00
parent 4c549b8707 4a9b0f2bf4
commit cb7d38b477
73 changed files with 1706 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/src/backends/ie/giebackend.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
// (cv::gapi::ie::backend() is still there and is defined always)
#include "backends/ie/giebackend.hpp"
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2023010000
#if INF_ENGINE_RELEASE <= 2019010000
# error G-API IE module supports only OpenVINO IE >= 2019 R1
modules/gapi/src/backends/ie/giebackend.hpp
+1 -1
View File
@@ -10,7 +10,7 @@
// Include anyway - cv::gapi::ie::backend() still needs to be defined
#include "opencv2/gapi/infer/ie.hpp"
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2023010000
#include <ade/util/algorithm.hpp> // type_list_index
#include <condition_variable>
modules/gapi/src/backends/ie/giebackend/giewrapper.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
//
// Copyright (C) 2020-2024 Intel Corporation
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2023010000
#include <vector>
#include <string>
modules/gapi/test/cpu/gapi_ocv_stateful_kernel_tests.cpp
+7
View File
@@ -454,6 +454,13 @@ namespace
TEST(StatefulKernel, StateIsInitViaCompArgsInStreaming)
{
// This test is long as it runs BG subtractor (a) twice
// (in G-API + for reference) over (b) two files. In fact
// it is one more BG Subtractor accuracy test, but not
// a stateful initialization test -- the latter must be
// done through a light-weight mock object. So for now:
applyTestTag(CV_TEST_TAG_VERYLONG);
// G-API graph declaration
cv::GMat in;
cv::GMat out = GBackSub::on(in);
modules/gapi/test/infer/gapi_infer_ie_test.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "../test_precomp.hpp"
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2024000000
#if defined HAVE_INF_ENGINE && INF_ENGINE_RELEASE < 2023010000
#include <stdexcept>
#include <mutex>
modules/gapi/test/streaming/gapi_streaming_tests.cpp
+9 -7
View File
@@ -716,14 +716,16 @@ TEST_P(GAPI_Streaming, SmokeTest_AutoMeta_VideoScalar)
EXPECT_EQ(165u, test_frames);
}
// Instantiate tests with different backends, but default queue capacity
INSTANTIATE_TEST_CASE_P(TestStreaming, GAPI_Streaming,
Combine(Values( KernelPackage::OCV
//, KernelPackage::OCL // FIXME: Fails bit-exactness check, maybe relax it?
, KernelPackage::OCV_FLUID
//, KernelPackage::OCL // FIXME: Fails bit-exactness check, maybe relax it?
),
Values(cv::optional<size_t>{}, 1u, 4u))
);
Combine(Values( KernelPackage::OCV
, KernelPackage::OCV_FLUID),
Values(cv::optional<size_t>{})));
// Instantiate tests with the same backend but various queue capacity
INSTANTIATE_TEST_CASE_P(TestStreaming_QC, GAPI_Streaming,
Combine(Values(KernelPackage::OCV_FLUID),
Values(1u, 4u)));
namespace TypesTest
{
modules/gapi/test/streaming/gapi_streaming_utils_test.cpp
+1
View File
@@ -245,6 +245,7 @@ TEST(OneVPL_ElasticBarrier, single_thread_visit)
TEST(OneVPL_ElasticBarrier, multi_thread_visit)
{
applyTestTag(CV_TEST_TAG_VERYLONG);
TestBarrier tested_barrier;
static const size_t max_visit_count = 10000000;