0.8.x Use batchNorm instead of batchNormalization

docs/supported_ops.md

@@ -198,8 +198,8 @@
 
 |Tensorflow Op Name|Tensorflow.js Op Name|
 |---|---|
-|FusedBatchNorm|batchNormalization|
-|FusedBatchNormV2|batchNormalization|
+|FusedBatchNorm|batchNorm|
+|FusedBatchNormV2|batchNorm|
 |LogSoftmax|logSoftmax|
 |LRN|localResponseNormalization|
 |Softmax|softmax|

src/operations/executors/normalization_executor.ts

@@ -29,13 +29,13 @@ export let executeOp: OpExecutor = (node: Node, tensorMap: NamedTensorsMap,
                                        tfc.Tensor[] => {
   switch (node.op) {
     case 'batchNormalization': {
-      return [tfc.batchNormalization(
+      return [tfc.batchNorm(
           getParamValue('x', node, tensorMap, context) as tfc.Tensor,
           getParamValue('mean', node, tensorMap, context) as tfc.Tensor,
           getParamValue('variance', node, tensorMap, context) as tfc.Tensor,
-          getParamValue('epsilon', node, tensorMap, context) as number,
+          getParamValue('offset', node, tensorMap, context) as tfc.Tensor,
           getParamValue('scale', node, tensorMap, context) as tfc.Tensor,
-          getParamValue('offset', node, tensorMap, context) as tfc.Tensor)];
+          getParamValue('epsilon', node, tensorMap, context) as number)];
     }
     case 'localResponseNormalization': {
       return [tfc.localResponseNormalization(

src/operations/executors/normalization_executor_test.ts

@@ -43,8 +43,8 @@ describe('normalization', () => {
 
   describe('executeOp', () => {
     describe('batchNormalization', () => {
-      it('should call tfc.batchNormalization', () => {
-        spyOn(tfc, 'batchNormalization');
+      it('should call tfc.batchNorm', () => {
+        spyOn(tfc, 'batchNorm');
         node.op = 'batchNormalization';
         node.params.scale = createTensorAttr(1);
         node.params.offset = createTensorAttr(2);
@@ -58,9 +58,9 @@ describe('normalization', () => {
         const input5 = [tfc.scalar(4)];
         executeOp(node, {input1, input2, input3, input4, input5}, context);
 
-        expect(tfc.batchNormalization)
+        expect(tfc.batchNorm)
             .toHaveBeenCalledWith(
-                input1[0], input4[0], input5[0], 5, input2[0], input3[0]);
+                input1[0], input4[0], input5[0], input3[0], input2[0], 5);
       });
     });