Merge pull request #323 from JingyuanZhang/master

feat(converter): del nchw2nhwc transpose and  publish paddlejsconverter

Author: JingyuanZhang

packages/paddlejs-backend-webgl/src/ops/shader/elementwise_add.ts

@@ -30,7 +30,7 @@ export default {
         origin: ['getValueFromTensorPos']
     },
     behaviors: [
-        'processAxis',
+        'processElementwiseAxis',
         'genElementwiseCounterPos'
     ]
 };

packages/paddlejs-backend-webgl/src/ops/shader/elementwise_div.ts

@@ -54,7 +54,7 @@ export default {
         origin: ['getValueFromTensorPos']
     },
     behaviors: [
-        'processAxis',
+        'processElementwiseAxis',
         'genElementwiseCounterPos'
     ]
 };

packages/paddlejs-backend-webgl/src/ops/shader/elementwise_mul.ts

@@ -54,7 +54,7 @@ export default {
         origin: ['getValueFromTensorPos']
     },
     behaviors: [
-        'processAxis',
+        'processElementwiseAxis',
         'genElementwiseCounterPos'
     ]
 };

packages/paddlejs-backend-webgl/src/ops/shader/elementwise_pow.ts

@@ -30,7 +30,7 @@ export default {
         origin: ['getValueFromTensorPos']
     },
     behaviors: [
-        'processAxis',
+        'processElementwiseAxis',
         'genElementwiseCounterPos'
     ]
 };

packages/paddlejs-backend-webgl/src/ops/shader/elementwise_sub.ts

@@ -30,7 +30,7 @@ export default {
         origin: ['getValueFromTensorPos']
     },
     behaviors: [
-        'processAxis',
+        'processElementwiseAxis',
         'genElementwiseCounterPos'
     ]
 };

packages/paddlejs-converter/convertModel.py

@@ -35,7 +35,7 @@
 # paddlepaddle运行程序实例
 program = None
 # 存放模型结构
-modelInfo = {"vars": {}, "ops": [], "chunkNum": 0, "dataLayout": "nhwc", "feedShape": None}
+modelInfo = {"vars": {}, "ops": [], "chunkNum": 0, "dataLayout": "nchw", "feedShape": None}
 # 存放参数数值（未排序）
 paramValuesDict = {}
 
@@ -193,12 +193,6 @@ def organizeModelVariableInfo(result):
         # persistable数据存入paramValuesDict，等待排序
         if v.persistable:
             tensor = np.array(fluid.global_scope().find_var(v.name).get_tensor())
-            # nchw 转 nhwc
-            if len(tensor.shape) == 3:
-                tensor = np.transpose(tensor, (1, 2, 0))
-            elif len(tensor.shape) == 4:
-                tensor = np.transpose(tensor, (0, 2, 3, 1))
-
             data = tensor.flatten().tolist()
             paramValuesDict[v.name] = data
 

packages/paddlejs-converter/setup.py

@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="paddlejsconverter",
-    version="1.0.3",
+    version="1.0.4",
     author="paddlejs",
     author_email="382248373@qq.com",
     description="Paddlejs model converter",

packages/paddlejs-core/__tests__/spec/behaviors.test.ts

@@ -190,13 +190,12 @@ describe('test op behaviors', () => {
         expect(mergedOp.processedAttrs['active_function']).toBe('leakyRelu');
     });
 
-    it('test behavior processAxis', () => {
-        behaviors.processAxis.call(elementwiseAddOp as unknown as OpData);
+    it('test behavior processElementwiseAxis', () => {
+        behaviors.processElementwiseAxis.call(elementwiseAddOp as unknown as OpData);
         expect(elementwiseAddOp.processedAttrs.axis).toBe(0);
     });
 
     it('test behavior flattenShape', () => {
-        console.log(JSON.stringify(fcOp));
         behaviors.flattenShape.call(fcOp as unknown as OpData);
         const origin = fcOp.tensorDataMap['origin'];
         expect(origin.shape).toEqual([2, 9]);

packages/paddlejs-core/src/opFactory/opBehaviors.ts

@@ -213,14 +213,14 @@ const behaviors : Behaviors = {
         this.processedAttrs.dim = axis;
     },
 
-    processAxis() {
+    processElementwiseAxis() {
         const shape_x = this.tensorDataMap['origin'].shape;
         const shape_y = this.tensorDataMap['counter'].shape;
         let axis = this.processedAttrs.axis || -1;
 
         this.processedAttrs.counterLen = shape_y.length;
         // shape x === shape y
-        if (Utils.accShape(shape_x) === Utils.accShape(shape_y)) {
+        if (Utils.getSumOfShape(shape_x) === Utils.getSumOfShape(shape_y)) {
             this.processedAttrs.axis = 0;
             this.processedAttrs.counterLen = 4;
         }

packages/paddlejs-core/src/opFactory/utils.ts

@@ -26,6 +26,15 @@ export function formatShape(shape: number[]): number[] {
  * @returns {number} total length of shape
  */
 export function accShape(shape: number[]): number {
+    return shape.reduce((all, num) => all * num);
+}
+
+/**
+ * calculate the sum of shape
+ * @param {Array} shape shape of tensor
+ * @returns {number} sum of shape
+ */
+export function getSumOfShape(shape: number[]): number {
     return shape.reduce((all, num) => all + num);
 }