From 9279c8b4551b57a4de3c470e10f034343490a0b5 Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Tue, 22 Oct 2024 21:47:28 +0000
Subject: [PATCH] Bug 1924933 [wpt PR 48637] - webnn: Make
 MLOperandDescriptor.shape a required dictionary member, a=testonly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Automatic update from web-platform-tests
webnn: Make MLOperandDescriptor.shape a required dictionary member

See https://github.com/webmachinelearning/webnn/issues/758

Also removes the temporary support for passing "dimensions" which was
added in https://crrev.com/e7e99aa5

Bug: 365813262
Cq-Include-Trybots: luci.chromium.try​:mac14-blink-rel,win11-blink-rel
Change-Id: Ib714ae540da7fbd7d55365dc739bfb8dbf266406
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5850659
Reviewed-by: ningxin hu <ningxin.huintel.com>
Commit-Queue: ningxin hu <ningxin.huintel.com>
Auto-Submit: Austin Sullivan <asullychromium.org>
Cr-Commit-Position: refs/heads/main{#1369192}

--

wpt-commits: c2d015181a4956b2f91061595ec7da93823ec3ec
wpt-pr: 48637

UltraBlame original commit: 9f95e773e94fb574ef3183aeac32974ee03e0cd9
---
 .../validation_tests/constant.https.any.js    | 54 -------------------
 .../webnn/validation_tests/input.https.any.js | 49 +----------------
 2 files changed, 1 insertion(+), 102 deletions(-)

diff --git a/testing/web-platform/tests/webnn/validation_tests/constant.https.any.js b/testing/web-platform/tests/webnn/validation_tests/constant.https.any.js
index fa818c6fc88a7..cd9ab436aa3a4 100644
--- a/testing/web-platform/tests/webnn/validation_tests/constant.https.any.js
+++ b/testing/web-platform/tests/webnn/validation_tests/constant.https.any.js
@@ -22,60 +22,6 @@ a
 D
 scalar
 constant
-without
-presenting
-dimensions
-'
-descriptor
-:
-{
-dataType
-:
-'
-float32
-'
-}
-bufferView
-:
-{
-type
-:
-Float32Array
-byteLength
-:
-1
-*
-4
-}
-output
-:
-{
-dataType
-:
-'
-float32
-'
-shape
-:
-[
-]
-}
-}
-{
-name
-:
-'
-[
-constant
-]
-Test
-building
-a
-0
--
-D
-scalar
-constant
 with
 empty
 dimensions
diff --git a/testing/web-platform/tests/webnn/validation_tests/input.https.any.js b/testing/web-platform/tests/webnn/validation_tests/input.https.any.js
index daa8989f93655..fc8631acc1d01 100644
--- a/testing/web-platform/tests/webnn/validation_tests/input.https.any.js
+++ b/testing/web-platform/tests/webnn/validation_tests/input.https.any.js
@@ -22,56 +22,9 @@ a
 D
 scalar
 input
-without
-presenting
-dimensions
-'
-name
-:
-'
-input
-'
-descriptor
-:
-{
-dataType
-:
-'
-float32
-'
-}
-output
-:
-{
-dataType
-:
-'
-float32
-'
-shape
-:
-[
-]
-}
-}
-{
-testName
-:
-'
-[
-input
-]
-Test
-building
-a
-0
--
-D
-scalar
-input
 with
 empty
-dimensions
+shape
 '
 name
 :