gitee/face-search
1
0
Fork 0
mirror of https://gitee.com/open-visual/face-search.git synced 2025-07-25 19:41:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

update:修改PCN的网络推理代码，修复存在的可能内存泄露

Browse Source
This commit is contained in:
divenswu 2022-11-30 11:08:46 +08:00
parent 940fb3c8b2
commit 1524934754
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
face-search-core/src/main/java/com/visual/face/search/core/models/PcnNetworkFaceDetection.java
View File

@ -27,6 +27,8 @@ import java.util.Map;
*/ */
public class PcnNetworkFaceDetection extends BaseOnnxInfer implements FaceDetection { public class PcnNetworkFaceDetection extends BaseOnnxInfer implements FaceDetection {
public final static int ValueOfPcnMaxSide = 512;
public final static String KeyOfPcnMaxSide = "pcn-max-side";
//常量参数 //常量参数
private final static float stride_ = 8; private final static float stride_ = 8;
private final static float minFace_ = 28; private final static float minFace_ = 28;
@ -65,8 +67,15 @@ public class PcnNetworkFaceDetection extends BaseOnnxInfer implements FaceDetect
Mat resizeMat = null; Mat resizeMat = null;
ImageMat imageMat = image.clone(); ImageMat imageMat = image.clone();
try { try {
//防止分辨率过高，导致内存持续增加
int maxSide = getMaxSide(params);
mat = imageMat.toCvMat(); mat = imageMat.toCvMat();
float scale = (float) ((mat.size().height > mat.size().width) ? mat.size().width/512: mat.size().height/512); Size size = mat.size();
float scale = 1.0f;
if(size.height > maxSide && size.width > maxSide){
scale = (float) ((size.height > size.width) ? size.width/maxSide: size.height/maxSide);
}
//推理
resizeMat = resize_img_release_mat(mat.clone(), scale); resizeMat = resize_img_release_mat(mat.clone(), scale);
imgPad = pad_img_release_mat(resizeMat.clone()); imgPad = pad_img_release_mat(resizeMat.clone());
float[] iouThs = iouTh <= 0 ? defIouThs : new float[]{iouTh, iouTh, 0.3f}; float[] iouThs = iouTh <= 0 ? defIouThs : new float[]{iouTh, iouTh, 0.3f};
@ -83,6 +92,20 @@ public class PcnNetworkFaceDetection extends BaseOnnxInfer implements FaceDetect
/********************************分割线*************************************/ /********************************分割线*************************************/
private static int getMaxSide(Map<String, Object> params){
try {
if(null != params && params.containsKey(KeyOfPcnMaxSide)){
Object value = params.get(KeyOfPcnMaxSide);
if(null != value && !value.toString().trim().isEmpty()){
return Integer.parseInt(value.toString());
}
}
}catch (Exception e){
e.printStackTrace();
}
return ValueOfPcnMaxSide;
}
private static Mat pad_img_release_mat(Mat mat){ private static Mat pad_img_release_mat(Mat mat){
try { try {
int row = Math.min((int)(mat.size().height * 0.2), 100); int row = Math.min((int)(mat.size().height * 0.2), 100);