Merge pull request #154 from BenAnn/master

fix(webgl): fix pad3d error params

Author: yueshuangyan

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

@@ -9,76 +9,76 @@ function recoverShape({ total_shape, channel, height_shape, width_shape }) {
 
 function mainFunc(
     { origin },
-    { padding, mode, value }
+    { paddings, mode, value }
 ) {
     const originShape = recoverShape(origin);
     const modes = {
         reflect: `
             int a;
             int b;
-            if (oPos.a - ${padding[0]} < 0) {
-                a = ${padding[0]} - oPos.a;
+            if (oPos.a - ${paddings[0]} < 0) {
+                a = ${paddings[0]} - oPos.a;
             }
-            else if (oPos.a - ${padding[0]} >= ${originShape[3]}) {
-                a = ${originShape[3]} - (oPos.a - ${padding[0]} - ${originShape[3]} + 1) - 1;
+            else if (oPos.a - ${paddings[0]} >= ${originShape[3]}) {
+                a = ${originShape[3]} - (oPos.a - ${paddings[0]} - ${originShape[3]} + 1) - 1;
             }
             else {
-                a = oPos.a - ${padding[0]};
+                a = oPos.a - ${paddings[0]};
             }
-            if (oPos.b - ${padding[2]} < 0) {
-                b = ${padding[2]} - oPos.b;
+            if (oPos.b - ${paddings[2]} < 0) {
+                b = ${paddings[2]} - oPos.b;
             }
-            else if (oPos.b - ${padding[2]} >= ${originShape[2]}) {
-                b = ${originShape[2]} - (oPos.b - ${padding[2]} - ${originShape[2]} + 1) - 1;
+            else if (oPos.b - ${paddings[2]} >= ${originShape[2]}) {
+                b = ${originShape[2]} - (oPos.b - ${paddings[2]} - ${originShape[2]} + 1) - 1;
             }
             else {
-                b = oPos.b - ${padding[2]};
+                b = oPos.b - ${paddings[2]};
             }
             o = getValueFromTensorPos_origin(oPos.r, oPos.g, b, a);
         `,
         replicate: `
             int a;
             int b;
-            if (oPos.a - ${padding[0]} < 0) {
+            if (oPos.a - ${paddings[0]} < 0) {
                 a = 0;
             }
-            else if (oPos.a - ${padding[0]} >= ${originShape[3]}) {
+            else if (oPos.a - ${paddings[0]} >= ${originShape[3]}) {
                 a = ${originShape[3]} - 1;
             }
             else {
-                a = oPos.a - ${padding[0]};
+                a = oPos.a - ${paddings[0]};
             }
-            if (oPos.b - ${padding[2]} < 0) {
+            if (oPos.b - ${paddings[2]} < 0) {
                 b = 0;
             }
-            else if (oPos.b - ${padding[2]} >= ${originShape[2]}) {
+            else if (oPos.b - ${paddings[2]} >= ${originShape[2]}) {
                 b = ${originShape[2]} - 1;
             }
             else {
-                b = oPos.b - ${padding[2]};
+                b = oPos.b - ${paddings[2]};
             }
             o = getValueFromTensorPos_origin(oPos.r, oPos.g, b, a);
         `,
         circular: `
             int a;
             int b;
-            if (oPos.a - ${padding[0]} < 0) {
-                a = int(mod(float(${padding[0]} + oPos.a - 1), float(${originShape[3]})));
+            if (oPos.a - ${paddings[0]} < 0) {
+                a = int(mod(float(${paddings[0]} + oPos.a - 1), float(${originShape[3]})));
             }
-            else if (oPos.a - ${padding[0]} >= ${originShape[3]}) {
-                a = int(mod(float(oPos.a - ${padding[0]} - ${originShape[3]}), float(${originShape[3]})));
+            else if (oPos.a - ${paddings[0]} >= ${originShape[3]}) {
+                a = int(mod(float(oPos.a - ${paddings[0]} - ${originShape[3]}), float(${originShape[3]})));
             }
             else {
-                a = oPos.a - ${padding[0]};
+                a = oPos.a - ${paddings[0]};
             }
-            if (oPos.b - ${padding[2]} < 0) {
-                b = int(mod(float(${padding[2]} + oPos.b - 1), float(${originShape[2]})));
+            if (oPos.b - ${paddings[2]} < 0) {
+                b = int(mod(float(${paddings[2]} + oPos.b - 1), float(${originShape[2]})));
             }
-            else if (oPos.b - ${padding[2]} >= ${originShape[2]}) {
-                b = int(mod(float(oPos.b - ${padding[2]} - ${originShape[2]}), float(${originShape[2]})));
+            else if (oPos.b - ${paddings[2]} >= ${originShape[2]}) {
+                b = int(mod(float(oPos.b - ${paddings[2]} - ${originShape[2]}), float(${originShape[2]})));
             }
             else {
-                b = oPos.b - ${padding[2]};
+                b = oPos.b - ${paddings[2]};
             }
             o = getValueFromTensorPos_origin(oPos.r, oPos.g, b, a);
         `,
@@ -92,12 +92,12 @@ function mainFunc(
     void main(void) {
         ivec4 oPos = getOutputTensorPos();
         float o = ${defaultValue};
-        if (oPos.a - ${padding[0]} >= 0
-            && oPos.b - ${padding[2]} >= 0
-            && oPos.a - ${padding[0]} < ${originShape[3]}
-            && oPos.b - ${padding[2]} < ${originShape[2]}
+        if (oPos.a - ${paddings[0]} >= 0
+            && oPos.b - ${paddings[2]} >= 0
+            && oPos.a - ${paddings[0]} < ${originShape[3]}
+            && oPos.b - ${paddings[2]} < ${originShape[2]}
         ) {
-            o = getValueFromTensorPos_origin(oPos.r, oPos.g, oPos.b - ${padding[2]}, oPos.a - ${padding[0]});
+            o = getValueFromTensorPos_origin(oPos.r, oPos.g, oPos.b - ${paddings[2]}, oPos.a - ${paddings[0]});
         }
         else {
             ${modes[mode]}
@@ -109,7 +109,7 @@ function mainFunc(
 export default {
     mainFunc,
     params: [
-        'padding',
+        'paddings',
         'mode',
         'value'
     ],

packages/paddlejs-backend-webgl/test/op/data/pad3d.json

@@ -19,7 +19,7 @@
         }, 
         {
             "attrs": {
-                "padding": [2, 2, 2, 2, 0, 0],
+                "paddings": [2, 2, 2, 2, 0, 0],
                 "mode": "constant",
                 "value": "0.0"
             },