Merge pull request #218 from JingyuanZhang/master

feat(core&webgl): update cacheTextures structure to accelerate preheat process

Author: JingyuanZhang

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

@@ -22,7 +22,6 @@ export default class WebGLBackend extends PaddlejsBackend {
     pbo?: WebGLBuffer | null;
     vertexBuffer?: WebGLBuffer | null;
     textureConf: TextureConfig | null;
-    nextTexture?: WebGLTexture | null;
     currentTexture?: WebGLTexture | null;
     textureBufferIndex?: number;
     cacheTextures: object;
@@ -308,41 +307,38 @@ export default class WebGLBackend extends PaddlejsBackend {
             if (!loc) {
                 return;
             }
-            that.initTexture(textureIndex, item, iLayer, isRendered, isPacked, modelName);
+            that.initTexture(textureIndex, item, isPacked);
             gl.uniform1i(loc, textureIndex++);
         });
         // gl.clearColor(.0, .0, .0, 1);
         // gl.clear(gl.COLOR_BUFFER_BIT);
         gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
     }
 
-    initTexture(index, item, iLayer, isRendered, isPacked, modelName) {
+    initTexture(index, item, isPacked) {
         const gl = this.gl;
         const textureConf = this.textureConf as TextureConfig;
         const tensorName = item.opts.type;
-        const prefix = modelName + '_';
         let texture;
 
-        if (!item.data) {
-            texture = this.texturesMap[item.opts.type];
+        if (!item.persistable) {
+            texture = this.texturesMap[tensorName];
         }
         else {
-            // texture = gl.createTexture();
-            if (isRendered && item.persistable) {
-                const tData = this.cacheTextures[prefix + iLayer];
-                texture = tData['texture_' + tensorName];
+            this.cacheTextures = this.cacheTextures || {};
+            if (this.cacheTextures[tensorName]) {
+                texture = this.cacheTextures[tensorName];
             }
             else {
                 texture = gl.createTexture();
-                this.cacheTextures[prefix + iLayer] = this.cacheTextures[prefix + iLayer] || {};
-                this.cacheTextures[prefix + iLayer]['texture_' + tensorName] = texture;
+                this.cacheTextures[tensorName] = texture;
             }
         }
 
         gl.activeTexture(gl[`TEXTURE${index}`]);
         gl.bindTexture(gl.TEXTURE_2D, texture);
 
-        if (item.data && (!isRendered || !item.persistable)) {
+        if (item.data) {
             gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
             gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
             gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
@@ -395,6 +391,7 @@ export default class WebGLBackend extends PaddlejsBackend {
                     gl.FLOAT,
                     temp);
             }
+            item.data = null;
         }
     }
 

packages/paddlejs-core/__tests__/spec/mediaProcessor.test.ts

@@ -47,7 +47,7 @@ describe('test mediaProcessor with scale and targetSize', () => {
 
     test('test api process', () => {
         const data = processror.process(img, mediaParams);
-        expect(data).toEqual([{ data: [], shape: [1, 3, 224, 224], name: 'image', persistable: false }]);
+        expect(data).toEqual([{ data: [], shape: [1, 3, 224, 224], name: 'image', persistable: true }]);
     });
 });
 

packages/paddlejs-core/src/mediaProcessor.ts

@@ -69,7 +69,7 @@ export default class MediaProcessor {
                 data: data,
                 shape: opt.shape || opt.targetShape,
                 name: 'image',
-                persistable: false
+                persistable: true
             }] as InputFeed[];
         }
 
@@ -86,7 +86,7 @@ export default class MediaProcessor {
                 data,
                 shape: [1, 4, opt.targetShape[2], opt.targetShape[3]],
                 name: 'image',
-                persistable: false
+                persistable: true
             }] as InputFeed[];
         }
 
@@ -95,7 +95,7 @@ export default class MediaProcessor {
             data,
             shape: opt.targetShape || opt.shape,
             name: 'image',
-            persistable: false
+            persistable: true
         }] as InputFeed[];
     }
 

packages/paddlejs-core/src/runner.ts

@@ -138,7 +138,7 @@ export default class Runner {
                         data: new Float32Array(data as number[]),
                         shape: shape || [1, fc, fh, fw],
                         name: 'image',
-                        persistable: false
+                        persistable: true
                     }
                 ];
             }
@@ -151,7 +151,7 @@ export default class Runner {
                     data: new Float32Array(inputData),
                     shape: shape || [1, fc, height || fh, width || fw],
                     name: 'image',
-                    persistable: false
+                    persistable: true
                 }
             ];
         }
@@ -193,7 +193,7 @@ export default class Runner {
                 data: new Float32Array(fc * fh * fw).fill(1.0),
                 name: 'image',
                 shape: [1, fc, fh, fw],
-                persistable: false
+                persistable: true
             };
         }