WebNN: Allow 0-D (scalar) reductions

crrev.com/c/5496321 added a restriction on the reduction ops (including argMin/argMax) that the rank of the input tensor must be greater than zero. In webmachinelearning/webnn#681, @fdwr points out that 0-D (scalar) reductions are fine, it's just a no-op. Per that discussion, this removes a restriction. There are already WPT cases for argMin/argMax (although they fail for other reasons); cases are added for the plethora of reduction ops (which also fail for other reasons). Change-Id: Ib10a9b0bb3062f9d2b6001d9a4963b14e751d14f
web-platform-tests · May 10, 2024 · 08d79f3 · 08d79f3
1 parent 2478ccc
commit 08d79f3
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 10 deletions.
diff --git a/webnn/resources/test_data/reduce_l1.json b/webnn/resources/test_data/reduce_l1.json
@@ -1,5 +1,23 @@
 {
   "tests": [
+    {
+      "name": "reduceL1 float32 0D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            5.508826448139126
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 5.508826448139126,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceL1 float32 1D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
       "inputs": {
@@ -742,4 +760,4 @@
       }
     }
   ]
-}
+}
diff --git a/webnn/resources/test_data/reduce_l2.json b/webnn/resources/test_data/reduce_l2.json
@@ -1,5 +1,23 @@
 {
   "tests": [
+    {
+      "name": "reduceL2 float32 0D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            4.860227954324237
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 4.860227954324237,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceL2 float32 1D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
       "inputs": {
@@ -742,4 +760,4 @@
       }
     }
   ]
-}
+}
diff --git a/webnn/resources/test_data/reduce_log_sum.json b/webnn/resources/test_data/reduce_log_sum.json
@@ -1,5 +1,23 @@
 {
   "tests": [
+    {
+      "name": "reduceLogSum float32 0D constant tensor all non-negative default options", // default options: {axes: null, keepDimensions: false}
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            64.54826901463852
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 64.54826901463852,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceLogSum float32 1D constant tensor all non-negative default options", // default options: {axes: null, keepDimensions: false}
       "inputs": {
@@ -662,4 +680,4 @@
       }
     }
   ]
-}
+}
diff --git a/webnn/resources/test_data/reduce_log_sum_exp.json b/webnn/resources/test_data/reduce_log_sum_exp.json
@@ -1,5 +1,23 @@
 {
   "tests": [
+    {
+      "name": "reduceLogSumExp float32 0D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            0.7974132976078829
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 0.7974132976078829,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceLogSumExp float32 1D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
       "inputs": {
@@ -742,4 +760,4 @@
       }
     }
   ]
-}
+}
diff --git a/webnn/resources/test_data/reduce_max.json b/webnn/resources/test_data/reduce_max.json
@@ -1,5 +1,23 @@
 {
   "tests": [
+    {
+      "name": "reduceMax float32 0D constant tensor default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            32.166585683408215
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 32.166585683408215,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceMax float32 1D constant tensor default options",
       "inputs": {
@@ -622,4 +640,4 @@
       }
     }
   ]
-}
+}
diff --git a/webnn/resources/test_data/reduce_mean.json b/webnn/resources/test_data/reduce_mean.json
@@ -1,5 +1,23 @@
 {
   "tests": [
+    {
+      "name": "reduceMean float32 0D constant tensor all positive default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            95.84498772347054
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 95.84498772347054,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceMean float32 1D constant tensor all positive default options",
       "inputs": {
@@ -734,4 +752,4 @@
       }
     }
   ]
-}
+}
diff --git a/webnn/resources/test_data/reduce_min.json b/webnn/resources/test_data/reduce_min.json
@@ -1,5 +1,23 @@
 {
   "tests": [
+    {
+      "name": "reduceMin float32 0D constant tensor default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            -58.76195671214997
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": -58.76195671214997,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceMin float32 1D constant tensor default options",
       "inputs": {
@@ -622,4 +640,4 @@
       }
     }
   ]
-}
+}
diff --git a/webnn/resources/test_data/reduce_product.json b/webnn/resources/test_data/reduce_product.json
@@ -1,5 +1,23 @@
 {
   "tests": [
+    {
+      "name": "reduceProduct float32 0D constant tensor default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            -68.75911760233478
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": -68.75911760233478,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceProduct float32 1D constant tensor default options",
       "inputs": {
@@ -622,4 +640,4 @@
       }
     }
   ]
-}
+}
diff --git a/webnn/resources/test_data/reduce_sum.json b/webnn/resources/test_data/reduce_sum.json
@@ -1,5 +1,23 @@
 {
   "tests": [
+    {
+      "name": "reduceSum float32 0D constant tensor all positive default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            69.6038605453285
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 69.6038605453285,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceSum float32 1D constant tensor all positive default options",
       "inputs": {
@@ -734,4 +752,4 @@
       }
     }
   ]
-}
+}
diff --git a/webnn/resources/test_data/reduce_sum_square.json b/webnn/resources/test_data/reduce_sum_square.json
@@ -1,5 +1,23 @@
 {
   "tests": [
+    {
+      "name": "reduceSumSquare float32 0D constant tensor all positive default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            52.5615351837915
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 52.5615351837915,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceSumSquare float32 1D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
       "inputs": {
@@ -742,4 +760,4 @@
       }
     }
   ]
-}
+}