Merge pull request #417 from yueshuangyan/master

fix: compatible with opBehavior and transform for wasm

Author: JingyuanZhang

packages/paddlejs-backend-cpu/src/ops/elementwise_add.ts

@@ -75,7 +75,7 @@ class Attrs {
 }
 
 const behaviors = [
-    'processAxis'
+    'processElementwiseAxis'
 ];
 
 const inputsName = [

packages/paddlejs-backend-wasm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@paddlejs/paddlejs-backend-wasm",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "",
     "main": "lib/index",
     "scripts": {

packages/paddlejs-backend-wasm/src/ops.ts

@@ -60,25 +60,25 @@ export default {
     },
     elementwise_add: {
         behaviors: [
-            'processAxis',
+            'processElementwiseAxis',
             'genElementwiseCounterPos'
         ]
     },
     elementwise_div: {
         behaviors: [
-            'processAxis',
+            'processElementwiseAxis',
             'genElementwiseCounterPos'
         ]
     },
     elementwise_mul: {
         behaviors: [
-            'processAxis',
+            'processElementwiseAxis',
             'genElementwiseCounterPos'
         ]
     },
     elementwise_sub: {
         behaviors: [
-            'processAxis',
+            'processElementwiseAxis',
             'genElementwiseCounterPos'
         ]
     },

packages/paddlejs-backend-webgpu/src/ops/index.ts

@@ -75,7 +75,7 @@ export const ops = {
         main: elementwise_add_main,
         deps: elementwise_add_deps,
         behaviors: [
-            'processAxis'
+            'processElementwiseAxis'
         ]
     },
     split: {

packages/paddlejs-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paddlejs/paddlejs-core",
-  "version": "2.1.18",
+  "version": "2.1.19",
   "description": "",
   "main": "lib/index",
   "scripts": {

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

@@ -1,3 +1,4 @@
+import env from '../env';
 import { OpData } from '../commons/interface';
 import * as Utils from './utils';
 
@@ -219,6 +220,29 @@ const behaviors : Behaviors = {
             this.processedAttrs.num = Object.values(this.tensorDataMap)
                 .filter(item => item.tensorName === 'out').length || 1;
         }
+
+        // wasm backend is not support any number of inputs, retain temporarily
+        if (env.get('backend') === 'wasm') {
+            this.processedAttrs.fourInputs = false;
+
+            const counter = this.tensorDataMap['counter'];
+            if (counter) {
+                const yShape = Utils.formatShape(counter.shape);
+                this.processedAttrs.counter_num = yShape[axis];
+            }
+            const appender = this.tensorDataMap['appender'];
+            if (appender) {
+                const zShape = Utils.formatShape(appender.shape);
+                this.processedAttrs.append_num = zShape[axis];
+            }
+
+            const fourth = this.tensorDataMap['fourth'];
+            if (fourth) {
+                this.processedAttrs.fourInputs = true;
+                const mShape = Utils.formatShape(fourth.shape);
+                this.processedAttrs.fourth_num = mShape[axis];
+            }
+        }
     },
 
     processElementwiseAxis() {

packages/paddlejs-core/src/transform/formatInputsX.ts

@@ -2,6 +2,7 @@
  * @file FormatInputsX
  */
 
+import env from '../env';
 import Transformer from './transformer';
 
 export default class FormatInputsX extends Transformer {
@@ -28,8 +29,30 @@ export default class FormatInputsX extends Transformer {
             return;
         }
 
-        const inputsX = inputs.X || inputs.Input;
         // 兼容key为X,value是个长度大于1的数组的情况，如concat
+        const inputsX = inputs.X || inputs.Input;
+
+        // wasm backend is not support any number of inputs, retain temporarily
+        if (env.get('backend') === 'wasm') {
+            if (inputsX.length > 4) {
+                throw Error('Not yet supporting concat input tensors more than 4.');
+            }
+            if (inputsX.length > 1) {
+                // 兼容key为X,value是个长度大于1的数组的情况，如concat
+                const [x_name, y_name, z_name, m_name] = inputsX;
+                inputs['X'] = [x_name];
+                y_name && (inputs['Y'] = [y_name]);
+                if (z_name) {
+                    inputs['Z'] = [z_name];
+                    originOp.type += '_mul';
+                }
+                if (m_name) {
+                    inputs['M'] = [m_name];
+                }
+            }
+            return;
+        }
+
         if (inputsX.length > 1) {
             inputsX.forEach((item, index) => {
                 inputs[`origin${index > 0 ? `_${index}` : ''}`] = [item];