Skip to content

Commit b2c0c87

Browse files
authored
Merge pull request #468 from JingyuanZhang/master
【fix】解决 detect 模型 multiclass_nms 算子返回空数组问题
2 parents 9862ffa + 7843fe6 commit b2c0c87

File tree

5 files changed

+15
-22
lines changed

5 files changed

+15
-22
lines changed

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.28",
3+
"version": "2.2.0",
44
"description": "",
55
"main": "lib/index",
66
"scripts": {

packages/paddlejs-core/src/postOps/multiclass_nms.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export default function compute(inputs, attrs) {
8484
// threshold, sort, slice
8585
const scoresMapList = getMaxScore(scores[i], score_threshold, nms_top_k);
8686
if (!scoresMapList || !scoresMapList.length) {
87-
return [];
87+
continue;
8888
}
8989
const maxScoreMap = scoresMapList.shift();
9090
const maxIndice = maxScoreMap.i;

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

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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.2.2",
3+
"version": "1.2.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.19",
14-
"@paddlejs/paddlejs-core": "^2.1.17"
13+
"@paddlejs/paddlejs-backend-webgl": "^1.2.9",
14+
"@paddlejs/paddlejs-core": "^2.1.28"
1515
},
1616
"devDependencies": {
1717
"html-webpack-plugin": "^3.2.0",

packages/paddlejs-models/humanseg/src/index_gpu.ts

+3-10
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ interface LoadOptions {
1616

1717
let runner = null as Runner;
1818

19-
let WIDTH = 398;
20-
let HEIGHT = 224;
19+
const WIDTH = 398;
20+
const HEIGHT = 224;
2121

2222
function registerCustomOp() {
2323
registerOp(segImg, 'segImg');
@@ -57,14 +57,7 @@ export async function load(options: LoadOptions = {
5757
canvasWidth: 500,
5858
canvasHeight: 280
5959
}) {
60-
const modelpath = 'https://paddlejs.bj.bcebos.com/models/fuse/humanseg/humanseg_398x224_fuse_activation/model.json';
61-
const lightModelPath = 'https://paddlejs.bj.bcebos.com/models/fuse/humanseg/humanseg_288x160_fuse_activation/model.json';
62-
const modelPath = options.enableLightModel ? lightModelPath : modelpath;
63-
64-
if (options.enableLightModel) {
65-
WIDTH = 288;
66-
HEIGHT = 160;
67-
}
60+
const modelPath = 'https://paddlejs.cdn.bcebos.com/models/humansegv2/model.json';
6861

6962
runner = new Runner({
7063
modelPath: modelPath,

0 commit comments

Comments
 (0)