[converter] Fix fusedMatMul bug. (#6455)

* [converter] Fix fusedMatMul bug.

* Add default value to core op.

Author: lina128

tfjs-converter/python/tensorflowjs/op_list/convolution.json

@@ -394,7 +394,8 @@
       {
         "tfName": "leakyrelu_alpha",
         "name": "leakyreluAlpha",
-        "type": "number"
+        "type": "number",
+        "defaultValue": 0.2
       }
     ]
   },
@@ -685,4 +686,4 @@
       }
     ]
   }
-]
+]

tfjs-converter/python/tensorflowjs/op_list/matrices.json

@@ -50,6 +50,12 @@
         "type": "bool",
         "defaultValue": false
       },
+      {
+        "tfName": "leakyrelu_alpha",
+        "name": "leakyreluAlpha",
+        "type": "number",
+        "defaultValue": 0.2
+      },
       {
         "tfName": "T",
         "name": "dtype",
@@ -220,4 +226,4 @@
       }
     ]
   }
-]
+]

tfjs-converter/src/operations/executors/matrices_executor_test.ts

@@ -18,12 +18,13 @@
 import {Tensor} from '@tensorflow/tfjs-core';
 // tslint:disable-next-line: no-imports-from-dist
 import * as tfOps from '@tensorflow/tfjs-core/dist/ops/ops_for_converter';
+import * as matrices from '../op_list/matrices';
 
 import {ExecutionContext} from '../../executor/execution_context';
 import {Node} from '../types';
 
 import {executeOp} from './matrices_executor';
-import {createBoolAttr, createNumberAttr, createNumericArrayAttr, createStrArrayAttr, createStrAttr, createTensorAttr, createTensorsAttr} from './test_helper';
+import {createBoolAttr, createNumberAttr, createNumericArrayAttr, createStrArrayAttr, createStrAttr, createTensorAttr, createTensorsAttr, validateParam} from './test_helper';
 
 describe('matrices', () => {
   let node: Node;
@@ -130,6 +131,18 @@ describe('matrices', () => {
           leakyreluAlpha: 0.3
         });
       });
+      it('should match json def.', () => {
+        node.op = '_FusedMatMul';
+
+        node.attrParams['fusedOps'] =
+          createStrArrayAttr(['biasadd', 'leakyrelu']);
+        node.attrParams['numArgs'] = createNumberAttr(1);
+        node.attrParams.transposeA = createBoolAttr(true);
+        node.attrParams.transposeB = createBoolAttr(false);
+        node.attrParams.leakyreluAlpha = createNumberAttr(0.3);
+
+        expect(validateParam(node, matrices.json)).toBeTruthy();
+      });
     });
     describe('BatchMatMul', () => {
       it('should call tfOps.matMul', () => {

tfjs-core/src/ops/fused/fused_mat_mul_test.ts

@@ -111,6 +111,26 @@ describeWithFlags('fused matmul', ALL_ENVS, () => {
     expectArraysClose(await c.data(), [0, 8, -0.9000000357627869, 20]);
   });
 
+  it('fused A x B with leakyrelu not provided.', async () => {
+    const a = tf.tensor2d([1, 2, 3, 4, 5, 6], [2, 3]);
+    const b = tf.tensor2d([0, 1, -3, 2, 2, 1], [3, 2]);
+    const transposeA = false;
+    const transposeB = false;
+
+    const c = tf.fused.matMul({
+      a,
+      b,
+      transposeA,
+      transposeB,
+      bias: null,
+      activation: 'leakyrelu'
+    });
+
+    expect(c.shape).toEqual([2, 2]);
+    // leakyRelu should use default alpha=0.2.
+    expectArraysClose(await c.data(), [0, 8, -0.6000000238418579, 20]);
+  });
+
   it('fused A x B with sigmoid', async () => {
     const a = tf.tensor2d([1, 2, 3, 4, 5, 6], [2, 3]);
     const b = tf.tensor2d([0, 1, -3, 2, 2, 1], [3, 2]);

tfjs-core/src/ops/fused/mat_mul.ts

@@ -63,7 +63,7 @@ function fusedMatMul_({
   bias,
   activation = 'linear',
   preluActivationWeights,
-  leakyreluAlpha,
+  leakyreluAlpha = 0.2,
 }: {
   a: Tensor|TensorLike,
   b: Tensor|TensorLike,