From 98a2e694335df790591d47515491c1194034c187 Mon Sep 17 00:00:00 2001
From: Joshua Bell <jsbell@chromium.org>
Date: Wed, 15 May 2024 10:07:12 -0700
Subject: [PATCH] WebNN: Allow 0-D (scalar) reductions

crrev.com/c/5448942 added a restriction on the reduction ops
(including argMin/argMax) that the rank of the input tensor must be
greater than zero.

In https://github.com/webmachinelearning/webnn/issues/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
Cq-Include-Trybots: luci.chromium.try:mac14-blink-rel,mac14.arm64-blink-rel,win11-blink-rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5529350
Reviewed-by: Phillis Tang <phillis@chromium.org>
Reviewed-by: ningxin hu <ningxin.hu@intel.com>
Commit-Queue: Joshua Bell <jsbell@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1301369}
---
 webnn/resources/test_data/reduce_l1.json      | 39 +++++++++++++++++++
 webnn/resources/test_data/reduce_l2.json      | 39 +++++++++++++++++++
 webnn/resources/test_data/reduce_log_sum.json | 39 +++++++++++++++++++
 .../test_data/reduce_log_sum_exp.json         | 39 +++++++++++++++++++
 webnn/resources/test_data/reduce_max.json     | 39 +++++++++++++++++++
 webnn/resources/test_data/reduce_mean.json    | 39 +++++++++++++++++++
 webnn/resources/test_data/reduce_min.json     | 39 +++++++++++++++++++
 webnn/resources/test_data/reduce_product.json | 39 +++++++++++++++++++
 webnn/resources/test_data/reduce_sum.json     | 39 +++++++++++++++++++
 .../test_data/reduce_sum_square.json          | 39 +++++++++++++++++++
 webnn/resources/utils.js                      |  6 +--
 11 files changed, 393 insertions(+), 3 deletions(-)

diff --git a/webnn/resources/test_data/reduce_l1.json b/webnn/resources/test_data/reduce_l1.json
index c3f2b618e9b0eb..7637c02be23ce2 100644
--- a/webnn/resources/test_data/reduce_l1.json
+++ b/webnn/resources/test_data/reduce_l1.json
@@ -1,5 +1,44 @@
 {
   "tests": [
+    {
+      "name": "reduceL1 float32 0D constant tensor default options", // default options: {axes: null, keepDimensions: false}
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            5.50882625579834
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 5.50882625579834,
+        "type": "float32"
+      }
+    },
+    {
+      "name": "reduceL1 float32 0D constant tensor empty axes",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            5.50882625579834
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "options": {
+        "axes": []
+      },
+      "expected": {
+        "name": "output",
+        "data": 5.50882625579834,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceL1 float32 1D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
       "inputs": {
diff --git a/webnn/resources/test_data/reduce_l2.json b/webnn/resources/test_data/reduce_l2.json
index d83eea9dfb93e8..b4d270a701927e 100644
--- a/webnn/resources/test_data/reduce_l2.json
+++ b/webnn/resources/test_data/reduce_l2.json
@@ -1,5 +1,44 @@
 {
   "tests": [
+    {
+      "name": "reduceL2 float32 0D constant tensor default options", // default options: {axes: null, keepDimensions: false}
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            4.860228061676025
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 4.860228061676025,
+        "type": "float32"
+      }
+    },
+    {
+      "name": "reduceL2 float32 0D constant tensor empty axes",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            4.860228061676025
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "options": {
+        "axes": []
+      },
+      "expected": {
+        "name": "output",
+        "data": 4.860228061676025,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceL2 float32 1D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
       "inputs": {
diff --git a/webnn/resources/test_data/reduce_log_sum.json b/webnn/resources/test_data/reduce_log_sum.json
index 061e12ad516523..f3de240e458ea3 100644
--- a/webnn/resources/test_data/reduce_log_sum.json
+++ b/webnn/resources/test_data/reduce_log_sum.json
@@ -1,5 +1,44 @@
 {
   "tests": [
+    {
+      "name": "reduceLogSum float32 0D constant tensor default options", // default options: {axes: null, keepDimensions: false}
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            64.54827117919922
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 4.167413234710693,
+        "type": "float32"
+      }
+    },
+    {
+      "name": "reduceLogSum float32 0D constant tensor empty axes",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            64.54827117919922
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "options": {
+        "axes": []
+      },
+      "expected": {
+        "name": "output",
+        "data": 4.167413234710693,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceLogSum float32 1D constant tensor all non-negative default options", // default options: {axes: null, keepDimensions: false}
       "inputs": {
diff --git a/webnn/resources/test_data/reduce_log_sum_exp.json b/webnn/resources/test_data/reduce_log_sum_exp.json
index 3577d6aa9ee521..b999a567aa5bb2 100644
--- a/webnn/resources/test_data/reduce_log_sum_exp.json
+++ b/webnn/resources/test_data/reduce_log_sum_exp.json
@@ -1,5 +1,44 @@
 {
   "tests": [
+    {
+      "name": "reduceLogSumExp float32 0D constant tensor default options", // default options: {axes: null, keepDimensions: false}
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            0.7974132895469666
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 0.7974132895469666,
+        "type": "float32"
+      }
+    },
+    {
+      "name": "reduceLogSumExp float32 0D constant tensor empty axes",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            0.7974132895469666
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "options": {
+        "axes": []
+      },
+      "expected": {
+        "name": "output",
+        "data": 0.7974132895469666,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceLogSumExp float32 1D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
       "inputs": {
diff --git a/webnn/resources/test_data/reduce_max.json b/webnn/resources/test_data/reduce_max.json
index 11ed0ed9191474..6cd55492692dc9 100644
--- a/webnn/resources/test_data/reduce_max.json
+++ b/webnn/resources/test_data/reduce_max.json
@@ -1,5 +1,44 @@
 {
   "tests": [
+    {
+      "name": "reduceMax float32 0D constant tensor default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            32.16658401489258
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 32.16658401489258,
+        "type": "float32"
+      }
+    },
+    {
+      "name": "reduceMax float32 0D constant tensor empty axes",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            32.16658401489258
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "options": {
+        "axes": []
+      },
+      "expected": {
+        "name": "output",
+        "data": 32.16658401489258,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceMax float32 1D constant tensor default options",
       "inputs": {
diff --git a/webnn/resources/test_data/reduce_mean.json b/webnn/resources/test_data/reduce_mean.json
index 8c26d0a5623e5c..b990b0f93bba1b 100644
--- a/webnn/resources/test_data/reduce_mean.json
+++ b/webnn/resources/test_data/reduce_mean.json
@@ -1,5 +1,44 @@
 {
   "tests": [
+    {
+      "name": "reduceMean float32 0D constant tensor default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            95.84498596191406
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 95.84498596191406,
+        "type": "float32"
+      }
+    },
+    {
+      "name": "reduceMean float32 0D constant tensor empty axes",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            95.84498596191406
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "options": {
+        "axes": []
+      },
+      "expected": {
+        "name": "output",
+        "data": 95.84498596191406,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceMean float32 1D constant tensor all positive default options",
       "inputs": {
diff --git a/webnn/resources/test_data/reduce_min.json b/webnn/resources/test_data/reduce_min.json
index 6c26df5db16d92..4d91480bb95a04 100644
--- a/webnn/resources/test_data/reduce_min.json
+++ b/webnn/resources/test_data/reduce_min.json
@@ -1,5 +1,44 @@
 {
   "tests": [
+    {
+      "name": "reduceMin float32 0D constant tensor default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            -58.76195526123047
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": -58.76195526123047,
+        "type": "float32"
+      }
+    },
+    {
+      "name": "reduceMin float32 0D constant tensor empty axes",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            -58.76195526123047
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "options": {
+        "axes": []
+      },
+      "expected": {
+        "name": "output",
+        "data": -58.76195526123047,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceMin float32 1D constant tensor default options",
       "inputs": {
diff --git a/webnn/resources/test_data/reduce_product.json b/webnn/resources/test_data/reduce_product.json
index d58af30ec1af61..e9b2dc34c26894 100644
--- a/webnn/resources/test_data/reduce_product.json
+++ b/webnn/resources/test_data/reduce_product.json
@@ -1,5 +1,44 @@
 {
   "tests": [
+    {
+      "name": "reduceProduct float32 0D constant tensor default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            -68.75911712646484
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": -68.75911712646484,
+        "type": "float32"
+      }
+    },
+    {
+      "name": "reduceProduct float32 0D constant tensor empty axes",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            -68.75911712646484
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "options": {
+        "axes": []
+      },
+      "expected": {
+        "name": "output",
+        "data": -68.75911712646484,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceProduct float32 1D constant tensor default options",
       "inputs": {
diff --git a/webnn/resources/test_data/reduce_sum.json b/webnn/resources/test_data/reduce_sum.json
index 7027d38b676993..fd93e131b3e290 100644
--- a/webnn/resources/test_data/reduce_sum.json
+++ b/webnn/resources/test_data/reduce_sum.json
@@ -1,5 +1,44 @@
 {
   "tests": [
+    {
+      "name": "reduceSum float32 0D constant tensor default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            69.6038589477539
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 69.6038589477539,
+        "type": "float32"
+      }
+    },
+    {
+      "name": "reduceSum float32 0D constant tensor empty axes",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            69.6038589477539
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "options": {
+        "axes": []
+      },
+      "expected": {
+        "name": "output",
+        "data": 69.6038589477539,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceSum float32 1D constant tensor all positive default options",
       "inputs": {
diff --git a/webnn/resources/test_data/reduce_sum_square.json b/webnn/resources/test_data/reduce_sum_square.json
index bd2ebb341a7c04..d308cad463a291 100644
--- a/webnn/resources/test_data/reduce_sum_square.json
+++ b/webnn/resources/test_data/reduce_sum_square.json
@@ -1,5 +1,44 @@
 {
   "tests": [
+    {
+      "name": "reduceSumSquare float32 0D constant tensor default options",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            52.5615348815918
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "expected": {
+        "name": "output",
+        "data": 2762.71484375,
+        "type": "float32"
+      }
+    },
+    {
+      "name": "reduceSumSquare float32 0D constant tensor empty axes",
+      "inputs": {
+        "input": {
+          "shape": [],
+          "data": [
+            52.5615348815918
+          ],
+          "type": "float32",
+          "constant": true
+        }
+      },
+      "options": {
+        "axes": []
+      },
+      "expected": {
+        "name": "output",
+        "data": 2762.71484375,
+        "type": "float32"
+      }
+    },
     {
       "name": "reduceSumSquare float32 1D constant tensor all positive default options", // default options: {axes: null, keepDimensions: false}
       "inputs": {
diff --git a/webnn/resources/utils.js b/webnn/resources/utils.js
index c231f46bcf5221..0d3443b3dc9552 100644
--- a/webnn/resources/utils.js
+++ b/webnn/resources/utils.js
@@ -274,9 +274,9 @@ const getReductionPrecisionTolerance = (resources, operationName) => {
   } else {
     sizes = inputShape;
   }
-  const reducedElementCount = sizes.reduce(
-                                  (accumulator, currentValue) => accumulator * currentValue
-  );
+  const reducedElementCount = sizes.length ?
+      sizes.reduce((accumulator, currentValue) => accumulator * currentValue) :
+      1;
   let tolerance;
   switch (operationName) {
     case 'reduceL1':