From b7b6324aca1686c4278306e59cb5e74da913ac0f Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Fri, 27 Sep 2024 09:16:36 +0300 Subject: [PATCH 1/2] Added temporary steps to check all DNN engines. --- .github/workflows/OCV-PR-5.x-ARM64.yaml | 10 +++++++++- .github/workflows/OCV-PR-5.x-U20-Cuda.yaml | 14 ++++++++++---- .github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml | 12 ++++++++++-- .github/workflows/OCV-PR-5.x-U24.yaml | 12 ++++++++++-- .github/workflows/OCV-PR-5.x-W10.yaml | 10 +++++++++- 5 files changed, 48 insertions(+), 10 deletions(-) diff --git a/.github/workflows/OCV-PR-5.x-ARM64.yaml b/.github/workflows/OCV-PR-5.x-ARM64.yaml index f3d0770..3ffa79b 100644 --- a/.github/workflows/OCV-PR-5.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-5.x-ARM64.yaml @@ -132,10 +132,18 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_core --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy:dnn + - name: Accuracy: AUTO dnn timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} + - name: Accuracy: Classic dnn + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: export OPENCV_FORCE_DNN_ENGINE=1 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} + - name: Accuracy: New dnn + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: export OPENCV_FORCE_DNN_ENGINE=2 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - name: Accuracy:features2d timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} diff --git a/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml b/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml index 80e6805..e644e80 100644 --- a/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml +++ b/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml @@ -134,9 +134,15 @@ jobs: run: | cd $HOME/build ninja -j ${{ env.PARALLEL_JOBS }} | tee $HOME/build/build-log.txt - - name: Accuracy:dnn + - name: Accuracy: AUTO dnn timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} - run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=${{ env.PARALLEL_JOBS }} --gtest_filter=${{ env.GTEST_FILTER_STRING }} ${{ env.EXTRA_GTEST_OPTIONS }} - env: - GTEST_FILTER_STRING: '-Test_Model.TextRecognition/0:Test_Model.TextRecognition/1:Test_Model.TextRecognitionWithCTCPrefixBeamSearch/0:Test_Model.TextRecognitionWithCTCPrefixBeamSearch/1:Test_ONNX_layers.Convolution3D/1:Test_ONNX_layers.Convolution3D_bias/1:Test_ONNX_layers.Shape/0:Test_ONNX_layers.Shape/1:Test_ONNX_layers.Power/0:Test_ONNX_layers.Power/1:Test_ONNX_layers.Elementwise_Log/0:Test_ONNX_layers.Elementwise_Log/1:Test_ONNX_layers.Elementwise_not/0:Test_ONNX_layers.Elementwise_not/1:Test_ONNX_layers.Compare_EQ/0:Test_ONNX_layers.Compare_EQ/1:Test_ONNX_layers.Compare_GT/0:Test_ONNX_layers.Compare_GT/1:Test_ONNX_layers.Compare_LT/0:Test_ONNX_layers.Compare_LT/1:Test_ONNX_layers.Compare_GTorEQ/0:Test_ONNX_layers.Compare_GTorEQ/1:Test_ONNX_layers.Compare_LEorEQ/0:Test_ONNX_layers.Compare_LEorEQ/1:Test_ONNX_layers.Eltwise3D/0:Test_ONNX_layers.Eltwise3D/1:Test_ONNX_layers.PoolConv3D/1:Test_ONNX_layers.Div/0:Test_ONNX_layers.Div/1:Test_ONNX_layers.Split/0:Test_ONNX_layers.Split/1:Test_ONNX_layers.SubFromConst/0:Test_ONNX_layers.SubFromConst/1:Test_TensorFlow_layers.Convolution3D/1:Test_TensorFlow_layers.concat_3d/1:Test_ONNX_layers.LSTM_Activations/0:Test_ONNX_nets.LResNet100E_IR/1:Test_ONNX_nets.Emotion_ferplus/0:Test_ONNX_nets.Emotion_ferplus/1:Test_ONNX_nets.Resnet34_kinetics/1' + run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} + - name: Accuracy: Classic dnn + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: export OPENCV_FORCE_DNN_ENGINE=1 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} + - name: Accuracy: New dnn + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: export OPENCV_FORCE_DNN_ENGINE=2 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} diff --git a/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml b/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml index dd78abf..9c9d9fe 100644 --- a/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml +++ b/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml @@ -120,10 +120,18 @@ jobs: - name: Warnings check timeout-minutes: 60 run: cd $HOME/build && python3 $HOME/scripts/warnings-handling.py - - name: Accuracy:dnn + - name: Accuracy: AUTO dnn timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} - run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }} + run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} + - name: Accuracy: Classic dnn + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: export OPENCV_FORCE_DNN_ENGINE=1 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} + - name: Accuracy: New dnn + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: export OPENCV_FORCE_DNN_ENGINE=2 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - name: Accuracy:gapi timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} diff --git a/.github/workflows/OCV-PR-5.x-U24.yaml b/.github/workflows/OCV-PR-5.x-U24.yaml index 6fb32a8..de6136b 100644 --- a/.github/workflows/OCV-PR-5.x-U24.yaml +++ b/.github/workflows/OCV-PR-5.x-U24.yaml @@ -131,10 +131,18 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_core --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy:dnn + - name: Accuracy: AUTO dnn timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} - run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }} + run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} + - name: Accuracy: Classic dnn + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: export OPENCV_FORCE_DNN_ENGINE=1 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} + - name: Accuracy: New dnn + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: export OPENCV_FORCE_DNN_ENGINE=2 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - name: Accuracy:features2d timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} diff --git a/.github/workflows/OCV-PR-5.x-W10.yaml b/.github/workflows/OCV-PR-5.x-W10.yaml index 3287e4c..75910f9 100644 --- a/.github/workflows/OCV-PR-5.x-W10.yaml +++ b/.github/workflows/OCV-PR-5.x-W10.yaml @@ -124,10 +124,18 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd ${{ github.workspace }}\build && bin\opencv_test_core.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS% - - name: Accuracy:dnn + - name: Accuracy:dnn AUTO timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd ${{ github.workspace }}\build && bin\opencv_test_dnn.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS% + - name: Accuracy:dnn Classic + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: set OPENCV_FORCE_DNN_ENGINE=1 && cd ${{ github.workspace }}\build && bin\opencv_test_dnn.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS% + - name: Accuracy:dnn New + timeout-minutes: 60 + if: ${{ always() && steps.build-opencv.outcome == 'success' }} + run: set OPENCV_FORCE_DNN_ENGINE=2 && cd ${{ github.workspace }}\build && bin\opencv_test_dnn.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS% - name: Accuracy:features2d timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} From effc399ac71669d08ec49a45dcc54cf9f4e5bec9 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Fri, 27 Sep 2024 11:54:14 +0300 Subject: [PATCH 2/2] Syntax fix. --- .github/workflows/OCV-PR-5.x-ARM64.yaml | 6 +++--- .github/workflows/OCV-PR-5.x-U20-Cuda.yaml | 6 +++--- .github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml | 6 +++--- .github/workflows/OCV-PR-5.x-U24.yaml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/OCV-PR-5.x-ARM64.yaml b/.github/workflows/OCV-PR-5.x-ARM64.yaml index 3ffa79b..8e6a686 100644 --- a/.github/workflows/OCV-PR-5.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-5.x-ARM64.yaml @@ -132,15 +132,15 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_core --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy: AUTO dnn + - name: Accuracy:DNN_AUTO timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy: Classic dnn + - name: Accuracy:DNN_Classic timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: export OPENCV_FORCE_DNN_ENGINE=1 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy: New dnn + - name: Accuracy:DNN_New timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: export OPENCV_FORCE_DNN_ENGINE=2 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} diff --git a/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml b/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml index e644e80..848c128 100644 --- a/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml +++ b/.github/workflows/OCV-PR-5.x-U20-Cuda.yaml @@ -134,15 +134,15 @@ jobs: run: | cd $HOME/build ninja -j ${{ env.PARALLEL_JOBS }} | tee $HOME/build/build-log.txt - - name: Accuracy: AUTO dnn + - name: Accuracy:DNN_AUTO timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy: Classic dnn + - name: Accuracy:DNN_Classic timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: export OPENCV_FORCE_DNN_ENGINE=1 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy: New dnn + - name: Accuracy:DNN_New timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: export OPENCV_FORCE_DNN_ENGINE=2 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} diff --git a/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml b/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml index 9c9d9fe..401eb7f 100644 --- a/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml +++ b/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml @@ -120,15 +120,15 @@ jobs: - name: Warnings check timeout-minutes: 60 run: cd $HOME/build && python3 $HOME/scripts/warnings-handling.py - - name: Accuracy: AUTO dnn + - name: Accuracy:DNN_AUTO timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy: Classic dnn + - name: Accuracy:DNN_Classic timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: export OPENCV_FORCE_DNN_ENGINE=1 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy: New dnn + - name: Accuracy:DNN_New timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: export OPENCV_FORCE_DNN_ENGINE=2 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} diff --git a/.github/workflows/OCV-PR-5.x-U24.yaml b/.github/workflows/OCV-PR-5.x-U24.yaml index de6136b..6b20145 100644 --- a/.github/workflows/OCV-PR-5.x-U24.yaml +++ b/.github/workflows/OCV-PR-5.x-U24.yaml @@ -131,15 +131,15 @@ jobs: timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_core --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy: AUTO dnn + - name: Accuracy:DNN_AUTO timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy: Classic dnn + - name: Accuracy:DNN_Classic timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: export OPENCV_FORCE_DNN_ENGINE=1 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} - - name: Accuracy: New dnn + - name: Accuracy:DNN_New timeout-minutes: 60 if: ${{ always() && steps.build-opencv.outcome == 'success' }} run: export OPENCV_FORCE_DNN_ENGINE=2 && cd $HOME/build && xvfb-run -a bin/opencv_test_dnn --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }}