Merge pull request #385 from PaddlePaddle/master

Merge Master

Author: JingyuanZhang

packages/paddlejs-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paddlejs/paddlejs-core",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "",
   "main": "lib/index",
   "scripts": {

packages/paddlejs-core/src/graph.ts

@@ -38,6 +38,7 @@ export default class ModelGraph {
         this.type = config.type || this.type;
         this.plugins = config.plugins;
         this.config = config;
+        model.feedShape && (this.config.feedShape = model.feedShape);
     }
 
     /**

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

@@ -10,9 +10,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@paddlejs-mediapipe/opencv": "0.0.3",
     "@paddlejs/paddlejs-backend-webgl": "^1.1.15",
-    "@paddlejs/paddlejs-core": "^2.1.14",
-    "@paddlejs-mediapipe/opencv": "0.0.3"
+    "@paddlejs/paddlejs-core": "^2.1.15"
   },
   "devDependencies": {
     "d3-polygon": "^2.0.0",

packages/paddlejs-models/ocr/package.json

@@ -59,13 +59,13 @@ export async function init(detCustomModel = null, recCustomModel = null) {
     const detModelPath = 'https://paddlejs.bj.bcebos.com/models/fuse/ocr/ch_PP-OCRv2_det_fuse_activation/model.json';
     const recModelPath = 'https://paddlejs.bj.bcebos.com/models/fuse/ocr/ch_PP-OCRv2_rec_fuse_activation/model.json';
     env.set('webgl_pack_output', true);
-    env.set('webgl_feed_process', true);
     detectRunner = new Runner({
         modelPath: detCustomModel ? detCustomModel : detModelPath,
         fill: '#fff',
         mean: [0.485, 0.456, 0.406],
         std: [0.229, 0.224, 0.225],
-        bgr: true
+        bgr: true,
+        webglFeedProcess: true
     });
     const detectInit = detectRunner.init();
 
@@ -75,6 +75,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()]
         }