Skip to content

Commit 695438d

Browse files
a-sullychromium-wpt-export-bot
a-sully
authored and
chromium-wpt-export-bot
committed
webnn: Rename READ[_FROM] and WRITE[_TO] MLTensorUsageFlags
As agreed upon in discussions on the MLTensor explainer: webmachinelearning/webnn#754 Bug: 361372446 Cq-Include-Trybots: luci.chromium.try:win11-blink-rel Change-Id: I8bb993c1855c12eac68dc0f2ea359b5f1ae61932 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5858162 Commit-Queue: Austin Sullivan <[email protected]> Reviewed-by: Reilly Grant <[email protected]> Reviewed-by: Alex Gough <[email protected]> Cr-Commit-Position: refs/heads/main@{#1355445}
1 parent 922a7fe commit 695438d

5 files changed

+33
-33
lines changed

‎webnn/conformance_tests/byob_readtensor.https.any.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ promise_setup(async () => {
3232
mlTensor = await mlContext.createTensor({
3333
dataType: 'int32',
3434
dimensions: [2, 4],
35-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
35+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
3636
});
3737
} catch (e) {
3838
throw new AssertionError(
@@ -141,7 +141,7 @@ promise_test(async (t) => {
141141
const tensor = await mlContext.createTensor({
142142
dataType: 'int32',
143143
dimensions: [2, 2],
144-
usage: MLTensorUsage.READ_FROM,
144+
usage: MLTensorUsage.READ,
145145
});
146146
const arrayBufferView = new Int32Array(2 * 2);
147147
const arrayBuffer = arrayBufferView.buffer;
@@ -159,7 +159,7 @@ promise_test(async (t) => {
159159
const tensor = await mlContext.createTensor({
160160
dataType: 'int32',
161161
dimensions: [2, 2],
162-
usage: MLTensorUsage.READ_FROM,
162+
usage: MLTensorUsage.READ,
163163
});
164164
const arrayBufferView = new Int32Array(2 * 2);
165165
const arrayBuffer = arrayBufferView.buffer;

‎webnn/conformance_tests/parallel-dispatch.https.any.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ promise_test(async () => {
3333
const operandDescriptor = {
3434
dataType: 'float32',
3535
dimensions: [1],
36-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
36+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
3737
};
3838

3939
const [mlGraph, inputTensor1, inputTensor2, outputTensor] =
@@ -73,7 +73,7 @@ promise_test(async () => {
7373
const operandDescriptor = {
7474
dataType: 'float32',
7575
dimensions: [1],
76-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
76+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
7777
};
7878
const mlGraph = await buildMulGraph(mlContext, operandDescriptor, 3);
7979

@@ -101,7 +101,7 @@ promise_test(async () => {
101101
const operandDescriptor = {
102102
dataType: 'float32',
103103
dimensions: [1],
104-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
104+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
105105
};
106106
const mlGraph = await buildMulGraph(mlContext, operandDescriptor, 10);
107107

@@ -140,7 +140,7 @@ promise_test(async () => {
140140
const operandDescriptor = {
141141
dataType: 'float32',
142142
dimensions: [1],
143-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
143+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
144144
};
145145
const mlGraph = await buildMulGraph(mlContext, operandDescriptor, 9);
146146

@@ -178,7 +178,7 @@ promise_test(async () => {
178178
const operandDescriptor = {
179179
dataType: 'float32',
180180
dimensions: [1],
181-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
181+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
182182
};
183183
const mlGraph = await buildMulGraph(mlContext, operandDescriptor, 2);
184184

@@ -211,7 +211,7 @@ promise_test(async () => {
211211
const operandDescriptor = {
212212
dataType: 'float32',
213213
dimensions: [1],
214-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
214+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
215215
};
216216

217217
// write/write...
@@ -250,7 +250,7 @@ promise_test(async () => {
250250
const operandDescriptor = {
251251
dataType: 'float32',
252252
dimensions: [1],
253-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
253+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
254254
};
255255

256256
// write/write...
@@ -288,7 +288,7 @@ promise_test(async () => {
288288
const operandDescriptor = {
289289
dataType: 'float32',
290290
dimensions: [1],
291-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
291+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
292292
};
293293

294294
const graphs = await Promise.all([3, 2].map(async (multiplier) => {
@@ -324,7 +324,7 @@ promise_test(async () => {
324324
const operandDescriptor = {
325325
dataType: 'float32',
326326
dimensions: [1],
327-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
327+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
328328
};
329329

330330
const graphs = await Promise.all([2, 3].map(async (multiplier) => {

‎webnn/conformance_tests/tensor.https.any.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ const testWriteTensor = (testName) => {
167167
const tensorDescriptor = {
168168
dataType: 'int32',
169169
dimensions: [1],
170-
usage: MLTensorUsage.WRITE_TO,
170+
usage: MLTensorUsage.WRITE,
171171
};
172172
let mlTensor = await mlContext.createTensor(tensorDescriptor);
173173

@@ -216,7 +216,7 @@ const testWriteTensor = (testName) => {
216216
const tensorDescriptor = {
217217
dataType: 'int32',
218218
dimensions: [2, 2],
219-
usage: MLTensorUsage.WRITE_TO,
219+
usage: MLTensorUsage.WRITE,
220220
};
221221
let mlTensor = await mlContext.createTensor(tensorDescriptor);
222222

@@ -233,7 +233,7 @@ const testWriteTensor = (testName) => {
233233
const tensorDescriptor = {
234234
dataType: 'int32',
235235
dimensions: [2, 3],
236-
usage: MLTensorUsage.WRITE_TO,
236+
usage: MLTensorUsage.WRITE,
237237
};
238238
let mlTensor = await mlContext.createTensor(tensorDescriptor);
239239

@@ -252,7 +252,7 @@ const testWriteTensor = (testName) => {
252252
let mlTensor = await mlContext.createTensor({
253253
dataType: 'int32',
254254
dimensions: [1],
255-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
255+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
256256
});
257257

258258
// Initialize the tensor.
@@ -275,7 +275,7 @@ const testWriteTensor = (testName) => {
275275
const tensorDescriptor = {
276276
dataType: 'int32',
277277
dimensions: [2, 2],
278-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
278+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
279279
};
280280
let mlTensor = await mlContext.createTensor(tensorDescriptor);
281281

@@ -326,7 +326,7 @@ const testReadTensor = (testName) => {
326326
let mlTensor = await mlContext.createTensor({
327327
dataType: 'int32',
328328
dimensions: [2, 2],
329-
usage: MLTensorUsage.READ_FROM,
329+
usage: MLTensorUsage.READ,
330330
});
331331

332332
// Reading a destroyed MLTensor should reject.
@@ -340,7 +340,7 @@ const testReadTensor = (testName) => {
340340
let mlTensor = await mlContext.createTensor({
341341
dataType: 'int32',
342342
dimensions: [2, 3],
343-
usage: MLTensorUsage.READ_FROM,
343+
usage: MLTensorUsage.READ,
344344
});
345345

346346
let promise = mlContext.readTensor(mlTensor);
@@ -356,7 +356,7 @@ const testReadTensor = (testName) => {
356356
let mlTensor = await mlContext.createTensor({
357357
dataType: 'int32',
358358
dimensions: [1024],
359-
usage: MLTensorUsage.READ_FROM,
359+
usage: MLTensorUsage.READ,
360360
});
361361

362362
await assert_tensor_data_equals(mlContext, mlTensor, new Uint32Array(1024));
@@ -366,7 +366,7 @@ const testReadTensor = (testName) => {
366366
let mlTensor = await mlContext.createTensor({
367367
dataType: 'int32',
368368
dimensions: [1],
369-
usage: MLTensorUsage.READ_FROM | MLTensorUsage.WRITE_TO,
369+
usage: MLTensorUsage.READ | MLTensorUsage.WRITE,
370370
});
371371

372372
// Initialize the tensor.
@@ -382,7 +382,7 @@ const testReadTensor = (testName) => {
382382
let mlTensor = await mlContext.createTensor({
383383
dataType: 'int32',
384384
dimensions: [1],
385-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
385+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
386386
});
387387

388388
// Initialize the tensor.
@@ -400,7 +400,7 @@ const testReadTensor = (testName) => {
400400
let mlTensor = await mlContext.createTensor({
401401
dataType: 'int32',
402402
dimensions: [1],
403-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
403+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
404404
});
405405

406406
// Initialize the tensor.
@@ -418,7 +418,7 @@ const testReadTensor = (testName) => {
418418
let mlTensor = await mlContext.createTensor({
419419
dataType: 'int32',
420420
dimensions: [1],
421-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
421+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
422422
});
423423

424424
// Initialize the tensor.
@@ -436,7 +436,7 @@ const testReadTensor = (testName) => {
436436
let mlTensor = await mlContext.createTensor({
437437
dataType: 'int32',
438438
dimensions: [1],
439-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
439+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
440440
});
441441

442442
const inputData = [0xAA, 0xAA, 0xAA, 0xAA];
@@ -453,7 +453,7 @@ const testReadTensor = (testName) => {
453453
const tensorDescriptor = {
454454
dataType: 'int32',
455455
dimensions: [2, 3],
456-
usage: MLTensorUsage.READ_FROM,
456+
usage: MLTensorUsage.READ,
457457
};
458458
let mlTensor = await mlContext.createTensor(tensorDescriptor);
459459

@@ -489,7 +489,7 @@ const testDispatchTensor = (testName) => {
489489
const tensorDescriptor = {
490490
dataType: 'float32',
491491
dimensions: shape,
492-
usage: MLTensorUsage.WRITE_TO | MLTensorUsage.READ_FROM,
492+
usage: MLTensorUsage.WRITE | MLTensorUsage.READ,
493493
};
494494
const lhsOperand = builder.input('lhs', tensorDescriptor);
495495
const rhsOperand = builder.input('rhs', tensorDescriptor);

‎webnn/validation_tests/destroyContext.https.any.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ promise_test(async t => {
135135
const tensor = await context.createTensor({
136136
dataType: 'float32',
137137
dimensions: [1],
138-
usage: MLTensorUsage.READ_FROM,
138+
usage: MLTensorUsage.READ,
139139
});
140140
context.destroy();
141141
promise_rejects_dom(t, 'InvalidStateError', context.readTensor(tensor));
@@ -146,7 +146,7 @@ promise_test(async t => {
146146
const tensor = await context.createTensor({
147147
dataType: 'float32',
148148
dimensions: [1],
149-
usage: MLTensorUsage.READ_FROM,
149+
usage: MLTensorUsage.READ,
150150
});
151151
let promise = context.readTensor(tensor);
152152
context.destroy();
@@ -161,7 +161,7 @@ promise_test(async t => {
161161
const tensor = await context.createTensor({
162162
dataType: 'float32',
163163
dimensions: [1],
164-
usage: MLTensorUsage.WRITE_TO,
164+
usage: MLTensorUsage.WRITE,
165165
});
166166
let arrayBuffer = new ArrayBuffer(4);
167167
context.destroy();

‎webnn/validation_tests/destroyGraph.https.any.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,17 @@ promise_test(async t => {
110110
const lhsTensor = await context.createTensor({
111111
dataType: 'float32',
112112
dimensions: [1],
113-
usage: MLTensorUsage.WRITE_TO,
113+
usage: MLTensorUsage.WRITE,
114114
});
115115
const rhsTensor = await context.createTensor({
116116
dataType: 'float32',
117117
dimensions: [1],
118-
usage: MLTensorUsage.WRITE_TO,
118+
usage: MLTensorUsage.WRITE,
119119
});
120120
const outputTensor = await context.createTensor({
121121
dataType: 'float32',
122122
dimensions: [1],
123-
usage: MLTensorUsage.READ_FROM,
123+
usage: MLTensorUsage.READ,
124124
});
125125
// Initialize inputs
126126
const inputData = new Float32Array(1).fill(2.0);

0 commit comments

Comments
 (0)