Merge pull request #325 from JingyuanZhang/master

JingyuanZhang · web-flow · commit 84334f07d88c · 2022-02-10T14:56:50.000+08:00
chore: publish core@2.1.11 webgl@1.1.11 and update model and e2e demo
diff --git a/e2e/dist/assets/imgs/banana.jpeg b/e2e/dist/assets/imgs/banana.jpeg
diff --git a/e2e/dist/index.html b/e2e/dist/index.html
@@ -21,7 +21,7 @@
     </head>
     <body>
         <img id="car" src="./assets/imgs/car.webp"/>
-        <img id="cat" src="./assets/imgs/cat.jpeg"/>
+        <img id="banana" src="./assets/imgs/banana.jpeg"/>
         <img id="ok" src="./assets/imgs/ok.jpeg"/>
         <img id="human" src="./assets/imgs/human.jpg"/>
         <img id="seg" src="./assets/imgs/seg.png"/>
diff --git a/e2e/tests/mobilenet.test.ts b/e2e/tests/mobilenet.test.ts
@@ -12,7 +12,7 @@ describe('e2e test mobilenet model', () => {
         page.on('console', msg => console.log('PAGE LOG:', msg.text()));
         const res = await page.evaluate(async map => {
             const carImg = document.querySelector('#car');
-            const catImg = document.querySelector('#cat');
+            const catImg = document.querySelector('#banana');
             const path = 'https://paddlejs.cdn.bcebos.com/models/mobilenetV2_nchw';
             const mobilenet = paddlejs['mobilenet'];
 
@@ -30,7 +30,7 @@ describe('e2e test mobilenet model', () => {
         }, map);
 
         const expected0 = 'sports car, sport car';
-        const expected1 = 'Egyptian cat';
+        const expected1 = 'banana';
         await expect(res[0]).toEqual(expected0);
         await expect(res[1]).toEqual(expected1);
     });
diff --git a/packages/paddlejs-backend-webgl/package.json b/packages/paddlejs-backend-webgl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paddlejs/paddlejs-backend-webgl",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "",
   "main": "lib/index",
   "scripts": {
diff --git a/packages/paddlejs-core/package.json b/packages/paddlejs-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paddlejs/paddlejs-core",
-  "version": "2.1.10",
+  "version": "2.1.11",
   "description": "",
   "main": "lib/index",
   "scripts": {
diff --git a/packages/paddlejs-core/src/loader.ts b/packages/paddlejs-core/src/loader.ts
@@ -37,7 +37,7 @@ export default class ModelLoader {
     };
 
     constructor(modelPath: string) {
-        let modelDir = '';
+        let modelDir = modelPath;
         let filename = 'model.json';
         if (modelPath.endsWith('.json')) {
             const dirPosIndex = modelPath.lastIndexOf('/') + 1;
diff --git a/packages/paddlejs-models/humanseg/package.json b/packages/paddlejs-models/humanseg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paddlejs-models/humanseg",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "",
   "main": "lib/index",
   "scripts": {
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@paddlejs/paddlejs-backend-webgl": "^1.1.2",
-    "@paddlejs/paddlejs-core": "^2.1.4"
+    "@paddlejs/paddlejs-backend-webgl": "^1.1.11",
+    "@paddlejs/paddlejs-core": "^2.1.11"
   },
   "devDependencies": {
     "html-webpack-plugin": "^3.2.0",
diff --git a/packages/paddlejs-models/humanseg/src/index.ts b/packages/paddlejs-models/humanseg/src/index.ts
@@ -21,8 +21,8 @@ blurFilter.addFilter('blur', 10);
 
 
 export async function load(needPreheat = true, enableLightModel = false, customModel = null) {
-    const modelpath = 'https://paddlejs.cdn.bcebos.com/models/shufflenetv2_398x224/model.json';
-    const lightModelPath = 'https://paddlejs.cdn.bcebos.com/models/shufflenetv2_288x160/model.json';
+    const modelpath = 'https://paddlejs.cdn.bcebos.com/models/shufflenetv2_humanseg_398x224_nchw/model.json';
+    const lightModelPath = 'https://paddlejs.cdn.bcebos.com/models/shufflenetv2_humanseg_288x160_nchw/model.json';
     const path = customModel
         ? customModel
         : enableLightModel ? lightModelPath : modelpath;
diff --git a/packages/paddlejs-models/mobilenet/demo/index.html b/packages/paddlejs-models/mobilenet/demo/index.html
@@ -60,7 +60,7 @@
                                     <div class="h2">操作面板：</div><input type="file" id="uploadImg">
                                     <p class="help-block">点击按钮，选择图片触发计算.</p>
                                     <div class="paddle-demo-block-wrapper">
-                                        <img id="image" src="https://mms-voice.cdn.bcebos.com/mumstory/banana.jpg" style="height: 50px" alt="Responsive image">
+                                        <img id="image" src="../img/banana.jpeg" style="height: 50px" alt="Responsive image">
                                     </div>
                                 </div>
                             </div>
diff --git a/packages/paddlejs-models/mobilenet/demo/index.ts b/packages/paddlejs-models/mobilenet/demo/index.ts
@@ -4,13 +4,15 @@ import map from './map.json';
 load();
 
 async function load() {
-    const path = 'https://paddlejs.cdn.bcebos.com/models/mobilenetV2_nchw';
+    const path = 'https://paddlejs.cdn.bcebos.com/models/mobilenetv2_opt_nchw';
     await mobilenet.load({
         path,
         mean: [0.485, 0.456, 0.406],
         std: [0.229, 0.224, 0.225]
     }, map);
     document.getElementById('loading')!.style.display = 'none';
+    const img = document.getElementById('image') as HTMLImageElement;
+    run(img);
 }
 
 async function run(input?: HTMLElement) {
diff --git a/packages/paddlejs-models/mobilenet/img/banana.jpeg b/packages/paddlejs-models/mobilenet/img/banana.jpeg
diff --git a/packages/paddlejs-models/mobilenet/package.json b/packages/paddlejs-models/mobilenet/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@paddlejs-models/mobilenet",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "",
     "main": "lib/index",
     "scripts": {
@@ -10,8 +10,8 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@paddlejs/paddlejs-backend-webgl": "^1.1.4",
-        "@paddlejs/paddlejs-core": "^2.1.7"
+        "@paddlejs/paddlejs-backend-webgl": "^1.1.11",
+        "@paddlejs/paddlejs-core": "^2.1.11"
     },
     "devDependencies": {
         "html-webpack-plugin": "^3.2.0",
diff --git a/packages/paddlejs-models/mobilenet/src/index.ts b/packages/paddlejs-models/mobilenet/src/index.ts
@@ -38,6 +38,7 @@ export async function load(config: ModelConfig, map: string[] | MobilenetMap) {
         fill: '#fff',
         mean: mean || [],
         std: std || [],
+        scale: 256,
         needPreheat
     });
     env.set('webgl_feed_process', true);
diff --git a/packages/paddlejs-models/mobilenet/webpack.dev.js b/packages/paddlejs-models/mobilenet/webpack.dev.js
@@ -9,7 +9,7 @@ module.exports = {
     devtool: 'inline-source-map',
     devServer: {
         host: '0.0.0.0',
-        port: 8866
+        port: 8867
     },
     plugins: [
         new HtmlWebpackPlugin({
diff --git a/packages/paddlejs-models/ocr/package.json b/packages/paddlejs-models/ocr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paddlejs-models/ocr",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "",
   "main": "lib/index",
   "scripts": {
@@ -11,8 +11,8 @@
   "license": "ISC",
   "dependencies": {
     "@paddlejs-mediapipe/opencv": "0.0.3",
-    "@paddlejs/paddlejs-backend-webgl": "^1.1.4",
-    "@paddlejs/paddlejs-core": "^2.1.7"
+    "@paddlejs/paddlejs-backend-webgl": "^1.1.11",
+    "@paddlejs/paddlejs-core": "^2.1.11"
   },
   "devDependencies": {
     "d3-polygon": "^2.0.0",
diff --git a/packages/paddlejs-models/ocr/src/index.ts b/packages/paddlejs-models/ocr/src/index.ts
@@ -2,7 +2,7 @@
  * @file ocr_rec model
  */
 
-import { Runner, Transformer } from '@paddlejs/paddlejs-core';
+import { Runner, Transformer, env } from '@paddlejs/paddlejs-core';
 import '@paddlejs/paddlejs-backend-webgl';
 import DBProcess from './dbPostprocess';
 import RecProcess from './recPostprocess';
@@ -58,6 +58,8 @@ function initCanvas(canvas) {
 export async function init(detCustomModel = null, recCustomModel = null) {
     const detModelPath = 'https://paddlejs.bj.bcebos.com/models/ocr_v2_det_new/model.json';
     const recModelPath = 'https://paddlejs.bj.bcebos.com/models/ocr_v2_rec_320_new/model.json';
+    env.set('webgl_pack_output', true);
+    env.set('webgl_feed_process', true);
     detectRunner = new Runner({
         modelPath: detCustomModel ? detCustomModel : detModelPath,
         fill: '#fff',

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@paddlejs/paddlejs-backend-webgl",`
`3`		`- "version": "1.1.10",`
	`3`	`+ "version": "1.1.11",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "lib/index",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@paddlejs/paddlejs-core",`
`3`		`- "version": "2.1.10",`
	`3`	`+ "version": "2.1.11",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "lib/index",`
`6`	`6`	`"scripts": {`