Merge pull request #396 from changy1105/master

chore(paddlejs-core): fix Memory leak #387

Author: JingyuanZhang

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

@@ -139,7 +139,7 @@ export default class WebGLBackend extends PaddlejsBackend {
             this.program = program;
             this.render(opData, isRendered, index, isPacked);
         });
-
+        opData.tensorData = null;
         if (query) {
             this.queryList.push({ name: opData.name, query, count: 1 });
             query = queryProcess.endQuery(this.gl, this.glVersion, query);

packages/paddlejs-core/src/commons/utils.ts

@@ -106,4 +106,26 @@ export function traverseVars(vars, callback) {
     Object.keys(vars).forEach(key => {
         callback(vars[key]);
     });
-}
+}
+
+/**
+ * delete useless data
+ * @param {Object} model
+ */
+export function delUselessData(model) {
+    model.ops = null;
+    if (model.vars instanceof Array) {
+        for (let i = 0; i < model.vars.length; i++) {
+            if (model.vars[i].data) {
+                delete model.vars[i].data;
+            }
+        }
+        return;
+    }
+    for (const name in model.vars) {
+        if (model.vars[name].data) {
+            delete model.vars[name].data;
+        }
+    }
+}
+

packages/paddlejs-core/src/runner.ts

@@ -4,7 +4,12 @@ import { Model, RunnerConfig, ModelOp, InputFeed, ModelVar, GraphType, FeedShape
 import OpData from './opFactory/opDataBuilder';
 import Tensor from './opFactory/tensor';
 import { GLOBALS } from './globals';
-import { getGlobalInterface, findVarByKey, AddItemToVars } from './commons/utils';
+import {
+    getGlobalInterface,
+    findVarByKey,
+    AddItemToVars,
+    delUselessData
+} from './commons/utils';
 import MediaProcessor from './mediaProcessor';
 import env from './env';
 
@@ -111,6 +116,7 @@ export default class Runner {
                 op.opData = opData;
             }
         });
+        delUselessData(this.model);
     }
 
     async preheat() {

packages/paddlejs-mediapipe/opencv/README.md

@@ -11,7 +11,20 @@ Opencv3.4 contains most of the commonly used APIs, supporting cv.boxPoints api.
 
 # opencv_ocr.js
 
-Encapsulate the opencv API used by ocr module.
+Encapsulate the opencv API used by ocr module, Containing the following api:
+```javascript
+[
+    'findContours', 
+    'minAreaRect', 
+    'boxPoints', 
+    'fillPoly',
+    'getPerspectiveTransform',
+    'warpPerspective',
+    'getRotationMatrix2D',
+    'warpAffine',
+    'resize'
+]
+```
 
 # modules 
 OpenCV modules:

packages/paddlejs-mediapipe/opencv/README_cn.md

@@ -11,7 +11,20 @@ opencv3.4版本，包含大多数常用api，增加 cv.boxPoints api。
 
 # opencv_ocr.js
 
-封装ocr模块所用到的opencv api。
+封装ocr模块所用到的opencv api，含有如下api：
+```javascript
+[
+    'findContours', 
+    'minAreaRect', 
+    'boxPoints', 
+    'fillPoly',
+    'getPerspectiveTransform',
+    'warpPerspective',
+    'getRotationMatrix2D',
+    'warpAffine',
+    'resize'
+]
+```
 
 # 模块
 

packages/paddlejs-mediapipe/opencv/library/opencv_ocr.js

@@ -1,13 +1,13 @@
 {
   "name": "@paddlejs-mediapipe/opencv",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "lightweight opencv.js",
   "main": "library/",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
-    "opencv", "blur", "core"
+    "opencv", "blur", "core", "ocr"
   ],
   "author": "",
   "license": "ISC"

packages/paddlejs-mediapipe/opencv/package.json

@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@paddlejs-mediapipe/opencv": "0.0.3",
+    "@paddlejs-mediapipe/opencv": "0.0.4",
     "@paddlejs/paddlejs-backend-webgl": "^1.1.15",
     "@paddlejs/paddlejs-core": "^2.1.15"
   },

packages/paddlejs-models/ocr/package-lock.json

@@ -2,7 +2,7 @@
  * @file ocr_rec model
  */
 
-import { Runner, Transformer, env } from '@paddlejs/paddlejs-core';
+import { Runner, env } from '@paddlejs/paddlejs-core';
 import '@paddlejs/paddlejs-backend-webgl';
 import DBProcess from './dbPostprocess';
 import RecProcess from './recPostprocess';
@@ -28,22 +28,6 @@ const canvas_rec = document.createElement('canvas') as HTMLCanvasElement;
 let detectRunner = null as Runner;
 let recRunner = null as Runner;
 
-class OptModel extends Transformer {
-    constructor() {
-        super('OptModel');
-    }
-
-    transform(...args: any) {
-        const [ops] = args;
-        for (let opIndex = 0; opIndex < ops.length; opIndex++) {
-            const op = ops[opIndex];
-            if (op.type === 'pool2d' && op.attrs.pooling_type === 'avg') {
-                op.type += '_avg';
-            }
-        }
-    }
-}
-
 initCanvas(canvas_det);
 initCanvas(canvas_rec);
 
@@ -75,10 +59,7 @@ export async function init(detCustomModel = null, recCustomModel = null) {
         mean: [0.5, 0.5, 0.5],
         std: [0.5, 0.5, 0.5],
         bgr: true,
-        webglFeedProcess: true,
-        plugins: {
-            preTransforms: [new OptModel()]
-        }
+        webglFeedProcess: true
     });
     const recInit = recRunner.init();