Fixed computed output shape of matmul op

mingmingtasd · mingmingtasd · commit 1313dab3a321 · 2022-11-23T09:50:24.000+08:00
diff --git a/src/webnn/native/ops/Binary.cpp b/src/webnn/native/ops/Binary.cpp
@@ -54,11 +54,12 @@ namespace webnn::native::op {
             }
             outputShape = {1};
         }
-        if (rankA == 2 && rankB == 1) {
-            if (inputShapeA[1] != inputShapeB[0]) {
+        if (rankA >= 2 && rankB == 1) {
+            if (inputShapeA[rankA - 1] != inputShapeB[0]) {
                 return DAWN_VALIDATION_ERROR("The input shapes are incompatible.");
             }
-            outputShape = {inputShapeA[0], 1};
+            outputShape = std::move(inputShapeA);
+            outputShape[rankA - 1] = 1;
         }
         if (rankA == 1 && rankB == 2) {
             if (inputShapeA[0] != inputShapeB[0]) {

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,12 @@ namespace webnn::native::op {`
`54`	`54`	`}`
`55`	`55`	`outputShape = {1};`
`56`	`56`	`}`
`57`		`- if (rankA == 2 && rankB == 1) {`
`58`		`- if (inputShapeA[1] != inputShapeB[0]) {`
	`57`	`+ if (rankA >= 2 && rankB == 1) {`
	`58`	`+ if (inputShapeA[rankA - 1] != inputShapeB[0]) {`
`59`	`59`	`return DAWN_VALIDATION_ERROR("The input shapes are incompatible.");`
`60`	`60`	`}`
`61`		`- outputShape = {inputShapeA[0], 1};`
	`61`	`+ outputShape = std::move(inputShapeA);`
	`62`	`+ outputShape[rankA - 1] = 1;`
`62`	`63`	`}`
`63`	`64`	`if (rankA == 1 && rankB == 2) {`
`64`	`65`	`if (inputShapeA[0] != inputShapeB[0]) {`