Merge pull request #157 from JingyuanZhang/master

feat(webgl): add op shuffle_channel

Author: JingyuanZhang

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

@@ -1,14 +1,13 @@
-/* eslint-disable */
 /**
  * @file get the position of output tensor
  * @author yueshuangyan
  */
 
-import {moveTexture2PosToReal} from './common_func_with_texture';
+import { moveTexture2PosToReal } from './common_func_with_texture';
 
-export default function ({channel, height_shape, width_texture, height_texture}) {
+export default function ({ channel, height_shape, width_texture, height_texture }) {
     return `
-        ${moveTexture2PosToReal('out', {width_texture, height_texture})}
+        ${moveTexture2PosToReal('out', { width_texture, height_texture })}
         ivec4 getOutputTensorPos() {
             // 获取原始长度
             vec2 outCoord = moveTexture2PosToReal_out(vCoord.xy);
@@ -19,6 +18,6 @@ export default function ({channel, height_shape, width_texture, height_texture})
             int b = int(outCoord.y / float(${height_shape}));
             return ivec4(b, c, y, x);
         }
-    `
+    `;
 };
 

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

@@ -42,6 +42,7 @@ import connect from './shader/connect';
 import squeeze2 from './shader/squeeze2';
 import pad3d from './shader/pad3d';
 import reduce_mean from './shader/reduce_mean';
+import shuffle_channel from './shader/shuffle_channel';
 import hard_swish from './shader/hard_swish';
 import nearest_interp from './shader/nearest_interp';
 import nearest_interp_v2 from './shader/nearest_interp_v2';
@@ -96,7 +97,8 @@ const ops = {
     sqrt: dynamic('sqrt'),
     squeeze2,
     pad3d,
-    bilinear_interp_v2
+    bilinear_interp_v2,
+    shuffle_channel
 };
 export {
     ops

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

@@ -0,0 +1,81 @@
+/**
+ * @file shuffle_channel
+ * @description reshape2 transpose2 reshape2
+ */
+
+
+function mainFunc(
+    {
+        out
+    },
+    {
+        group = 2
+    }
+) {
+    const { total_shape, height_shape, width_shape, channel } = out;
+    const channels_per_group = channel / group;
+
+    const [
+        perm_0,
+        perm_1,
+        perm_2,
+        perm_3
+    ] = [1, 0, 2, 3];
+
+    return `
+    // start函数
+    void main(void) {
+        // 输出数据
+        ivec4 oPos = getOutputTensorPos();
+        float o = 0.0;
+
+        int sumVal = oPos.a
+            + oPos.b * ${width_shape}
+            + oPos.g * ${height_shape} * ${width_shape}
+            + oPos.r * ${channel} * ${width_shape} * ${height_shape};
+
+        ivec4 transpose_out_pos = transferFromNHWCtoNCHW(
+            sumVal,
+            ${group},
+            ${width_shape},
+            ${height_shape},
+            ${total_shape}
+        );
+
+        ivec4 transpose_in_pos = ivec4(transpose_out_pos[${perm_0}],
+            transpose_out_pos[${perm_1}], transpose_out_pos[${perm_2}], transpose_out_pos[${perm_3}]);
+        int sumVal2 = transpose_in_pos.a
+            + transpose_in_pos.b * ${width_shape}
+            + transpose_in_pos.g * ${height_shape} * ${width_shape}
+            + transpose_in_pos.r * ${channels_per_group} * ${width_shape} * ${height_shape};
+        ivec4 origin_oPos = transferFromNHWCtoNCHW(
+            sumVal2,
+            ${channel},
+            ${width_shape},
+            ${height_shape},
+            ${total_shape}
+        );
+
+
+        o = getValueFromTensorPos_origin(
+            origin_oPos[0],
+            origin_oPos[1],
+            origin_oPos[2],
+            origin_oPos[3]
+        );
+
+        setOutput(float(o));
+    }
+    `;
+}
+
+export default {
+    mainFunc,
+    params: [
+        'group'
+    ],
+    textureFuncConf: {
+        origin: ['getValueFromTensorPos']
+    },
+    commonFuncConf: ['transferFromNHWCtoNCHW']
+};

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

@@ -1,4 +1,3 @@
-
 /**
  * @file squeeze2
  */