From 57970de586b3516c011c987246d34bc60556b1cd Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com> Date: Wed, 19 Nov 2025 10:59:28 +0300 Subject: [PATCH] Merge pull request #28035 from asmorkalov:as/windows_ci_5.x Switch to the new Github actions pipeline for Windows in 5.x too #28035 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [ ] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake --- .github/workflows/PR-5.x.yaml | 14 +++++--------- modules/dnn/perf/perf_utils.cpp | 6 ++++++ modules/features/3rdparty/annoy/annoylib.h | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/PR-5.x.yaml b/.github/workflows/PR-5.x.yaml index 01282c2b16..c881134e05 100644 --- a/.github/workflows/PR-5.x.yaml +++ b/.github/workflows/PR-5.x.yaml @@ -11,6 +11,11 @@ jobs: with: workflow_branch: 'main' + Windows: + uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-Windows.yaml@main + with: + workflow_branch: main + Ubuntu2004-ARM64: uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-ARM64.yaml@main @@ -24,15 +29,6 @@ jobs: if: "${{ contains(github.event.pull_request.labels.*.name, 'category: dnn') }} || ${{ contains(github.event.pull_request.labels.*.name, 'category: dnn (onnx)') }}" uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml@main - Windows10-x64: - uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-W10.yaml@main - - Windows10-x64-UWP: - uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-W10-UWP.yaml@main - - Windows10-ARM64: - uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-W10-ARM64.yaml@main - # Vulkan configuration disabled as Vulkan backend for DNN does not support int/int64 for now # Details: https://github.com/opencv/opencv/issues/25110 # Windows10-x64-Vulkan: diff --git a/modules/dnn/perf/perf_utils.cpp b/modules/dnn/perf/perf_utils.cpp index 1ab544b3eb..c6dd0bf058 100644 --- a/modules/dnn/perf/perf_utils.cpp +++ b/modules/dnn/perf/perf_utils.cpp @@ -36,9 +36,15 @@ INSTANTIATE_TEST_CASE_P(/**/, Utils_blobFromImage, using Utils_blobFromImages = TestBaseWithParam>; PERF_TEST_P_(Utils_blobFromImages, HWC_TO_NCHW) { std::vector input_shape = GetParam(); + int batch = input_shape.front(); std::vector input_shape_no_batch(input_shape.begin()+1, input_shape.end()); + if (input_shape_no_batch[0]*input_shape_no_batch[1] >= 2048*2048) + { + applyTestTag( CV_TEST_TAG_MEMORY_2GB); + } + std::vector inputs; for (int i = 0; i < batch; i++) { Mat input(input_shape_no_batch, CV_32FC3); diff --git a/modules/features/3rdparty/annoy/annoylib.h b/modules/features/3rdparty/annoy/annoylib.h index 22afbd874d..0d07e86823 100644 --- a/modules/features/3rdparty/annoy/annoylib.h +++ b/modules/features/3rdparty/annoy/annoylib.h @@ -1226,7 +1226,7 @@ public: annoylib_showUpdate("prefault is set to true, but MAP_POPULATE is not defined on this platform"); #endif } - _nodes = (Node*)mmap(0, size, PROT_READ, flags, _fd, 0); + _nodes = (Node*)mmap(0, static_cast(size), PROT_READ, flags, _fd, 0); _n_nodes = (S)(size / _s); // Find the roots by scanning the end of the file and taking the nodes with most descendants