Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

webnn: Enforce input data type constraints for gemm and matmul #45945

Merged
merged 1 commit into from
Apr 30, 2024
Merged

webnn: Enforce input data type constraints for gemm and matmul #45945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions webnn/validation_tests/gemm.https.any.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const tests = [
b: {dataType: 'float32', dimensions: [2, 4]},
},
{
name: 'Test building gemm with aTranspose=true.',
name: '[gemm] Test building gemm with aTranspose=true.',
a: {dataType: 'float32', dimensions: [2, 3]},
b: {dataType: 'float32', dimensions: [2, 4]},
options: {
Expand All @@ -44,15 +44,15 @@ const tests = [
},
{
name:
'Throw if inputShapeA[0] is not equal to inputShapeB[0] with aTranspose=true.',
'[gemm] Throw if inputShapeA[0] is not equal to inputShapeB[0] with aTranspose=true.',
a: {dataType: 'float32', dimensions: [2, 3]},
b: {dataType: 'float32', dimensions: [3, 4]},
options: {
aTranspose: true,
},
},
{
name: 'Test building gemm with bTranspose=true.',
name: '[gemm] Test building gemm with bTranspose=true.',
a: {dataType: 'float32', dimensions: [2, 3]},
b: {dataType: 'float32', dimensions: [4, 3]},
options: {
Expand All @@ -62,30 +62,30 @@ const tests = [
},
{
name:
'Throw if inputShapeA[0] is not equal to inputShapeB[0] with bTranspose=true.',
'[gemm] Throw if inputShapeA[0] is not equal to inputShapeB[0] with bTranspose=true.',
a: {dataType: 'float32', dimensions: [2, 3]},
b: {dataType: 'float32', dimensions: [3, 4]},
options: {
bTranspose: true,
},
},
{
name: 'Throw if the rank of inputA is not 2.',
name: '[gemm] Throw if the rank of inputA is not 2.',
a: {dataType: 'float32', dimensions: [2, 3, 1]},
b: {dataType: 'float32', dimensions: [2, 4]},
},
{
name: 'Throw if the rank of inputB is not 2.',
name: '[gemm] Throw if the rank of inputB is not 2.',
a: {dataType: 'float32', dimensions: [2, 4]},
b: {dataType: 'float32', dimensions: [2, 3, 1]},
},
{
name: 'Throw if data types of two inputs do not match.',
name: '[gemm] Throw if data types of two inputs do not match.',
a: {dataType: 'float32', dimensions: [2, 3]},
b: {dataType: 'int32', dimensions: [3, 4]},
b: {dataType: 'float16', dimensions: [3, 4]},
},
{
name: 'Test building gemm with inputC.',
name: '[gemm] Test building gemm with inputC.',
a: {dataType: 'float32', dimensions: [2, 3]},
b: {dataType: 'float32', dimensions: [3, 4]},
options: {
Expand All @@ -94,7 +94,7 @@ const tests = [
output: {dataType: 'float32', dimensions: [2, 4]}
},
{
name: 'Test building gemm with scalar inputC.',
name: '[gemm] Test building gemm with scalar inputC.',
a: {dataType: 'float32', dimensions: [2, 3]},
b: {dataType: 'float32', dimensions: [3, 4]},
options: {
Expand All @@ -104,26 +104,31 @@ const tests = [
},
{
name:
'Throw if inputShapeC is not unidirectionally broadcastable to the output shape [inputShapeA[0], inputShapeB[1]].',
'[gemm] Throw if inputShapeC is not unidirectionally broadcastable to the output shape [inputShapeA[0], inputShapeB[1]].',
a: {dataType: 'float32', dimensions: [2, 3]},
b: {dataType: 'float32', dimensions: [3, 4]},
options: {
c: {dataType: 'float32', dimensions: [2, 3]},
},
},
{
name: '[gemm] Throw if the input data type is not floating point.',
a: {dataType: 'int32', dimensions: [2, 3]},
b: {dataType: 'int32', dimensions: [3, 4]}
},
{
name:
'Throw if data type of inputC does not match ones of inputA and inputB.',
'[gemm] Throw if data type of inputC does not match ones of inputA and inputB.',
a: {dataType: 'float32', dimensions: [3, 2]},
b: {dataType: 'float32', dimensions: [4, 3]},
options: {
c: {dataType: 'int32', dimensions: [2, 4]},
c: {dataType: 'float16', dimensions: [2, 4]},
aTranspose: true,
bTranspose: true,
},
},
{
name: 'Throw if the rank of inputC is 3.',
name: '[gemm] Throw if the rank of inputC is 3.',
a: {dataType: 'float32', dimensions: [3, 2]},
b: {dataType: 'float32', dimensions: [4, 3]},
options: {
Expand Down
9 changes: 8 additions & 1 deletion webnn/validation_tests/matmul.https.any.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,18 @@ const tests = [
},
output: {dataType: 'float32', dimensions: [2, 3, 5]}
},
{
name: '[matmul] Throw if the input data type is not floating point',
inputs: {
a: {dataType: 'uint32', dimensions: [2, 3, 4]},
b: {dataType: 'uint32', dimensions: [2, 4, 5]}
}
},
{
name: '[matmul] Throw if data type of two inputs don\'t match',
inputs: {
a: {dataType: 'float32', dimensions: [2, 3, 4]},
b: {dataType: 'int32', dimensions: [2, 4, 5]}
b: {dataType: 'float16', dimensions: [2, 4, 5]}
}
},
{
Expand Down