Merge pull request #208 from JingyuanZhang/master

fix(webgl): fix pool2d ksize params and conv2d fuse op with relu6

Author: JingyuanZhang

packages/paddlejs-backend-webgl/src/ops/atom/common_func.ts

@@ -17,8 +17,7 @@ float prelu(float x, float p, float b) {
 
 const relu6 = `
 float relu6(float x, float threshold, float b) {
-    float result = max(0.0, x);
-    result = min(result, threshold);
+    float result = min(max(0.0, x), threshold);
     return result;
 }`;
 

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

@@ -12,7 +12,8 @@ function mainFunc(
         dilations = [],
         fuse_relu,
         filter_nearest_vec4,
-        filter_remainder_vec4
+        filter_remainder_vec4,
+        act_type
     }
 ) {
     const [stride_v = 1, stride_h = 1] = strides;
@@ -105,6 +106,9 @@ function mainFunc(
         if (${fuse_relu}) {
             res = max(0.0, res);
         }
+        else if (${act_type === 'relu6'}) {
+            res = min(max(0.0, res), 6.0);
+        }
 
         setOutput(res);
     }
@@ -119,7 +123,8 @@ export default {
         'dilations',
         'groups',
         'filter_nearest_vec4',
-        'filter_remainder_vec4'
+        'filter_remainder_vec4',
+        'act_type'
     ],
     textureFuncConf: {
         filter: ['getValueFromTensorPos'],

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

@@ -8,7 +8,7 @@ function mainFunc(
 ) {
     const [stride_v = 1, stride_h = 1] = strides;
     const [padTop = 0, padLeft = 0] = paddings;
-    const [ksize_x, ksize_y] = ksize;
+    const [ksize_y, ksize_x] = ksize;
     return `
     // start函数
     void main(void) {

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

@@ -8,7 +8,7 @@ function mainFunc(
 ) {
     const [stride_v = 1, stride_h = 1] = strides;
     const [padTop = 0, padLeft = 0] = paddings;
-    const [ksize_x, ksize_y] = ksize;
+    const [ksize_y, ksize_x] = ksize;
     return `
     // start函数
     void main(void) {

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

@@ -12,7 +12,7 @@ function mainFunc(
 ) {
     const [stride_v = 1, stride_h = 1] = strides;
     const [padTop = 0, padLeft = 0] = paddings;
-    const [ksize_x, ksize_y] = ksize;
+    const [ksize_y, ksize_x] = ksize;
     const originShape = recoverShape(origin);
     let computedIndex = '';
     let outputCode = 'setOutput(float(res));';