Skip to content

Commit 30f2003

Browse files
asmorkalovasmorkalov
committed
Rename features2d to features.
1 parent a36742c commit 30f2003

14 files changed

+78
-78
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ jobs:
167167
timeout-minutes: 60
168168
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
169169
run: cd $HOME/build && xvfb-run -a bin/opencv_test_face --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
170-
- name: Accuracy:features2d
170+
- name: Accuracy:features
171171
timeout-minutes: 60
172172
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
173-
run: cd $HOME/build && xvfb-run -a bin/opencv_test_features2d --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
173+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_features --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
174174
- name: Accuracy:flann
175175
timeout-minutes: 60
176176
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -299,10 +299,10 @@ jobs:
299299
timeout-minutes: 60
300300
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
301301
run: cd $HOME/build && xvfb-run -a bin/opencv_test_wechat_qrcode --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
302-
- name: Accuracy:xfeatures2d
302+
- name: Accuracy:xfeatures
303303
timeout-minutes: 60
304304
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
305-
run: cd $HOME/build && xvfb-run -a bin/opencv_test_xfeatures2d --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
305+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_xfeatures --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
306306
- name: Accuracy:ximgproc
307307
timeout-minutes: 60
308308
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -343,10 +343,10 @@ jobs:
343343
timeout-minutes: 60
344344
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
345345
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_dnn_superres --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 }}
346-
- name: Performance:features2d
346+
- name: Performance:features
347347
timeout-minutes: 60
348348
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
349-
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_features2d --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 }}
349+
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_features --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 }}
350350
- name: Performance:imgcodecs
351351
timeout-minutes: 60
352352
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -399,10 +399,10 @@ jobs:
399399
timeout-minutes: 60
400400
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
401401
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_videoio --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 }}
402-
- name: Performance:xfeatures2d
402+
- name: Performance:xfeatures
403403
timeout-minutes: 60
404404
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
405-
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xfeatures2d --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 }}
405+
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xfeatures --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 }}
406406
- name: Performance:ximgproc
407407
timeout-minutes: 60
408408
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ jobs:
166166
timeout-minutes: 60
167167
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
168168
run: cd $HOME/build && xvfb-run -a bin/opencv_test_face --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
169-
- name: Accuracy:features2d
169+
- name: Accuracy:features
170170
timeout-minutes: 60
171171
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
172-
run: cd $HOME/build && xvfb-run -a bin/opencv_test_features2d --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
172+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_features --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
173173
- name: Accuracy:flann
174174
timeout-minutes: 60
175175
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -302,10 +302,10 @@ jobs:
302302
timeout-minutes: 60
303303
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
304304
run: cd $HOME/build && xvfb-run -a bin/opencv_test_wechat_qrcode --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
305-
- name: Accuracy:xfeatures2d
305+
- name: Accuracy:xfeatures
306306
timeout-minutes: 60
307307
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
308-
run: cd $HOME/build && xvfb-run -a bin/opencv_test_xfeatures2d --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
308+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_xfeatures --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
309309
- name: Accuracy:ximgproc
310310
timeout-minutes: 60
311311
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -350,10 +350,10 @@ jobs:
350350
timeout-minutes: 60
351351
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
352352
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_dnn_superres --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
353-
- name: Performance:features2d
353+
- name: Performance:features
354354
timeout-minutes: 60
355355
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
356-
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
356+
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_features --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
357357
- name: Performance:gapi
358358
timeout-minutes: 60
359359
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -410,10 +410,10 @@ jobs:
410410
timeout-minutes: 60
411411
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
412412
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_videoio --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
413-
- name: Performance:xfeatures2d
413+
- name: Performance:xfeatures
414414
timeout-minutes: 60
415415
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
416-
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xfeatures2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
416+
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xfeatures --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
417417
- name: Performance:ximgproc
418418
timeout-minutes: 60
419419
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ jobs:
169169
timeout-minutes: 60
170170
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
171171
run: cd $HOME/build && xvfb-run -a bin/opencv_test_face --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
172-
- name: Accuracy:features2d
172+
- name: Accuracy:features
173173
timeout-minutes: 60
174174
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
175-
run: cd $HOME/build && xvfb-run -a bin/opencv_test_features2d --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
175+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_features --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
176176
- name: Accuracy:flann
177177
timeout-minutes: 60
178178
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -305,10 +305,10 @@ jobs:
305305
timeout-minutes: 60
306306
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
307307
run: cd $HOME/build && xvfb-run -a bin/opencv_test_wechat_qrcode --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
308-
- name: Accuracy:xfeatures2d
308+
- name: Accuracy:xfeatures
309309
timeout-minutes: 60
310310
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
311-
run: cd $HOME/build && xvfb-run -a bin/opencv_test_xfeatures2d --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
311+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_xfeatures --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }} ${{ env.EXTRA_GTEST_OPTIONS }}
312312
- name: Accuracy:ximgproc
313313
timeout-minutes: 60
314314
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -353,10 +353,10 @@ jobs:
353353
timeout-minutes: 60
354354
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
355355
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_dnn_superres --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
356-
- name: Performance:features2d
356+
- name: Performance:features
357357
timeout-minutes: 60
358358
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
359-
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
359+
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_features --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
360360
- name: Performance:gapi
361361
timeout-minutes: 60
362362
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -413,10 +413,10 @@ jobs:
413413
timeout-minutes: 60
414414
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
415415
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_videoio --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
416-
- name: Performance:xfeatures2d
416+
- name: Performance:xfeatures
417417
timeout-minutes: 60
418418
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
419-
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xfeatures2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
419+
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xfeatures --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
420420
- name: Performance:ximgproc
421421
timeout-minutes: 60
422422
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ jobs:
159159
timeout-minutes: 60
160160
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
161161
run: cd ${{ github.workspace }}\build && bin\opencv_test_face.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
162-
- name: Accuracy:features2d
162+
- name: Accuracy:features
163163
timeout-minutes: 60
164164
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
165-
run: cd ${{ github.workspace }}\build && bin\opencv_test_features2d.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
165+
run: cd ${{ github.workspace }}\build && bin\opencv_test_features.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
166166
- name: Accuracy:flann
167167
timeout-minutes: 60
168168
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -289,10 +289,10 @@ jobs:
289289
timeout-minutes: 60
290290
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
291291
run: cd ${{ github.workspace }}\build && bin\opencv_test_wechat_qrcode.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
292-
- name: Accuracy:xfeatures2d
292+
- name: Accuracy:xfeatures
293293
timeout-minutes: 60
294294
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
295-
run: cd ${{ github.workspace }}\build && bin\opencv_test_xfeatures2d.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
295+
run: cd ${{ github.workspace }}\build && bin\opencv_test_xfeatures.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
296296
- name: Accuracy:ximgproc
297297
timeout-minutes: 60
298298
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -337,10 +337,10 @@ jobs:
337337
timeout-minutes: 60
338338
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
339339
run: cd ${{ github.workspace }}\build && bin\opencv_perf_dnn_superres.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%
340-
- name: Performance:features2d
340+
- name: Performance:features
341341
timeout-minutes: 60
342342
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
343-
run: cd ${{ github.workspace }}\build && bin\opencv_perf_features2d.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%
343+
run: cd ${{ github.workspace }}\build && bin\opencv_perf_features.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%
344344
- name: Performance:gapi
345345
timeout-minutes: 60
346346
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
@@ -397,10 +397,10 @@ jobs:
397397
timeout-minutes: 60
398398
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
399399
run: cd ${{ github.workspace }}\build && bin\opencv_perf_videoio.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%
400-
- name: Performance:xfeatures2d
400+
- name: Performance:xfeatures
401401
timeout-minutes: 60
402402
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
403-
run: cd ${{ github.workspace }}\build && bin\opencv_perf_xfeatures2d.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%
403+
run: cd ${{ github.workspace }}\build && bin\opencv_perf_xfeatures.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%
404404
- name: Performance:ximgproc
405405
timeout-minutes: 60
406406
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

0 commit comments

Comments
 (0)