Merge pull request #416 from JingyuanZhang/master

fix(webgl): close pack_output in webgl 1.0

Author: JingyuanZhang

e2e/jest-puppeteer.config.js

@@ -8,7 +8,7 @@ module.exports = {
     server: {
         command: './node_modules/ts-node/dist/bin.js e2e/server.ts',
         port: 9898,
-        launchTimeout: 50000,
+        launchTimeout: 80000,
         debug: true
     }
 };

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

@@ -156,14 +156,8 @@ export default class WebGLBackend extends PaddlejsBackend {
 
         const pbo = this.createPBO();
         await this.createAndWaitForFence();
-        const result = this.downloadFloat32TensorFromBuffer(pbo);
-
         const shape = fetchInfo ? fetchInfo.shape : [];
-        if (env.get('webgl_pack_output')) {
-            return result.slice(0, getSizeFromShape(shape));
-        }
-
-        return result;
+        return this.downloadFloat32TensorFromBuffer(pbo, shape);
     }
 
     createPBO() {
@@ -234,25 +228,23 @@ export default class WebGLBackend extends PaddlejsBackend {
         fn();
     }
 
-    downloadFloat32TensorFromBuffer(buffer) {
+    downloadFloat32TensorFromBuffer(buffer, shape) {
         const size: number = 4 * this.width_texture_out * this.height_texture_out;
         if (this.glVersion === 2) {
             const gl2 = this.gl as WebGL2RenderingContext;
             const pixels = new Float32Array(size);
             gl2.bindBuffer(gl2.PIXEL_PACK_BUFFER, buffer);
             gl2.getBufferSubData(gl2.PIXEL_PACK_BUFFER, 0, pixels);
             gl2.bindBuffer(gl2.PIXEL_PACK_BUFFER, null);
-
             const result: number[] = [];
             if (env.get('webgl_pack_output')) {
-                return Array.from(pixels);
+                return Array.from(pixels).slice(0, getSizeFromShape(shape));
             }
             for (let i = 0; i < this.width_texture_out * this.height_texture_out; i++) {
                 result.push(pixels[4 * i]);
             }
             return result;
         }
-
         const pixels = buffer;
         const result = [] as number[];
         for (let i = 0; i < this.width_texture_out * this.height_texture_out; i++) {

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

@@ -10,7 +10,7 @@ function mainFunc() {
     void main(void) {
         vec2 outCoord = vCoord.xy;
         // 支持模型不按比例拉伸
-        if (u_keep_ratio > 0) {
+        if (u_keep_ratio == 0) {
             vec4 origin = TEXTURE2D(texture_origin, outCoord);
             setPackedOutput(origin);
             return;

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

@@ -176,11 +176,12 @@ export class GLTexture {
 
         if (
             data instanceof Uint8Array
-            || data instanceof Uint8ClampedArray
-            || !(data instanceof Float32Array || data instanceof Array)) {
+            || data instanceof Uint8ClampedArray) {
             // case1: 输入为0~255之间的像素数据，类型为Uint8Array 或 Uint8ClampedArray
             // case2: 小程序环境，输入数据可能是HTMLImageElement、HTMLVideoElement、HTMLCanvasElement、小程序中图像的临时path string。
             texeltype = gl.UNSIGNED_BYTE;
+        }
+        else if (!(data instanceof Float32Array || data instanceof Array)) {
             gl.texImage2D(
                 gl.TEXTURE_2D,
                 0,

packages/paddlejs-core/src/runner.ts

@@ -281,7 +281,7 @@ export default class Runner {
 
         const {
             webglFeedProcess = false,
-            keepRatio = false
+            keepRatio = true
         } = this.runnerConfig;
         if (webglFeedProcess || env.get('webgl_gpu_pipeline')) {
             // support imageDataLike feed which has unit8ClampedArray data and width + height or shape

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

@@ -98,7 +98,7 @@ export default class WebglFeedProcess extends Transformer {
                 },
                 u_keep_ratio: {
                     type: UniformType.uniform1i,
-                    value: 0
+                    value: 1
                 }
             },
             isPacked: true

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

@@ -15,7 +15,7 @@ export default class PackOut extends Transformer {
     }
 
     transform(...args: any) {
-        if (!env.get('webgl_pack_output')) {
+        if (!env.get('webgl_pack_output') || env.get('webglVersion') === 1) {
             return;
         }
         const [ops, vars] = args;

packages/paddlejs-models/detect/src/index.ts

@@ -14,7 +14,7 @@ export async function init() {
         mean: [0.5, 0.5, 0.5],
         std: [0.5, 0.5, 0.5],
         bgr: true,
-        keepRatio: true,
+        keepRatio: false,
         webglFeedProcess: true
     });