feat(webgl): support pool2d adaptive and adapt split num attr

JingyuanZhang · JingyuanZhang · commit 855c9b3867fb · 2022-03-08T22:09:45.000+08:00
diff --git a/packages/paddlejs-backend-webgl/package-lock.json b/packages/paddlejs-backend-webgl/package-lock.json
diff --git a/packages/paddlejs-backend-webgl/package.json b/packages/paddlejs-backend-webgl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paddlejs/paddlejs-backend-webgl",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "description": "",
   "main": "lib/index",
   "scripts": {
diff --git a/packages/paddlejs-backend-webgl/src/ops/shader/pool2d.ts b/packages/paddlejs-backend-webgl/src/ops/shader/pool2d.ts
@@ -66,6 +66,7 @@ export default {
     behaviors: [
         'isMax',
         'setPacked',
+        'setAdaptive',
         'isGlobalPooling'
     ]
 };
diff --git a/packages/paddlejs-core/package.json b/packages/paddlejs-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paddlejs/paddlejs-core",
-  "version": "2.1.15",
+  "version": "2.1.16",
   "description": "",
   "main": "lib/index",
   "scripts": {
diff --git a/packages/paddlejs-core/src/opFactory/opBehaviors.ts b/packages/paddlejs-core/src/opFactory/opBehaviors.ts
@@ -211,6 +211,10 @@ const behaviors : Behaviors = {
         // 保存 输入 tensor 对应dim 的长度
         this.processedAttrs.inputs_dim = shape[axis];
         this.processedAttrs.dim = axis;
+        if (this.processedAttrs.num === 0) {
+            this.processedAttrs.num = Object.values(this.tensorDataMap)
+                .filter(item => item.tensorName === 'out').length || 1;
+        }
     },
 
     processElementwiseAxis() {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@paddlejs/paddlejs-backend-webgl",`
`3`		`- "version": "1.1.15",`
	`3`	`+ "version": "1.1.17",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "lib/index",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ export default {`
`66`	`66`	`behaviors: [`
`67`	`67`	`'isMax',`
`68`	`68`	`'setPacked',`
	`69`	`+ 'setAdaptive',`
`69`	`70`	`'isGlobalPooling'`
`70`	`71`	`]`
`71`	`72`	`};`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@paddlejs/paddlejs-core",`
`3`		`- "version": "2.1.15",`
	`3`	`+ "version": "2.1.16",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "lib/index",`
`6`	`6`	`"scripts": {`