Merge pull request #22529 from fengyuentau:scatter_scatternd

DNN: supports Scatter and ScatterND from ONNX

modules/dnn/test/test_onnx_conformance.cpp

@@ -666,11 +666,15 @@ static const TestCase testConformanceConfig[] = {
     {"test_scatter_elements_with_axis", 3, 1},
     {"test_scatter_elements_with_duplicate_indices", 3, 1},
     {"test_scatter_elements_with_negative_indices", 3, 1},
+    {"test_scatter_elements_with_reduction_max", 3, 1},
+    {"test_scatter_elements_with_reduction_min", 3, 1},
     {"test_scatter_elements_without_axis", 3, 1},
     {"test_scatter_with_axis", 3, 1},
     {"test_scatter_without_axis", 3, 1},
     {"test_scatternd", 3, 1},
     {"test_scatternd_add", 3, 1},
+    {"test_scatternd_max", 3, 1},
+    {"test_scatternd_min", 3, 1},
     {"test_scatternd_multiply", 3, 1},
     {"test_sce_NCd1_mean_weight_negative_ii", 3, 1},
     {"test_sce_NCd1_mean_weight_negative_ii_expanded", 3, 1},

modules/dnn/test/test_onnx_conformance_layer_filter__cuda_denylist.inl.hpp

@@ -82,3 +82,16 @@
 "test_sub_uint8",
 "test_tan",  // FP16 only
 "test_upsample_nearest",
+"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",

modules/dnn/test/test_onnx_conformance_layer_filter__halide_denylist.inl.hpp

@@ -95,3 +95,16 @@
 "test_sub_uint8",
 "test_tanh",
 "test_upsample_nearest",
+"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",

modules/dnn/test/test_onnx_conformance_layer_filter__openvino.inl.hpp

@@ -1588,6 +1588,10 @@ CASE(test_scatter_elements_with_duplicate_indices)
     // no filter
 CASE(test_scatter_elements_with_negative_indices)
     // no filter
+CASE(test_scatter_elements_with_reduction_max)
+    // no filter
+CASE(test_scatter_elements_with_reduction_min)
+    // no filter
 CASE(test_scatter_elements_without_axis)
     // no filter
 CASE(test_scatter_with_axis)
@@ -1598,6 +1602,10 @@ CASE(test_scatternd)
     // no filter
 CASE(test_scatternd_add)
     // no filter
+CASE(test_scatternd_max)
+    // no filter
+CASE(test_scatternd_min)
+    // no filter
 CASE(test_scatternd_multiply)
     // no filter
 CASE(test_sce_NCd1_mean_weight_negative_ii)

modules/dnn/test/test_onnx_conformance_layer_filter__vulkan_denylist.inl.hpp

@@ -63,3 +63,16 @@
 "test_sub_uint8",
 "test_transpose_all_permutations_0",
 "test_upsample_nearest",
+"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",

modules/dnn/test/test_onnx_conformance_layer_filter_opencv_ocl_fp16_denylist.inl.hpp

@@ -30,4 +30,17 @@
 "test_reduce_sum_square_default_axes_keepdims_random", // Expected: (normL1) <= (l1), actual: 0.0183411 vs 0.004
 "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_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",

modules/dnn/test/test_onnx_conformance_layer_filter_opencv_ocl_fp32_denylist.inl.hpp

@@ -1,2 +1,15 @@
 "test_averagepool_3d_default",
 "test_maxpool_3d_default",
+"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",

modules/dnn/test/test_onnx_conformance_layer_parser_denylist.inl.hpp

@@ -384,15 +384,6 @@
 "test_roialign_aligned_true",
 "test_scan9_sum",
 "test_scan_sum",
-"test_scatter_elements_with_axis",
-"test_scatter_elements_with_duplicate_indices",
-"test_scatter_elements_with_negative_indices",
-"test_scatter_elements_without_axis",
-"test_scatter_with_axis",
-"test_scatter_without_axis",
-"test_scatternd",
-"test_scatternd_add",
-"test_scatternd_multiply",
 "test_sce_NCd1_mean_weight_negative_ii",
 "test_sce_NCd1_mean_weight_negative_ii_expanded",
 "test_sce_NCd1_mean_weight_negative_ii_log_prob",