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

update:修改模型的注入配置

Browse Source
This commit is contained in:
divenswu 2022-11-25 10:51:38 +08:00
parent c7cfd43c5c
commit c2c74bf320
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
face-search-server/src/main/java/com/visual/face/search/server/bootstrap/conf/ModelConfig.java
View File

@ -55,8 +55,6 @@ public class ModelConfig {
private Integer faceAttributeDetectionNameThread; private Integer faceAttributeDetectionNameThread;
/** /**
* 获取人脸识别模型 * 获取人脸识别模型
* @return * @return
@ -78,14 +76,12 @@ public class ModelConfig {
*/ */
@Bean(name = "visualBackupFaceDetection") @Bean(name = "visualBackupFaceDetection")
public FaceDetection getBackupFaceDetection(){ public FaceDetection getBackupFaceDetection(){
if(faceDetectionName.equalsIgnoreCase(backupFaceDetectionName)){ if(backupFaceDetectionName.equalsIgnoreCase("PcnNetworkFaceDetection")){
return null;
}else if(backupFaceDetectionName.equalsIgnoreCase("PcnNetworkFaceDetection")){
return new PcnNetworkFaceDetection(getModelPath(backupFaceDetectionName, backupFaceDetectionModel), backupFaceDetectionThread); return new PcnNetworkFaceDetection(getModelPath(backupFaceDetectionName, backupFaceDetectionModel), backupFaceDetectionThread);
}else if(backupFaceDetectionName.equalsIgnoreCase("InsightScrfdFaceDetection")){ }else if(backupFaceDetectionName.equalsIgnoreCase("InsightScrfdFaceDetection")){
return new InsightScrfdFaceDetection(getModelPath(backupFaceDetectionName, backupFaceDetectionModel)[0], backupFaceDetectionThread); return new InsightScrfdFaceDetection(getModelPath(backupFaceDetectionName, backupFaceDetectionModel)[0], backupFaceDetectionThread);
}else{ }else{
return new PcnNetworkFaceDetection(backupFaceDetectionModel, backupFaceDetectionThread); return this.getFaceDetection();
} }
} }
@ -158,11 +154,18 @@ public class ModelConfig {
@Qualifier("visualFaceAlignment")FaceAlignment faceAlignment, @Qualifier("visualFaceAlignment")FaceAlignment faceAlignment,
@Qualifier("visualFaceRecognition")FaceRecognition faceRecognition, @Qualifier("visualFaceRecognition")FaceRecognition faceRecognition,
@Qualifier("visualAttributeDetection") FaceAttribute faceAttribute @Qualifier("visualAttributeDetection") FaceAttribute faceAttribute
){ ){
return new FaceFeatureExtractorImpl( if(faceDetectionName.equalsIgnoreCase(backupFaceDetectionName)){
faceDetection, backupFaceDetection, faceKeyPoint, return new FaceFeatureExtractorImpl(
faceAlignment, faceRecognition, faceAttribute faceDetection, null, faceKeyPoint,
); faceAlignment, faceRecognition, faceAttribute
);
}else{
return new FaceFeatureExtractorImpl(
faceDetection, backupFaceDetection, faceKeyPoint,
faceAlignment, faceRecognition, faceAttribute
);
}
} }
/** /**