Skip to content

Commit 24ce29b

Browse files
authored
Move objdetect HaarCascadeClassifier and HOGDescriptor to contrib xobjdetect (#163)
* Move objdetect parts to contrib xobjdetect, revise the workflows. * empty commit
1 parent a864c59 commit 24ce29b

6 files changed

+52
-0
lines changed

.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,10 @@ jobs:
307307
timeout-minutes: 60
308308
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
309309
run: cd $HOME/build && xvfb-run -a bin/opencv_test_ximgproc --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
310+
- name: Accuracy:xobjdetect
311+
timeout-minutes: 60
312+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
313+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_xobjdetect --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
310314
- name: Accuracy:xphoto
311315
timeout-minutes: 60
312316
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -403,6 +407,10 @@ jobs:
403407
timeout-minutes: 60
404408
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
405409
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_ximgproc --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=${{ env.PARALLEL_JOBS }}
410+
- name: Performance:xobjdetect
411+
timeout-minutes: 60
412+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
413+
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xobjdetect --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=${{ env.PARALLEL_JOBS }}
406414
- name: Performance:xphoto
407415
timeout-minutes: 60
408416
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

.github/workflows/OCV-Contrib-PR-5.x-U20.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,10 @@ jobs:
310310
timeout-minutes: 60
311311
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
312312
run: cd $HOME/build && xvfb-run -a bin/opencv_test_ximgproc --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
313+
- name: Accuracy:xobjdetect
314+
timeout-minutes: 60
315+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
316+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_xobjdetect --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
313317
- name: Accuracy:xphoto
314318
timeout-minutes: 60
315319
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -414,6 +418,10 @@ jobs:
414418
timeout-minutes: 60
415419
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
416420
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_ximgproc --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
421+
- name: Performance:xobjdetect
422+
timeout-minutes: 60
423+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
424+
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xobjdetect --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
417425
- name: Performance:xphoto
418426
timeout-minutes: 60
419427
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

.github/workflows/OCV-Contrib-PR-5.x-U22.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,10 @@ jobs:
313313
timeout-minutes: 60
314314
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
315315
run: cd $HOME/build && xvfb-run -a bin/opencv_test_ximgproc --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
316+
- name: Accuracy:xobjdetect
317+
timeout-minutes: 60
318+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
319+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_xobjdetect --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
316320
- name: Accuracy:xphoto
317321
timeout-minutes: 60
318322
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -417,6 +421,10 @@ jobs:
417421
timeout-minutes: 60
418422
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
419423
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_ximgproc --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
424+
- name: Performance:xobjdetect
425+
timeout-minutes: 60
426+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
427+
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xobjdetect --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
420428
- name: Performance:xphoto
421429
timeout-minutes: 60
422430
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

.github/workflows/OCV-Contrib-PR-5.x-W10.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,10 @@ jobs:
297297
timeout-minutes: 60
298298
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
299299
run: cd ${{ github.workspace }}\build && bin\opencv_test_ximgproc.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
300+
- name: Accuracy:xobjdetect
301+
timeout-minutes: 60
302+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
303+
run: cd ${{ github.workspace }}\build && bin\opencv_test_xobjdetect.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
300304
- name: Accuracy:xphoto
301305
timeout-minutes: 60
302306
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -401,6 +405,10 @@ jobs:
401405
timeout-minutes: 60
402406
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
403407
run: cd ${{ github.workspace }}\build && bin\opencv_perf_ximgproc.exe --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=%PARALLEL_JOBS%
408+
- name: Performance:xobjdetect
409+
timeout-minutes: 60
410+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
411+
run: cd ${{ github.workspace }}\build && bin\opencv_perf_xobjdetect.exe --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=%PARALLEL_JOBS%
404412
- name: Performance:xphoto
405413
timeout-minutes: 60
406414
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

.github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,11 @@ jobs:
345345
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
346346
run: ./bin/opencv_test_ximgproc --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
347347
working-directory: ${{ github.workspace }}/build
348+
- name: Accuracy:xobjdetect
349+
timeout-minutes: 60
350+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
351+
run: ./bin/opencv_test_xobjdetect --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
352+
working-directory: ${{ github.workspace }}/build
348353
- name: Accuracy:xphoto
349354
timeout-minutes: 60
350355
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -475,6 +480,11 @@ jobs:
475480
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
476481
run: ./bin/opencv_perf_ximgproc --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS
477482
working-directory: ${{ github.workspace }}/build
483+
- name: Performance:xobjdetect
484+
timeout-minutes: 60
485+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
486+
run: ./bin/opencv_perf_xobjdetect --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS
487+
working-directory: ${{ github.workspace }}/build
478488
- name: Performance:xphoto
479489
timeout-minutes: 60
480490
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

.github/workflows/OCV-Contrib-PR-5.x-macOS-x86_64.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,11 @@ jobs:
347347
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
348348
run: ./bin/opencv_test_ximgproc --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
349349
working-directory: ${{ github.workspace }}/build
350+
- name: Accuracy:xobjdetect
351+
timeout-minutes: 60
352+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
353+
run: ./bin/opencv_test_xobjdetect --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
354+
working-directory: ${{ github.workspace }}/build
350355
- name: Accuracy:xphoto
351356
timeout-minutes: 60
352357
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -477,6 +482,11 @@ jobs:
477482
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
478483
run: ./bin/opencv_perf_ximgproc --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS
479484
working-directory: ${{ github.workspace }}/build
485+
- name: Performance:xobjdetect
486+
timeout-minutes: 60
487+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
488+
run: ./bin/opencv_perf_xobjdetect --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=$PARALLEL_JOBS
489+
working-directory: ${{ github.workspace }}/build
480490
- name: Performance:xphoto
481491
timeout-minutes: 60
482492
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

0 commit comments

Comments
 (0)