Skip to content

Commit 84334f0

Browse files
JingyuanZhangJingyuanZhang
authored
Merge pull request #325 from JingyuanZhang/master
chore: publish [email protected] [email protected] and update model and e2e demo
2 parents f666abe + 3bc6bd8 commit 84334f0

File tree

16 files changed

+26
-21
lines changed

16 files changed

+26
-21
lines changed

‎e2e/dist/assets/imgs/banana.jpeg

29.6 KB
Loading

‎e2e/dist/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</head>
2222
<body>
2323
<img id="car" src="./assets/imgs/car.webp"/>
24-
<img id="cat" src="./assets/imgs/cat.jpeg"/>
24+
<img id="banana" src="./assets/imgs/banana.jpeg"/>
2525
<img id="ok" src="./assets/imgs/ok.jpeg"/>
2626
<img id="human" src="./assets/imgs/human.jpg"/>
2727
<img id="seg" src="./assets/imgs/seg.png"/>

‎e2e/tests/mobilenet.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('e2e test mobilenet model', () => {
1212
page.on('console', msg => console.log('PAGE LOG:', msg.text()));
1313
const res = await page.evaluate(async map => {
1414
const carImg = document.querySelector('#car');
15-
const catImg = document.querySelector('#cat');
15+
const catImg = document.querySelector('#banana');
1616
const path = 'https://paddlejs.cdn.bcebos.com/models/mobilenetV2_nchw';
1717
const mobilenet = paddlejs['mobilenet'];
1818

@@ -30,7 +30,7 @@ describe('e2e test mobilenet model', () => {
3030
}, map);
3131

3232
const expected0 = 'sports car, sport car';
33-
const expected1 = 'Egyptian cat';
33+
const expected1 = 'banana';
3434
await expect(res[0]).toEqual(expected0);
3535
await expect(res[1]).toEqual(expected1);
3636
});

‎packages/paddlejs-backend-webgl/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@paddlejs/paddlejs-backend-webgl",
3-
"version": "1.1.10",
3+
"version": "1.1.11",
44
"description": "",
55
"main": "lib/index",
66
"scripts": {

‎packages/paddlejs-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@paddlejs/paddlejs-core",
3-
"version": "2.1.10",
3+
"version": "2.1.11",
44
"description": "",
55
"main": "lib/index",
66
"scripts": {

‎packages/paddlejs-core/src/loader.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default class ModelLoader {
3737
};
3838

3939
constructor(modelPath: string) {
40-
let modelDir = '';
40+
let modelDir = modelPath;
4141
let filename = 'model.json';
4242
if (modelPath.endsWith('.json')) {
4343
const dirPosIndex = modelPath.lastIndexOf('/') + 1;

‎packages/paddlejs-models/humanseg/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@paddlejs-models/humanseg",
3-
"version": "1.1.4",
3+
"version": "1.1.5",
44
"description": "",
55
"main": "lib/index",
66
"scripts": {
@@ -10,8 +10,8 @@
1010
"author": "",
1111
"license": "ISC",
1212
"dependencies": {
13-
"@paddlejs/paddlejs-backend-webgl": "^1.1.2",
14-
"@paddlejs/paddlejs-core": "^2.1.4"
13+
"@paddlejs/paddlejs-backend-webgl": "^1.1.11",
14+
"@paddlejs/paddlejs-core": "^2.1.11"
1515
},
1616
"devDependencies": {
1717
"html-webpack-plugin": "^3.2.0",

‎packages/paddlejs-models/humanseg/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ blurFilter.addFilter('blur', 10);
2121

2222

2323
export async function load(needPreheat = true, enableLightModel = false, customModel = null) {
24-
const modelpath = 'https://paddlejs.cdn.bcebos.com/models/shufflenetv2_398x224/model.json';
25-
const lightModelPath = 'https://paddlejs.cdn.bcebos.com/models/shufflenetv2_288x160/model.json';
24+
const modelpath = 'https://paddlejs.cdn.bcebos.com/models/shufflenetv2_humanseg_398x224_nchw/model.json';
25+
const lightModelPath = 'https://paddlejs.cdn.bcebos.com/models/shufflenetv2_humanseg_288x160_nchw/model.json';
2626
const path = customModel
2727
? customModel
2828
: enableLightModel ? lightModelPath : modelpath;

‎packages/paddlejs-models/mobilenet/demo/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<div class="h2">操作面板：</div><input type="file" id="uploadImg">
6161
<p class="help-block">点击按钮，选择图片触发计算.</p>
6262
<div class="paddle-demo-block-wrapper">
63-
<img id="image" src="https://mms-voice.cdn.bcebos.com/mumstory/banana.jpg" style="height: 50px" alt="Responsive image">
63+
<img id="image" src="../img/banana.jpeg" style="height: 50px" alt="Responsive image">
6464
</div>
6565
</div>
6666
</div>

‎packages/paddlejs-models/mobilenet/demo/index.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ import map from './map.json';
44
load();
55

66
async function load() {
7-
const path = 'https://paddlejs.cdn.bcebos.com/models/mobilenetV2_nchw';
7+
const path = 'https://paddlejs.cdn.bcebos.com/models/mobilenetv2_opt_nchw';
88
await mobilenet.load({
99
path,
1010
mean: [0.485, 0.456, 0.406],
1111
std: [0.229, 0.224, 0.225]
1212
}, map);
1313
document.getElementById('loading')!.style.display = 'none';
14+
const img = document.getElementById('image') as HTMLImageElement;
15+
run(img);
1416
}
1517

1618
async function run(input?: HTMLElement) {

‎packages/paddlejs-models/mobilenet/img/banana.jpeg

29.6 KB
Loading

‎packages/paddlejs-models/mobilenet/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@paddlejs-models/mobilenet",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"description": "",
55
"main": "lib/index",
66
"scripts": {
@@ -10,8 +10,8 @@
1010
"author": "",
1111
"license": "ISC",
1212
"dependencies": {
13-
"@paddlejs/paddlejs-backend-webgl": "^1.1.4",
14-
"@paddlejs/paddlejs-core": "^2.1.7"
13+
"@paddlejs/paddlejs-backend-webgl": "^1.1.11",
14+
"@paddlejs/paddlejs-core": "^2.1.11"
1515
},
1616
"devDependencies": {
1717
"html-webpack-plugin": "^3.2.0",

‎packages/paddlejs-models/mobilenet/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export async function load(config: ModelConfig, map: string[] | MobilenetMap) {
3838
fill: '#fff',
3939
mean: mean || [],
4040
std: std || [],
41+
scale: 256,
4142
needPreheat
4243
});
4344
env.set('webgl_feed_process', true);

‎packages/paddlejs-models/mobilenet/webpack.dev.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
devtool: 'inline-source-map',
1010
devServer: {
1111
host: '0.0.0.0',
12-
port: 8866
12+
port: 8867
1313
},
1414
plugins: [
1515
new HtmlWebpackPlugin({

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@paddlejs-models/ocr",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
44
"description": "",
55
"main": "lib/index",
66
"scripts": {
@@ -11,8 +11,8 @@
1111
"license": "ISC",
1212
"dependencies": {
1313
"@paddlejs-mediapipe/opencv": "0.0.3",
14-
"@paddlejs/paddlejs-backend-webgl": "^1.1.4",
15-
"@paddlejs/paddlejs-core": "^2.1.7"
14+
"@paddlejs/paddlejs-backend-webgl": "^1.1.11",
15+
"@paddlejs/paddlejs-core": "^2.1.11"
1616
},
1717
"devDependencies": {
1818
"d3-polygon": "^2.0.0",

‎packages/paddlejs-models/ocr/src/index.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @file ocr_rec model
33
*/
44

5-
import { Runner, Transformer } from '@paddlejs/paddlejs-core';
5+
import { Runner, Transformer, env } from '@paddlejs/paddlejs-core';
66
import '@paddlejs/paddlejs-backend-webgl';
77
import DBProcess from './dbPostprocess';
88
import RecProcess from './recPostprocess';
@@ -58,6 +58,8 @@ function initCanvas(canvas) {
5858
export async function init(detCustomModel = null, recCustomModel = null) {
5959
const detModelPath = 'https://paddlejs.bj.bcebos.com/models/ocr_v2_det_new/model.json';
6060
const recModelPath = 'https://paddlejs.bj.bcebos.com/models/ocr_v2_rec_320_new/model.json';
61+
env.set('webgl_pack_output', true);
62+
env.set('webgl_feed_process', true);
6163
detectRunner = new Runner({
6264
modelPath: detCustomModel ? detCustomModel : detModelPath,
6365
fill: '#fff',

0 commit comments

Comments
 (0)