Merge pull request #431 from JingyuanZhang/master

fix: fix glsl calculate float(index) error in texture boundary

Author: yueshuangyan

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

@@ -3,48 +3,48 @@
  * @author yueshuangyan
  */
 
+// 根据tensor坐标获取对应纹理位置的pixel.r，返回值为 R 通道值
 export function getValueFromTensorPos(
     textureName: string,
     { width_shape, height_shape, channel, width_texture, height_texture }
 ) {
     const chw = width_shape * height_shape * channel;
     const hw = width_shape * height_shape;
     return `
-    // 根据tensor坐标获取这个tensor位置的值
     float getValueFromTensorPos_${textureName}(int n, int c, int h, int w) {
         int index = n * ${chw} + c * ${hw} + h * ${width_shape} + w;
-        int pos_w = int(mod(float(index), float(${width_texture})));
+        // 0.01 hack: 在 PC/WISE 机器上，出现某个值（比如 index 为 3520） float(index) 和 float(3520) 返回值不同的情况，目前 +0.01 hack
+        int pos_w = int(mod(float(index) + 0.01, float(${width_texture})));
         int pos_h = index / int(${width_texture});
         vec4 pixels = TEXTURE2D(texture_${textureName},
             vec2(
                 (float(pos_w)  + 0.5) / float(${width_texture}),
                 (float(pos_h) + 0.5) / float(${height_texture})
             )
         );
-        // 只用了r通道
         return pixels.r;
     }`;
 }
 
+// 根据tensor坐标获取对应纹理位置的pixel，返回值为四通道值 RGBA
 export function getValueFromTensorPosPacking(
     textureName: string,
     { channel, height_shape, width_texture, height_texture, width_shape }
 ) {
     const chw = width_shape * height_shape * channel;
     const hw = width_shape * height_shape;
     return `
-    // 根据tensor坐标获取这个tensor位置的值
     vec4 getValueFromTensorPosPacking_${textureName}(int n, int c, int h, int w) {
         int index = n * ${chw} + c * ${hw} + h * ${width_shape} + w;
-        int pos_w = int(mod(float(index), float(${width_texture})));
+        // 0.01 hack: 在 PC/WISE 设备上，出现某个值（比如 index 为 3520） float(index) 和 float(3520) 返回值不同的情况，目前 +0.01 hack
+        int pos_w = int(mod(float(index) + 0.01, float(${width_texture})));
         int pos_h = index / int(${width_texture});
         vec4 pixels = TEXTURE2D(texture_${textureName},
             vec2(
                 (float(pos_w)  + 0.5) / float(${width_texture}),
                 (float(pos_h) + 0.5) / float(${height_texture})
             )
         );
-        // 只用了r通道
         return pixels;
     }`;
 }

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

@@ -13,13 +13,22 @@ function mainFunc(
         fuse_relu,
         filter_nearest_vec4,
         filter_remainder_vec4,
-        act_type
+        act_type,
+        padding_algorithm = ''
     }
 ) {
     const [stride_v = 1, stride_h = 1] = strides;
-    const [padTop = 0, padLeft = 0] = paddings;
+    let [padTop = 0, padLeft = 0] = paddings;
     const [dilation_v = 1, dilation_h = 1] = dilations;
 
+    function calcPadding() {
+        if (padding_algorithm === 'SAME'
+            && ((Math.ceil((origin.width_shape - filter.width_shape) / stride_v) + 1) !== out.width_shape)) {
+            padTop = 1;
+            padLeft = 1;
+        }
+    }
+    calcPadding();
     return `
     // start函数
     void main(void) {