Merge pull request #468 from JingyuanZhang/master

【fix】解决 detect 模型 multiclass_nms 算子返回空数组问题
PaddlePaddle · Sep 2, 2022 · b2c0c87 · b2c0c87
2 parents 9862ffa + 7843fe6
commit b2c0c87
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
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.28",
+  "version": "2.2.0",
   "description": "",
   "main": "lib/index",
   "scripts": {

diff --git a/packages/paddlejs-core/src/postOps/multiclass_nms.ts b/packages/paddlejs-core/src/postOps/multiclass_nms.ts
@@ -84,7 +84,7 @@ export default function compute(inputs, attrs) {
         // threshold, sort, slice
         const scoresMapList = getMaxScore(scores[i], score_threshold, nms_top_k);
         if (!scoresMapList || !scoresMapList.length) {
-            return [];
+            continue;
         }
         const maxScoreMap = scoresMapList.shift();
         const maxIndice = maxScoreMap.i;

diff --git a/packages/paddlejs-models/humanseg/package-lock.json b/packages/paddlejs-models/humanseg/package-lock.json
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.2.2",
+  "version": "1.2.3",
   "description": "",
   "main": "lib/index",
   "scripts": {
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@paddlejs/paddlejs-backend-webgl": "^1.1.19",
-    "@paddlejs/paddlejs-core": "^2.1.17"
+    "@paddlejs/paddlejs-backend-webgl": "^1.2.9",
+    "@paddlejs/paddlejs-core": "^2.1.28"
   },
   "devDependencies": {
     "html-webpack-plugin": "^3.2.0",

diff --git a/packages/paddlejs-models/humanseg/src/index_gpu.ts b/packages/paddlejs-models/humanseg/src/index_gpu.ts
@@ -16,8 +16,8 @@ interface LoadOptions {
 
 let runner = null as Runner;
 
-let WIDTH = 398;
-let HEIGHT = 224;
+const WIDTH = 398;
+const HEIGHT = 224;
 
 function registerCustomOp() {
     registerOp(segImg, 'segImg');
@@ -57,14 +57,7 @@ export async function load(options: LoadOptions = {
     canvasWidth: 500,
     canvasHeight: 280
 }) {
-    const modelpath = 'https://paddlejs.bj.bcebos.com/models/fuse/humanseg/humanseg_398x224_fuse_activation/model.json';
-    const lightModelPath = 'https://paddlejs.bj.bcebos.com/models/fuse/humanseg/humanseg_288x160_fuse_activation/model.json';
-    const modelPath = options.enableLightModel ? lightModelPath : modelpath;
-
-    if (options.enableLightModel) {
-        WIDTH = 288;
-        HEIGHT = 160;
-    }
+    const modelPath = 'https://paddlejs.cdn.bcebos.com/models/humansegv2/model.json';
 
     runner = new Runner({
         modelPath: modelPath,