From 766bad0035bcd2cc37e3aa24bb747192a2d82e11 Mon Sep 17 00:00:00 2001 From: alexlyulkov Date: Tue, 27 Aug 2024 17:23:11 +0300 Subject: [PATCH] Merge pull request #26053 from alexlyulkov:al/opencl-conformance-tests DNN(ONNX): Enabled several OpenCL conformance tests #26053 The tests also work in 5.x ### 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 - [x] 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. - [x] The feature is well documented and sample code can be built with the project CMake --- ...er_filter_opencv_ocl_fp16_denylist.inl.hpp | 30 ------------------- ...er_filter_opencv_ocl_fp32_denylist.inl.hpp | 13 -------- 2 files changed, 43 deletions(-) diff --git a/modules/dnn/test/test_onnx_conformance_layer_filter_opencv_ocl_fp16_denylist.inl.hpp b/modules/dnn/test/test_onnx_conformance_layer_filter_opencv_ocl_fp16_denylist.inl.hpp index 8dc970fe1e..ca2ffe42f1 100644 --- a/modules/dnn/test/test_onnx_conformance_layer_filter_opencv_ocl_fp16_denylist.inl.hpp +++ b/modules/dnn/test/test_onnx_conformance_layer_filter_opencv_ocl_fp16_denylist.inl.hpp @@ -2,20 +2,8 @@ "test_dequantizelinear", "test_dequantizelinear_axis", "test_dequantizelinear_blocked", -"test_dropout_default_ratio", -"test_globalmaxpool", -"test_globalmaxpool_precomputed", "test_logsoftmax_large_number", "test_logsoftmax_large_number_expanded", -"test_maxpool_1d_default", -"test_maxpool_2d_ceil", -"test_maxpool_2d_default", -"test_maxpool_2d_pads", -"test_maxpool_2d_precomputed_pads", -"test_maxpool_2d_precomputed_same_upper", -"test_maxpool_2d_precomputed_strides", -"test_maxpool_2d_same_upper", -"test_maxpool_2d_strides", "test_maxpool_3d_default", "test_pow", "test_quantizelinear", @@ -23,12 +11,7 @@ "test_quantizelinear_blocked", "test_softmax_large_number", "test_softmax_large_number_expanded", -"test_split_equal_parts_1d", -"test_split_equal_parts_2d", -"test_split_equal_parts_default_axis", "test_tan", -"test_reduce_l2_default_axes_keepdims_example", // Expected: (normL1) <= (l1), actual: 0.00490189 vs 0.004 -"test_reduce_log_sum_exp_default_axes_keepdims_example", // Expected: (normL1) <= (l1), actual: 0.00671387 vs 0.004 "test_reduce_prod_default_axes_keepdims_example", // Expected: (normL1) <= (l1), actual: inf vs 0.004 "test_reduce_prod_default_axes_keepdims_random", // Expected: (normL1) <= (l1), actual: 18.6621 vs 0.004, Expected: (normInf) <= (lInf), actual: 18.6621 vs 0.02 "test_reduce_prod_do_not_keepdims_random", // Expected: (normL1) <= (l1), actual: 0.00436729 vs 0.004, Expected: (normInf) <= (lInf), actual: 0.0201836 vs 0.02 @@ -38,16 +21,3 @@ "test_reduce_sum_square_do_not_keepdims_random", // Expected: (normL1) <= (l1), actual: 0.010789 vs 0.004, Expected: (normInf) <= (lInf), actual: 0.0290298 vs 0.02 "test_reduce_sum_square_keepdims_random", // Expected: (normL1) <= (l1), actual: 0.010789 vs 0.004, Expected: (normInf) <= (lInf), actual: 0.0290298 vs 0.02 "test_reduce_sum_square_negative_axes_keepdims_random", // Expected: (normL1) <= (l1), actual: 0.010789 vs 0.004, Expected: (normInf) <= (lInf), actual: 0.0290298 vs 0.02 -"test_scatter_elements_with_axis", -"test_scatter_elements_with_duplicate_indices", -"test_scatter_elements_with_negative_indices", -"test_scatter_elements_with_reduction_max", -"test_scatter_elements_with_reduction_min", -"test_scatter_elements_without_axis", -"test_scatter_with_axis", -"test_scatter_without_axis", -"test_scatternd", -"test_scatternd_add", -"test_scatternd_max", -"test_scatternd_min", -"test_scatternd_multiply", diff --git a/modules/dnn/test/test_onnx_conformance_layer_filter_opencv_ocl_fp32_denylist.inl.hpp b/modules/dnn/test/test_onnx_conformance_layer_filter_opencv_ocl_fp32_denylist.inl.hpp index 2453e2ad9f..99eb89409a 100644 --- a/modules/dnn/test/test_onnx_conformance_layer_filter_opencv_ocl_fp32_denylist.inl.hpp +++ b/modules/dnn/test/test_onnx_conformance_layer_filter_opencv_ocl_fp32_denylist.inl.hpp @@ -6,16 +6,3 @@ "test_quantizelinear", "test_quantizelinear_axis", "test_quantizelinear_blocked", -"test_scatter_elements_with_axis", -"test_scatter_elements_with_duplicate_indices", -"test_scatter_elements_with_negative_indices", -"test_scatter_elements_with_reduction_max", -"test_scatter_elements_with_reduction_min", -"test_scatter_elements_without_axis", -"test_scatter_with_axis", -"test_scatter_without_axis", -"test_scatternd", -"test_scatternd_add", -"test_scatternd_max", -"test_scatternd_min", -"test_scatternd_multiply",