From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- .../tests/webnn/resources/test_data/add.json | 23 ++++ .../webnn/resources/test_data/average_pool2d.json | 147 +++++++++++++++++++++ .../resources/test_data/batch_normalization.json | 2 +- .../tests/webnn/resources/test_data/clamp.json | 2 +- 4 files changed, 172 insertions(+), 2 deletions(-) (limited to 'testing/web-platform/tests/webnn/resources/test_data') diff --git a/testing/web-platform/tests/webnn/resources/test_data/add.json b/testing/web-platform/tests/webnn/resources/test_data/add.json index dba361228b..28e04a6127 100644 --- a/testing/web-platform/tests/webnn/resources/test_data/add.json +++ b/testing/web-platform/tests/webnn/resources/test_data/add.json @@ -877,6 +877,29 @@ ], "type": "float32" } + }, + { + "name": "add float32 large inputs", + "inputs": { + "a": { + "shape": [6000, 6000], + "data": 89.32998288116718, + "type": "float32", + "constant": true + }, + "b": { + "shape": [6000, 6000], + "data": 77.24720464493949, + "type": "float32", + "constant": false + } + }, + "expected": { + "name": "output", + "shape": [6000, 6000], + "data": 166.57718752610668, + "type": "float32" + } } ] } \ No newline at end of file diff --git a/testing/web-platform/tests/webnn/resources/test_data/average_pool2d.json b/testing/web-platform/tests/webnn/resources/test_data/average_pool2d.json index 3d0c432273..b95e9395e7 100644 --- a/testing/web-platform/tests/webnn/resources/test_data/average_pool2d.json +++ b/testing/web-platform/tests/webnn/resources/test_data/average_pool2d.json @@ -300,6 +300,79 @@ "type": "float32" } }, + { + "name": "global averagePool2d float32 4D tensor all positive options.windowDimensions", + "inputs": { + "input": { + "shape": [1, 2, 5, 5], + "data": [ + 22.975555502750634, + 78.15438048012338, + 9.68611138116071, + 51.29803808129347, + 32.19308601456918, + 87.65037289600019, + 87.25082191311348, + 39.49793996935087, + 80.09963591169489, + 10.220142557736978, + 52.60270021646585, + 1.4128639882603933, + 11.954064466077474, + 85.0007506374375, + 64.7837446465813, + 88.03128735720126, + 11.333851214909307, + 70.61659435728073, + 84.90442561999888, + 79.06688041781518, + 7.328724951604215, + 35.97796581186121, + 10.17730631094398, + 1.4140757517112412, + 78.10038172113374, + 91.59549689157087, + 65.64701225681809, + 55.14215004436653, + 18.432438840756184, + 49.34624267439973, + 15.648024969290454, + 68.02723372727797, + 20.342549040418124, + 26.72794900604616, + 64.87446829774323, + 46.56714896227794, + 79.57832937136276, + 4.338463748959498, + 38.18383968382213, + 45.253981324455175, + 80.9717996657439, + 67.58124910163149, + 6.026499585657263, + 29.77881349289366, + 58.58993337807239, + 2.2384984647495054, + 14.505490166700486, + 68.72449589246624, + 76.45657404642184, + 23.53263275794233 + ], + "type": "float32" + } + }, + "options": { + "windowDimensions": [5, 5] + }, + "expected": { + "name": "output", + "shape": [1, 2, 1, 1], + "data": [ + 47.26926803588867, + 44.72445297241211 + ], + "type": "float32" + } + }, { "name": "averagePool2d float32 4D tensor options.padding", "inputs": { @@ -679,6 +752,80 @@ "type": "float32" } }, + { + "name": "global averagePool2d float32 4D tensor options.layout=nhwc and options.windowDimensions", + "inputs": { + "input": { + "shape": [1, 5, 5, 2], + "data": [ + 22.975555502750634, + 91.59549689157087, + 78.15438048012338, + 65.64701225681809, + 9.68611138116071, + 55.14215004436653, + 51.29803808129347, + 18.432438840756184, + 32.19308601456918, + 49.34624267439973, + 87.65037289600019, + 15.648024969290454, + 87.25082191311348, + 68.02723372727797, + 39.49793996935087, + 20.342549040418124, + 80.09963591169489, + 26.72794900604616, + 10.220142557736978, + 64.87446829774323, + 52.60270021646585, + 46.56714896227794, + 1.4128639882603933, + 79.57832937136276, + 11.954064466077474, + 4.338463748959498, + 85.0007506374375, + 38.18383968382213, + 64.7837446465813, + 45.253981324455175, + 88.03128735720126, + 80.9717996657439, + 11.333851214909307, + 67.58124910163149, + 70.61659435728073, + 6.026499585657263, + 84.90442561999888, + 29.77881349289366, + 79.06688041781518, + 58.58993337807239, + 7.328724951604215, + 2.2384984647495054, + 35.97796581186121, + 14.505490166700486, + 10.17730631094398, + 68.72449589246624, + 1.4140757517112412, + 76.45657404642184, + 78.10038172113374, + 23.53263275794233 + ], + "type": "float32" + } + }, + "options": { + "layout": "nhwc", + "windowDimensions": [5, 5] + }, + "expected": { + "name": "output", + "shape": [1, 1, 1, 2], + "data": [ + 47.26926803588867, + 44.72445297241211 + ], + "type": "float32" + } + }, { "name": "averagePool2d float32 4D tensor options.roundingType=floor", "inputs": { diff --git a/testing/web-platform/tests/webnn/resources/test_data/batch_normalization.json b/testing/web-platform/tests/webnn/resources/test_data/batch_normalization.json index 04ab0d0d6f..192985f5f4 100644 --- a/testing/web-platform/tests/webnn/resources/test_data/batch_normalization.json +++ b/testing/web-platform/tests/webnn/resources/test_data/batch_normalization.json @@ -1147,7 +1147,7 @@ "activation": "relu" }, "expected": { - "shape": [2, 3, 2, 2], + "shape": [2, 2, 2, 3], "data": [ 0, 200.12615966796875, diff --git a/testing/web-platform/tests/webnn/resources/test_data/clamp.json b/testing/web-platform/tests/webnn/resources/test_data/clamp.json index 0e948f9931..f25019e4d9 100644 --- a/testing/web-platform/tests/webnn/resources/test_data/clamp.json +++ b/testing/web-platform/tests/webnn/resources/test_data/clamp.json @@ -643,7 +643,7 @@ }, "expected": { "name": "output", - "shape": [2, 1, 4, 3], + "shape": [2, 2, 1, 2, 3], "data": [ -9.817828178405762, -6.024064064025879, -- cgit v1.2.3