Merge pull request #194 from JingyuanZhang/master

feat(webgl): change packing op name when transforms and del redundant…

Author: JingyuanZhang

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

@@ -96,9 +96,9 @@ export default class WebGLBackend extends PaddlejsBackend {
 
 
 
-    createProgram({ name, outTensor, inputTensors, shaderParams, runtime, isFinalOp, isPacked }) {
+    createProgram({ name, outTensor, inputTensors, shaderParams, runtime, isFinalOp }) {
         // genFscode  buildShader
-        const fsCode = buildShader(this.textureConf, name, inputTensors, shaderParams, runtime, isPacked);
+        const fsCode = buildShader(this.textureConf, name, inputTensors, shaderParams, runtime);
 
         const programInstance = new GLProgram(this.gl, this.vShader as WebGLShader, fsCode, outTensor);
         programInstance.fsCode = fsCode;

packages/paddlejs-backend-webgl/src/ops/shader/custom/imgFeed.ts

@@ -0,0 +1,25 @@
+/**
+ * @file feed post process
+ */
+
+function mainFunc(
+    {},
+    {}
+) {
+
+    return `
+    // start函数
+    void main(void) {
+        ivec4 oPos = getOutputTensorPos();
+        vec4 o = getValueFromTensorPosPacking_origin(oPos.r, oPos.g, oPos.b, oPos.a);
+        setPackedOutput(o / 255.0);
+    }
+    `;
+}
+export default {
+    mainFunc,
+    params: [],
+    textureFuncConf: {
+        origin: ['getValueFromTensorPosPacking']
+    }
+};

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

@@ -103,15 +103,6 @@ function getTensorParams(inputTensors: Tensor[], ownParams: [], fShaderParams: o
     return { textureParams: tensorsParams, opParams, active_function: fShaderParams['active_function'] };
 }
 
-
-function getExactOpName(name, isPacked) {
-    if (name.indexOf('conv2d-elementwise_add') > -1) {
-        return 'conv2d_elementwise_add';
-    }
-    return isPacked ? `${name}_packing` : name;
-}
-
 export {
-    getExactOpName,
     getTensorParams
 };

packages/paddlejs-backend-webgl/src/webgl/buildShader.ts

@@ -5,15 +5,15 @@
 
 import { env } from '@paddlejs/paddlejs-core';
 import { ops } from '../ops';
-import { getTensorParams, getExactOpName } from '../ops/utils';
+import { getTensorParams } from '../ops/utils';
 import genPrefixCode from '../ops/atom/prefix';
 import genSuffixCode from '../ops/atom/suffix';
 import * as commonFunc from '../ops/atom/common_func';
 import * as textureFunc from '../ops/atom/common_func_with_texture';
 
-export default function buildShader(textureConf, type, inputTensors, fShaderParams, runtime: number, isPacked = false) {
+export default function buildShader(textureConf, type, inputTensors, fShaderParams, runtime: number) {
     let code = '';
-    const opName = getExactOpName(type, isPacked);
+    const opName = type;
     try {
 
         const { params = {}, mainFunc, textureFuncConf = {}, commonFuncConf } = ops[opName];

packages/paddlejs-core/src/opFactory/opDataBuilder.ts

@@ -154,8 +154,7 @@ export default class OpData {
             outTensor,
             inputTensors,
             shaderParams: this.fShaderParams[index],
-            runtime: index,
-            isPacked: this.isPackedOp || false
+            runtime: index
         }));
     }
 

packages/paddlejs-core/src/transform/texturePacking.ts

@@ -100,6 +100,7 @@ function transformOriginOp(op, opsMap) {
         .forEach(key => {
             op.outputs[key] = [`${op.outputs[key]}_packed`];
         });
+    op.type = `${op.type}_packing`;
     op.id = `${op.type}_${+new Date()}_${opsMap.length}`;
     op.isPacked = true;
 }