Merge branch 'kaczmarj-add/conv3d'

Author: pyu10055

python/tensorflowjs/op_list/convolution.json

@@ -371,5 +371,44 @@
         "type": "number[]"
       }
     ]
+  },
+  {
+    "tfOpName": "Conv3D",
+    "category": "convolution",
+    "inputs": [
+      {
+        "start": 0,
+        "name": "x",
+        "type": "tensor"
+      },
+      {
+        "start": 1,
+        "name": "filter",
+        "type": "tensor"
+      }
+    ],
+    "attrs": [
+      {
+        "tfName": "strides",
+        "name": "strides",
+        "type": "number[]"
+      },
+      {
+        "tfName": "padding",
+        "name": "pad",
+        "type": "string"
+      },
+      {
+        "tfName": "data_format",
+        "name": "dataFormat",
+        "type": "string",
+        "defaultValue": "NHWC"
+      },
+      {
+        "tfName": "dilations",
+        "name": "dilations",
+        "type": "number[]"
+      }
+    ]
   }
 ]

src/operations/executors/convolution_executor.ts

@@ -91,6 +91,24 @@ export let executeOp: InternalOpExecutor =
               [stride[1], stride[2]], pad as 'valid' | 'same',
               dataFormat as 'NHWC' | 'NCHW', [dilations[1], dilations[2]])];
         }
+        case 'Conv3D': {
+          const stride =
+              getParamValue('strides', node, tensorMap, context) as number[];
+          const pad = getParamValue('pad', node, tensorMap, context);
+          const dataFormat =
+              (getParamValue('dataFormat', node, tensorMap, context) as string)
+                  .toUpperCase();
+          const dilations =
+              getParamValue('dilations', node, tensorMap, context) as number[];
+          return [tfc.conv3d(
+              getParamValue('x', node, tensorMap, context) as tfc.Tensor4D |
+                  tfc.Tensor<tfc.Rank.R5>,
+              getParamValue('filter', node, tensorMap, context) as
+                  tfc.Tensor<tfc.Rank.R5>,
+              [stride[1], stride[2], stride[3]], pad as 'valid' | 'same',
+              dataFormat as 'NDHWC' | 'NCDHW',
+              [dilations[1], dilations[2], dilations[3]])];
+        }
 
         case 'AvgPool': {
           const stride =
@@ -130,8 +148,7 @@ export let executeOp: InternalOpExecutor =
           return [tfc.avgPool3d(
               getParamValue('x', node, tensorMap, context) as tfc.Tensor5D,
               [kernelSize[1], kernelSize[2], kernelSize[3]],
-              [stride[1], stride[2], stride[3]],
-              pad as 'valid' | 'same')];
+              [stride[1], stride[2], stride[3]], pad as 'valid' | 'same')];
         }
 
         case 'MaxPool3D': {
@@ -144,8 +161,7 @@ export let executeOp: InternalOpExecutor =
           return [tfc.maxPool3d(
               getParamValue('x', node, tensorMap, context) as tfc.Tensor5D,
               [kernelSize[1], kernelSize[2], kernelSize[3]],
-              [stride[1], stride[2], stride[3]],
-              pad as 'valid' | 'same')];
+              [stride[1], stride[2], stride[3]], pad as 'valid' | 'same')];
         }
 
         default:

src/operations/executors/convolution_executor_test.ts

@@ -157,6 +157,29 @@ describe('convolution', () => {
       });
     });
 
+    describe('Conv3d', () => {
+      it('should call tfc.conv3d', () => {
+        spyOn(tfc, 'conv3d');
+        node.op = 'Conv3D';
+        node.category = 'convolution';
+        node.inputParams['filter'] = createTensorAttr(1);
+        node.attrParams['strides'] = createNumericArrayAttr([1, 2, 2, 2, 1]);
+        node.attrParams['pad'] = createStrAttr('same');
+        node.attrParams['dataFormat'] = createStrAttr('NHWC');
+        node.attrParams['dilations'] = createNumericArrayAttr([1, 2, 2, 2, 1]);
+
+        const input1 = [tfc.scalar(1.0)];
+        const input2 = [tfc.scalar(1.0)];
+        node.inputNames = ['input1', 'input2'];
+
+        executeOp(node, {input1, input2}, context);
+
+        expect(tfc.conv3d)
+            .toHaveBeenCalledWith(
+                input1[0], input2[0], [2, 2, 2], 'same', 'NHWC', [2, 2, 2]);
+      });
+    });
+      
     describe('AvgPool3D', () => {
       it('should call tfc.avgPool3d', () => {
         spyOn(tfc, 'avgPool3d');

src/operations/op_list/convolution.ts

@@ -186,5 +186,23 @@ export const json: OpMapper[] = [
       },
       {'tfName': 'dilations', 'name': 'dilations', 'type': 'number[]'}
     ]
+  },
+  {
+    'tfOpName': 'Conv3D',
+    'category': 'convolution',
+    'inputs': [
+      {'start': 0, 'name': 'x', 'type': 'tensor'},
+      {'start': 1, 'name': 'filter', 'type': 'tensor'},
+    ],
+    'attrs': [
+      {'tfName': 'strides', 'name': 'strides', 'type': 'number[]'},
+      {'tfName': 'padding', 'name': 'pad', 'type': 'string'}, {
+        'tfName': 'data_format',
+        'name': 'dataFormat',
+        'type': 'string',
+        'defaultValue': 'NHWC'
+      },
+      {'tfName': 'dilations', 'name': 'dilations', 'type': 'number[]'}
+    ],
   }
 ];