From 779ec71c6f91b836409342378b929e526e3317ae Mon Sep 17 00:00:00 2001 From: JingyuanZhang <382248373@qq.com> Date: Thu, 3 Mar 2022 19:03:24 +0800 Subject: [PATCH] fix(core): fix feedShape in modelConfig webglFeedProcess --- packages/paddlejs-core/package.json | 2 +- packages/paddlejs-core/src/graph.ts | 1 + .../paddlejs-models/ocr/package-lock.json | 26 +++++++++---------- packages/paddlejs-models/ocr/package.json | 4 +-- packages/paddlejs-models/ocr/src/index.ts | 5 ++-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/packages/paddlejs-core/package.json b/packages/paddlejs-core/package.json index c9890a90..2a1973e3 100644 --- a/packages/paddlejs-core/package.json +++ b/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": { diff --git a/packages/paddlejs-core/src/graph.ts b/packages/paddlejs-core/src/graph.ts index d025f4d7..c7ea553f 100644 --- a/packages/paddlejs-core/src/graph.ts +++ b/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); } /** diff --git a/packages/paddlejs-models/ocr/package-lock.json b/packages/paddlejs-models/ocr/package-lock.json index cd84aaf8..978f0c02 100644 --- a/packages/paddlejs-models/ocr/package-lock.json +++ b/packages/paddlejs-models/ocr/package-lock.json @@ -6,7 +6,7 @@ "dependencies": { "@discoveryjs/json-ext": { "version": "0.5.6", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz", + "resolved": "http://registry.npm.baidu-int.com/@discoveryjs%2fjson-ext/-/json-ext-0.5.6.tgz", "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==", "dev": true }, @@ -21,9 +21,9 @@ "integrity": "sha512-41QOnNTlChVno1/cemuCKMURP3YvjrcyOMS009eHUHufZwo3yIe9iwdZPYPkRtbE91aATmhJKaSGkQi+4WAynQ==" }, "@paddlejs/paddlejs-core": { - "version": "2.1.14", - "resolved": "https://registry.npmjs.org/@paddlejs/paddlejs-core/-/paddlejs-core-2.1.14.tgz", - "integrity": "sha512-dqgAH7vrxLiHWb+8RqbS949hxbMQeYWVK/mujkwvw+PaJXOejbfHzs6snDeyuvsq27VZGuUvhEY4bNMk/BE6uw==" + "version": "2.1.15", + "resolved": "https://registry.npmjs.org/@paddlejs/paddlejs-core/-/paddlejs-core-2.1.15.tgz", + "integrity": "sha512-KGL61N8hQzlEO/PZjNngiOLh3GOwCn0p6oG/AruojTEkJYkPtnI3hSQgStEbP+hOkqp6mZYcoD+ykdJ64JItfQ==" }, "@types/eslint": { "version": "8.4.1", @@ -565,7 +565,7 @@ }, "domhandler": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", + "resolved": "http://registry.npm.baidu-int.com/domhandler/-/domhandler-4.3.0.tgz", "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", "dev": true, "requires": { @@ -996,7 +996,7 @@ }, "is-negative-zero": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "resolved": "http://registry.npm.baidu-int.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz", "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true }, @@ -1066,7 +1066,7 @@ }, "is-weakref": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "resolved": "http://registry.npm.baidu-int.com/is-weakref/-/is-weakref-1.0.2.tgz", "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dev": true, "requires": { @@ -1303,7 +1303,7 @@ }, "object-inspect": { "version": "1.12.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "resolved": "http://registry.npm.baidu-int.com/object-inspect/-/object-inspect-1.12.0.tgz", "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", "dev": true }, @@ -1568,7 +1568,7 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "resolved": "http://registry.npm.baidu-int.com/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, @@ -1719,7 +1719,7 @@ }, "tapable": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", + "resolved": "http://registry.npm.baidu-int.com/tapable/-/tapable-1.1.3.tgz", "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", "dev": true }, @@ -1757,7 +1757,7 @@ "dependencies": { "commander": { "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "resolved": "http://registry.npm.baidu-int.com/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, @@ -1775,7 +1775,7 @@ "dependencies": { "source-map": { "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "resolved": "http://registry.npm.baidu-int.com/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true } @@ -1878,7 +1878,7 @@ }, "watchpack": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", + "resolved": "http://registry.npm.baidu-int.com/watchpack/-/watchpack-2.3.1.tgz", "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", "dev": true, "requires": { diff --git a/packages/paddlejs-models/ocr/package.json b/packages/paddlejs-models/ocr/package.json index b745d071..af76c767 100644 --- a/packages/paddlejs-models/ocr/package.json +++ b/packages/paddlejs-models/ocr/package.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", diff --git a/packages/paddlejs-models/ocr/src/index.ts b/packages/paddlejs-models/ocr/src/index.ts index 44275649..929c6aba 100644 --- a/packages/paddlejs-models/ocr/src/index.ts +++ b/packages/paddlejs-models/ocr/src/index.ts @@ -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()] }