From a98add5cdda4538e0e1cfc2ab080fc39de31fd4d Mon Sep 17 00:00:00 2001 From: Abhishek Gola Date: Mon, 23 Feb 2026 19:28:33 +0530 Subject: [PATCH 1/9] Add ONNX Runtime test for 5.x --- .github/workflows/OCV-PR-Linux-ORT.yaml | 206 ++++++++++++++++++++++++ scripts/test-plan-5.x-ort.json | 24 +++ 2 files changed, 230 insertions(+) create mode 100644 .github/workflows/OCV-PR-Linux-ORT.yaml create mode 100644 scripts/test-plan-5.x-ort.json diff --git a/.github/workflows/OCV-PR-Linux-ORT.yaml b/.github/workflows/OCV-PR-Linux-ORT.yaml new file mode 100644 index 00000000..133c02d9 --- /dev/null +++ b/.github/workflows/OCV-PR-Linux-ORT.yaml @@ -0,0 +1,206 @@ +name: OCV PR Linux ORT + +on: + pull_request: + branches: + - main + paths: + - '.github/workflows/OCV-PR-Linux-ORT.yaml' + # TODO: are following paths necessary? + # - 'checkout-and-merge/*' + # - 'configure-and-build/*' + # - 'run-tests/*' + # - 'scripts/runner.py' + # - 'scripts/test-plan.json' + workflow_call: + inputs: + workflow_branch: + description: "Branch for ci-gha-workflow repository" + default: "main" + required: false + type: string + +concurrency: + group: OCV-PR-Linux-ORT-${{ github.ref }} + cancel-in-progress: true + +jobs: + + branch_eval: + runs-on: ubuntu-24.04 + outputs: + branches: ${{ steps.determine-branches.outputs.branches }} + steps: + - id: determine-branches + shell: bash + run: | + # Industry Standard: Explicitly allow 5.x only. + # Logic: If repo is ci-gha-workflow OR the target PR branch is 5.x + if [[ "${{ github.event.repository.name }}" == "ci-gha-workflow" || "${{ github.base_ref }}" == "5.x" ]]; then + echo "branches=['5.x']" >> "$GITHUB_OUTPUT" + else + echo "branches=[]" >> "$GITHUB_OUTPUT" + fi + + Ubuntu: + # runs-on: opencv-ru-lin-riscv + runs-on: opencv-cn-lin-x86-64 + needs: + - branch_eval + if: ${{ needs.branch_eval.outputs.branches != '[]' }} + strategy: + # NOTE: Debugging + # fail-fast: true + # max-parallel: 3 + fail-fast: false + max-parallel: 3 + matrix: + version: + - '24.04' + - '22.04' + - '20.04' + # TODO: enable later + # - '24.04_asan' + branch: ${{ fromJSON(needs.branch_eval.outputs.branches )}} + include: + - version: '24.04' + image: '24.04:20251127' + jpegxl: true + avif: true + avx2: true + gphoto2: true + aravis: true + # TODO: enable later + # - version: '24.04_asan' + # image: '24.04:20250505' + # asan: true + # jpegxl: true + # avif: true + - version: '22.04' + image: '22.04:20251015' + avif: true + plugins: true + - version: '20.04' + image: '20.04:20251015' + limited_api: true + defaults: + run: + shell: bash + container: + image: 'quay.io/opencv-ci/opencv-ubuntu-${{ matrix.image }}' + volumes: + # NOTE: RU config + # - /mnt/cache/git_cache:/opt/git_cache + # - /mnt/cache/ci_cache/opencv:/opt/.ccache + # - /mnt/cache/binaries_cache:/opt/binaries_cache + # - vol_dnn_models:/opt/dnn-models + # NOTE: CN config + - /home/opencv-cn/git_cache:/opt/git_cache + - /home/opencv-cn/ci_cache/opencv/${{ matrix.version }}:/opt/.ccache + - /home/opencv-cn/binaries_cache/${{ matrix.version }}:/opt/binaries_cache + - /home/opencv-cn/dnn-models:/opt/dnn-models + # NOTE: RU config + # options: '--user root:root' + env: + ANT_HOME: '/usr/share/ant' + DNN_MODELS: '/opt/dnn-models' + CCACHE_DIR: '/opt/.ccache' + CCACHE_MAXSIZE: '8G' + OPENCV_DOWNLOAD_PATH: '/opt/binaries_cache' + CMAKE_OPT: >- + -DBUILD_DOCS=ON + -DBUILD_EXAMPLES=ON + -DOPENCV_ENABLE_NONFREE=ON + -DWITH_IMGCODEC_GIF=ON + -DWITH_ONNXRUNTIME=ON + ${{ matrix.jpegxl && '-DWITH_JPEGXL=ON' }} + ${{ matrix.avif && '-DWITH_AVIF=ON' }} + ${{ matrix.gphoto2 && '-DWITH_GPHOTO2=ON' }} + ${{ matrix.aravis && '-DWITH_ARAVIS=ON' }} + ${{ matrix.avx2 && '-DCPU_BASELINE=AVX2'}} + ${{ matrix.plugins && '-DVIDEOIO_PLUGIN_LIST=all -DHIGHGUI_PLUGIN_LIST=all' }} + ${{ matrix.limited_api && '-DPYTHON3_LIMITED_API=ON' }} + ${{ matrix.asan && '-DENABLE_OMIT_FRAME_POINTER=OFF -DCMAKE_CXX_FLAGS="-fsanitize=address"' }} + HOME: ${{ contains(matrix.image, '24.04') && '/home/ubuntu' || '/home/ci' }} + MAIN_BUILD_DIR: "${{ (github.event.repository.name != 'opencv_contrib') && 'build' || 'build-contrib' }}" + # NOTE: CN config + OPENCV_FOR_THREADS_NUM: 8 + CMAKE_BUILD_PARALLEL_LEVEL: 8 + # NOTE: RU config + # OPENCV_FOR_THREADS_NUM: 10 + # CMAKE_BUILD_PARALLEL_LEVEL: 20 + + # ========== + + steps: + + - name: Checkout workflow repository + uses: actions/checkout@v4 + with: + repository: opencv/ci-gha-workflow + ref: "${{ github.repository == 'opencv/ci-gha-workflow' && github.ref || inputs.workflow_branch }}" + + - name: Checkout and merge OpenCV + uses: ./checkout-and-merge + with: + target_branch: "${{ matrix.branch }}" + author: "${{ github.event.pull_request.user.login }}" + source_branch: "${{ github.event.repository.name == 'ci-gha-workflow' && '' || github.head_ref }}" + gitcache: '/opt/git_cache' + home: '${{ env.HOME }}' + workdir: '${{ env.HOME }}' + + - name: Update extra dnn models + timeout-minutes: 60 + working-directory: '${{ env.HOME }}' + run: | + ls -lR ${{ env.DNN_MODELS }} + python3 opencv_extra/testdata/dnn/download_models.py \ + --cleanup \ + --dst '${{ env.DNN_MODELS }}/dnn' + echo "OPENCV_DNN_TEST_DATA_PATH=${{ env.DNN_MODELS }}" >> $GITHUB_ENV + + - if: ${{ github.event.repository.name != 'opencv_contrib' }} + name: Configure and build OpenCV + uses: ./configure-and-build + with: + workdir: '${{ env.HOME }}' + builddir: 'build' + generator: 'Ninja' + options: '${{ env.CMAKE_OPT }}' + + - name: Configure and build OpenCV with contrib + uses: ./configure-and-build + with: + workdir: '${{ env.HOME }}' + builddir: 'build-contrib' + generator: 'Ninja' + options: '-DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules ${{ env.CMAKE_OPT }}' + + - name: Run OpenCV tests + uses: ./run-tests + env: + OPENCV_TEST_DATA_PATH: '${{ env.HOME }}/opencv_extra/testdata' + OPENCV_TEST_REQUIRE_DATA: 1 + OPENCV_TEST_CHECK_OPTIONAL_DATA: 1 + PYTHONPATH: '${{ env.HOME }}/${{ env.MAIN_BUILD_DIR }}/python_loader:$PYTHONPATH' + # TODO: enable later + # ASAN_OPTIONS: 'detect_leaks=0' + with: + workdir: '${{ env.HOME }}' + builddir: '${{ env.MAIN_BUILD_DIR }}' + logdir: '${{ env.HOME }}/${{ env.MAIN_BUILD_DIR }}' + plan: "test-plan-${{ matrix.branch }}-ort.json" + # NOTE: Just keeping this construction here for possible future use: + # ${{ (github.event.repository.name == 'opencv_contrib') && format('''linux-contrib-{0}''', matrix.branch) || '' }} + suite: "[ ${{ (github.event.repository.name == 'opencv_contrib') && '''linux-contrib''' || '''linux''' }} ]" + filter: "[ 'ubuntu-common', ${{ matrix.avx2 && '''ubuntu-avx2''' }} ]" + enable_python: "true" + enable_java: "true" + suffix: '${{ matrix.version }}_${{ matrix.branch }}' + + - if: ${{ always() && env.WARNINGS == '1' }} + name: Warnings check + run: | + echo "::error Warnings have been found!" + exit 1 diff --git a/scripts/test-plan-5.x-ort.json b/scripts/test-plan-5.x-ort.json new file mode 100644 index 00000000..377cbb9e --- /dev/null +++ b/scripts/test-plan-5.x-ort.json @@ -0,0 +1,24 @@ +{ + "suites": { + "linux": [ + "opencv_test_dnn" + ], + "linux-contrib": [] + }, + "filters": { + "ubuntu-common": {}, + "ubuntu-avx2": {} + }, + "options": { + "default": { + "args": { + "test": "--skip_unstable=1 --gtest_filter=*ORT*" + }, + "env": { + "opencv_test_dnn": { + "OPENCV_FORCE_DNN_ENGINE": "4" + } + } + } + } +} \ No newline at end of file From e56dedb250d10c9008ee1b964f50512076ab4334 Mon Sep 17 00:00:00 2001 From: Abhishek Gola Date: Fri, 6 Mar 2026 13:38:57 +0530 Subject: [PATCH 2/9] removed 22 and 20 matrix images --- .github/workflows/OCV-PR-Linux-ORT.yaml | 54 +++++++------------------ 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/.github/workflows/OCV-PR-Linux-ORT.yaml b/.github/workflows/OCV-PR-Linux-ORT.yaml index 133c02d9..de4827ff 100644 --- a/.github/workflows/OCV-PR-Linux-ORT.yaml +++ b/.github/workflows/OCV-PR-Linux-ORT.yaml @@ -57,8 +57,6 @@ jobs: matrix: version: - '24.04' - - '22.04' - - '20.04' # TODO: enable later # - '24.04_asan' branch: ${{ fromJSON(needs.branch_eval.outputs.branches )}} @@ -76,13 +74,7 @@ jobs: # asan: true # jpegxl: true # avif: true - - version: '22.04' - image: '22.04:20251015' - avif: true - plugins: true - - version: '20.04' - image: '20.04:20251015' - limited_api: true + defaults: run: shell: bash @@ -122,7 +114,7 @@ jobs: ${{ matrix.limited_api && '-DPYTHON3_LIMITED_API=ON' }} ${{ matrix.asan && '-DENABLE_OMIT_FRAME_POINTER=OFF -DCMAKE_CXX_FLAGS="-fsanitize=address"' }} HOME: ${{ contains(matrix.image, '24.04') && '/home/ubuntu' || '/home/ci' }} - MAIN_BUILD_DIR: "${{ (github.event.repository.name != 'opencv_contrib') && 'build' || 'build-contrib' }}" + MAIN_BUILD_DIR: "build" # NOTE: CN config OPENCV_FOR_THREADS_NUM: 8 CMAKE_BUILD_PARALLEL_LEVEL: 8 @@ -160,8 +152,8 @@ jobs: --dst '${{ env.DNN_MODELS }}/dnn' echo "OPENCV_DNN_TEST_DATA_PATH=${{ env.DNN_MODELS }}" >> $GITHUB_ENV - - if: ${{ github.event.repository.name != 'opencv_contrib' }} - name: Configure and build OpenCV + + - name: Configure and build OpenCV uses: ./configure-and-build with: workdir: '${{ env.HOME }}' @@ -169,35 +161,19 @@ jobs: generator: 'Ninja' options: '${{ env.CMAKE_OPT }}' - - name: Configure and build OpenCV with contrib - uses: ./configure-and-build - with: - workdir: '${{ env.HOME }}' - builddir: 'build-contrib' - generator: 'Ninja' - options: '-DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules ${{ env.CMAKE_OPT }}' - - - name: Run OpenCV tests - uses: ./run-tests + - name: "Accuracy:DNN_ORT" + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} env: OPENCV_TEST_DATA_PATH: '${{ env.HOME }}/opencv_extra/testdata' - OPENCV_TEST_REQUIRE_DATA: 1 - OPENCV_TEST_CHECK_OPTIONAL_DATA: 1 - PYTHONPATH: '${{ env.HOME }}/${{ env.MAIN_BUILD_DIR }}/python_loader:$PYTHONPATH' - # TODO: enable later - # ASAN_OPTIONS: 'detect_leaks=0' - with: - workdir: '${{ env.HOME }}' - builddir: '${{ env.MAIN_BUILD_DIR }}' - logdir: '${{ env.HOME }}/${{ env.MAIN_BUILD_DIR }}' - plan: "test-plan-${{ matrix.branch }}-ort.json" - # NOTE: Just keeping this construction here for possible future use: - # ${{ (github.event.repository.name == 'opencv_contrib') && format('''linux-contrib-{0}''', matrix.branch) || '' }} - suite: "[ ${{ (github.event.repository.name == 'opencv_contrib') && '''linux-contrib''' || '''linux''' }} ]" - filter: "[ 'ubuntu-common', ${{ matrix.avx2 && '''ubuntu-avx2''' }} ]" - enable_python: "true" - enable_java: "true" - suffix: '${{ matrix.version }}_${{ matrix.branch }}' + OPENCV_FORCE_DNN_ENGINE: "4" + GTEST_FILTER_STRING: "*ORT*" + run: | + cd ${{ env.HOME }}/${{ env.MAIN_BUILD_DIR }} + xvfb-run -a bin/opencv_test_dnn \ + --gtest_filter="${{ env.GTEST_FILTER_STRING }}" \ + --test_threads=${{ env.OPENCV_FOR_THREADS_NUM }} \ + --skip_unstable=1 - if: ${{ always() && env.WARNINGS == '1' }} name: Warnings check From 24ad94509a5587ff5a940e1c75b449e50f0173e1 Mon Sep 17 00:00:00 2001 From: Abhishek Gola Date: Fri, 6 Mar 2026 13:40:50 +0530 Subject: [PATCH 3/9] removed unused file --- scripts/test-plan-5.x-ort.json | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 scripts/test-plan-5.x-ort.json diff --git a/scripts/test-plan-5.x-ort.json b/scripts/test-plan-5.x-ort.json deleted file mode 100644 index 377cbb9e..00000000 --- a/scripts/test-plan-5.x-ort.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "suites": { - "linux": [ - "opencv_test_dnn" - ], - "linux-contrib": [] - }, - "filters": { - "ubuntu-common": {}, - "ubuntu-avx2": {} - }, - "options": { - "default": { - "args": { - "test": "--skip_unstable=1 --gtest_filter=*ORT*" - }, - "env": { - "opencv_test_dnn": { - "OPENCV_FORCE_DNN_ENGINE": "4" - } - } - } - } -} \ No newline at end of file From 7d0ef9ac17c70aff9132ec205aec850528ceae4e Mon Sep 17 00:00:00 2001 From: Abhishek Gola Date: Fri, 6 Mar 2026 13:59:46 +0530 Subject: [PATCH 4/9] Code refactoring --- .github/workflows/OCV-PR-Linux-ORT.yaml | 31 ------------------------- 1 file changed, 31 deletions(-) diff --git a/.github/workflows/OCV-PR-Linux-ORT.yaml b/.github/workflows/OCV-PR-Linux-ORT.yaml index de4827ff..4be663dd 100644 --- a/.github/workflows/OCV-PR-Linux-ORT.yaml +++ b/.github/workflows/OCV-PR-Linux-ORT.yaml @@ -34,8 +34,6 @@ jobs: - id: determine-branches shell: bash run: | - # Industry Standard: Explicitly allow 5.x only. - # Logic: If repo is ci-gha-workflow OR the target PR branch is 5.x if [[ "${{ github.event.repository.name }}" == "ci-gha-workflow" || "${{ github.base_ref }}" == "5.x" ]]; then echo "branches=['5.x']" >> "$GITHUB_OUTPUT" else @@ -43,22 +41,16 @@ jobs: fi Ubuntu: - # runs-on: opencv-ru-lin-riscv runs-on: opencv-cn-lin-x86-64 needs: - branch_eval if: ${{ needs.branch_eval.outputs.branches != '[]' }} strategy: - # NOTE: Debugging - # fail-fast: true - # max-parallel: 3 fail-fast: false max-parallel: 3 matrix: version: - '24.04' - # TODO: enable later - # - '24.04_asan' branch: ${{ fromJSON(needs.branch_eval.outputs.branches )}} include: - version: '24.04' @@ -68,31 +60,16 @@ jobs: avx2: true gphoto2: true aravis: true - # TODO: enable later - # - version: '24.04_asan' - # image: '24.04:20250505' - # asan: true - # jpegxl: true - # avif: true - defaults: run: shell: bash container: image: 'quay.io/opencv-ci/opencv-ubuntu-${{ matrix.image }}' volumes: - # NOTE: RU config - # - /mnt/cache/git_cache:/opt/git_cache - # - /mnt/cache/ci_cache/opencv:/opt/.ccache - # - /mnt/cache/binaries_cache:/opt/binaries_cache - # - vol_dnn_models:/opt/dnn-models - # NOTE: CN config - /home/opencv-cn/git_cache:/opt/git_cache - /home/opencv-cn/ci_cache/opencv/${{ matrix.version }}:/opt/.ccache - /home/opencv-cn/binaries_cache/${{ matrix.version }}:/opt/binaries_cache - /home/opencv-cn/dnn-models:/opt/dnn-models - # NOTE: RU config - # options: '--user root:root' env: ANT_HOME: '/usr/share/ant' DNN_MODELS: '/opt/dnn-models' @@ -115,17 +92,10 @@ jobs: ${{ matrix.asan && '-DENABLE_OMIT_FRAME_POINTER=OFF -DCMAKE_CXX_FLAGS="-fsanitize=address"' }} HOME: ${{ contains(matrix.image, '24.04') && '/home/ubuntu' || '/home/ci' }} MAIN_BUILD_DIR: "build" - # NOTE: CN config OPENCV_FOR_THREADS_NUM: 8 CMAKE_BUILD_PARALLEL_LEVEL: 8 - # NOTE: RU config - # OPENCV_FOR_THREADS_NUM: 10 - # CMAKE_BUILD_PARALLEL_LEVEL: 20 - - # ========== steps: - - name: Checkout workflow repository uses: actions/checkout@v4 with: @@ -152,7 +122,6 @@ jobs: --dst '${{ env.DNN_MODELS }}/dnn' echo "OPENCV_DNN_TEST_DATA_PATH=${{ env.DNN_MODELS }}" >> $GITHUB_ENV - - name: Configure and build OpenCV uses: ./configure-and-build with: From 03b63e521fc62cb82161e0ea1094a6cdc9c64939 Mon Sep 17 00:00:00 2001 From: Abhishek Gola Date: Fri, 13 Mar 2026 16:10:35 +0530 Subject: [PATCH 5/9] warnings fix --- .github/workflows/OCV-PR-Linux-ORT.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/OCV-PR-Linux-ORT.yaml b/.github/workflows/OCV-PR-Linux-ORT.yaml index 4be663dd..c98cdee1 100644 --- a/.github/workflows/OCV-PR-Linux-ORT.yaml +++ b/.github/workflows/OCV-PR-Linux-ORT.yaml @@ -82,6 +82,7 @@ jobs: -DOPENCV_ENABLE_NONFREE=ON -DWITH_IMGCODEC_GIF=ON -DWITH_ONNXRUNTIME=ON + -DCMAKE_CXX_FLAGS="-Wno-suggest-override -Wno-sign-promo -Wno-array-bounds" ${{ matrix.jpegxl && '-DWITH_JPEGXL=ON' }} ${{ matrix.avif && '-DWITH_AVIF=ON' }} ${{ matrix.gphoto2 && '-DWITH_GPHOTO2=ON' }} @@ -123,6 +124,7 @@ jobs: echo "OPENCV_DNN_TEST_DATA_PATH=${{ env.DNN_MODELS }}" >> $GITHUB_ENV - name: Configure and build OpenCV + id: build-opencv uses: ./configure-and-build with: workdir: '${{ env.HOME }}' From 23204ac0bffb8531cb739ee448ba9fe7bee35b83 Mon Sep 17 00:00:00 2001 From: Abhishek Gola Date: Mon, 16 Mar 2026 14:05:12 +0530 Subject: [PATCH 6/9] fixed cmake flags --- .github/workflows/OCV-PR-Linux-ORT.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/OCV-PR-Linux-ORT.yaml b/.github/workflows/OCV-PR-Linux-ORT.yaml index c98cdee1..d7fe58b7 100644 --- a/.github/workflows/OCV-PR-Linux-ORT.yaml +++ b/.github/workflows/OCV-PR-Linux-ORT.yaml @@ -82,7 +82,7 @@ jobs: -DOPENCV_ENABLE_NONFREE=ON -DWITH_IMGCODEC_GIF=ON -DWITH_ONNXRUNTIME=ON - -DCMAKE_CXX_FLAGS="-Wno-suggest-override -Wno-sign-promo -Wno-array-bounds" + -DCMAKE_CXX_FLAGS_RELEASE="-Wno-suggest-override -Wno-sign-promo -Wno-array-bounds" ${{ matrix.jpegxl && '-DWITH_JPEGXL=ON' }} ${{ matrix.avif && '-DWITH_AVIF=ON' }} ${{ matrix.gphoto2 && '-DWITH_GPHOTO2=ON' }} From 637eef0600f491d1aaa1655eab581bb1ee8bebe8 Mon Sep 17 00:00:00 2001 From: vrooomy Date: Thu, 2 Apr 2026 19:19:31 +0530 Subject: [PATCH 7/9] remove 3rdparty options and moved warnings suppression to CMakelists.txt --- .github/workflows/OCV-PR-Linux-ORT.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/OCV-PR-Linux-ORT.yaml b/.github/workflows/OCV-PR-Linux-ORT.yaml index d7fe58b7..cea41ea0 100644 --- a/.github/workflows/OCV-PR-Linux-ORT.yaml +++ b/.github/workflows/OCV-PR-Linux-ORT.yaml @@ -55,11 +55,6 @@ jobs: include: - version: '24.04' image: '24.04:20251127' - jpegxl: true - avif: true - avx2: true - gphoto2: true - aravis: true defaults: run: shell: bash @@ -82,14 +77,6 @@ jobs: -DOPENCV_ENABLE_NONFREE=ON -DWITH_IMGCODEC_GIF=ON -DWITH_ONNXRUNTIME=ON - -DCMAKE_CXX_FLAGS_RELEASE="-Wno-suggest-override -Wno-sign-promo -Wno-array-bounds" - ${{ matrix.jpegxl && '-DWITH_JPEGXL=ON' }} - ${{ matrix.avif && '-DWITH_AVIF=ON' }} - ${{ matrix.gphoto2 && '-DWITH_GPHOTO2=ON' }} - ${{ matrix.aravis && '-DWITH_ARAVIS=ON' }} - ${{ matrix.avx2 && '-DCPU_BASELINE=AVX2'}} - ${{ matrix.plugins && '-DVIDEOIO_PLUGIN_LIST=all -DHIGHGUI_PLUGIN_LIST=all' }} - ${{ matrix.limited_api && '-DPYTHON3_LIMITED_API=ON' }} ${{ matrix.asan && '-DENABLE_OMIT_FRAME_POINTER=OFF -DCMAKE_CXX_FLAGS="-fsanitize=address"' }} HOME: ${{ contains(matrix.image, '24.04') && '/home/ubuntu' || '/home/ci' }} MAIN_BUILD_DIR: "build" From 31e78162726bfbd848c715d0b13fce39a0216a83 Mon Sep 17 00:00:00 2001 From: Abhishek Gola Date: Thu, 16 Apr 2026 18:19:26 +0530 Subject: [PATCH 8/9] removed matrix --- .github/workflows/OCV-PR-Linux-ORT.yaml | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/.github/workflows/OCV-PR-Linux-ORT.yaml b/.github/workflows/OCV-PR-Linux-ORT.yaml index cea41ea0..74c28b64 100644 --- a/.github/workflows/OCV-PR-Linux-ORT.yaml +++ b/.github/workflows/OCV-PR-Linux-ORT.yaml @@ -45,25 +45,15 @@ jobs: needs: - branch_eval if: ${{ needs.branch_eval.outputs.branches != '[]' }} - strategy: - fail-fast: false - max-parallel: 3 - matrix: - version: - - '24.04' - branch: ${{ fromJSON(needs.branch_eval.outputs.branches )}} - include: - - version: '24.04' - image: '24.04:20251127' defaults: run: shell: bash container: - image: 'quay.io/opencv-ci/opencv-ubuntu-${{ matrix.image }}' + image: 'quay.io/opencv-ci/opencv-ubuntu-24.04:20251127' volumes: - /home/opencv-cn/git_cache:/opt/git_cache - - /home/opencv-cn/ci_cache/opencv/${{ matrix.version }}:/opt/.ccache - - /home/opencv-cn/binaries_cache/${{ matrix.version }}:/opt/binaries_cache + - /home/opencv-cn/ci_cache/opencv/24.04:/opt/.ccache + - /home/opencv-cn/binaries_cache/24.04:/opt/binaries_cache - /home/opencv-cn/dnn-models:/opt/dnn-models env: ANT_HOME: '/usr/share/ant' @@ -72,13 +62,9 @@ jobs: CCACHE_MAXSIZE: '8G' OPENCV_DOWNLOAD_PATH: '/opt/binaries_cache' CMAKE_OPT: >- - -DBUILD_DOCS=ON - -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON - -DWITH_IMGCODEC_GIF=ON -DWITH_ONNXRUNTIME=ON - ${{ matrix.asan && '-DENABLE_OMIT_FRAME_POINTER=OFF -DCMAKE_CXX_FLAGS="-fsanitize=address"' }} - HOME: ${{ contains(matrix.image, '24.04') && '/home/ubuntu' || '/home/ci' }} + HOME: '/home/ubuntu' MAIN_BUILD_DIR: "build" OPENCV_FOR_THREADS_NUM: 8 CMAKE_BUILD_PARALLEL_LEVEL: 8 @@ -93,7 +79,7 @@ jobs: - name: Checkout and merge OpenCV uses: ./checkout-and-merge with: - target_branch: "${{ matrix.branch }}" + target_branch: "5.x" author: "${{ github.event.pull_request.user.login }}" source_branch: "${{ github.event.repository.name == 'ci-gha-workflow' && '' || github.head_ref }}" gitcache: '/opt/git_cache' From a0ea529a79a0fe01a0bf5e05f1493ec13de065dc Mon Sep 17 00:00:00 2001 From: Abhishek Gola Date: Mon, 20 Apr 2026 18:29:34 +0530 Subject: [PATCH 9/9] skipped conformance tests --- .github/workflows/OCV-PR-Linux-ORT.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/OCV-PR-Linux-ORT.yaml b/.github/workflows/OCV-PR-Linux-ORT.yaml index 74c28b64..3d7c69da 100644 --- a/.github/workflows/OCV-PR-Linux-ORT.yaml +++ b/.github/workflows/OCV-PR-Linux-ORT.yaml @@ -62,7 +62,6 @@ jobs: CCACHE_MAXSIZE: '8G' OPENCV_DOWNLOAD_PATH: '/opt/binaries_cache' CMAKE_OPT: >- - -DOPENCV_ENABLE_NONFREE=ON -DWITH_ONNXRUNTIME=ON HOME: '/home/ubuntu' MAIN_BUILD_DIR: "build" @@ -111,7 +110,7 @@ jobs: env: OPENCV_TEST_DATA_PATH: '${{ env.HOME }}/opencv_extra/testdata' OPENCV_FORCE_DNN_ENGINE: "4" - GTEST_FILTER_STRING: "*ORT*" + GTEST_FILTER_STRING: "*:-*conformance*" run: | cd ${{ env.HOME }}/${{ env.MAIN_BUILD_DIR }} xvfb-run -a bin/opencv_test_dnn \