ANSCENTER/ANSCORE
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix model extract race issue to all classes

Browse Source
This commit is contained in:
Tuan Nghia Nguyen
2026-04-24 12:19:54 +10:00
parent baa88bcc48
commit e2bf17289d
51 changed files with 1252 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/ANSODEngine/ANSOVFaceDetector.cpp
View File

@@ -11,6 +11,15 @@
namespace ANSCENTER {
bool ANSOVFD::Initialize(std::string licenseKey, ModelConfig modelConfig, const std::string& modelZipFilePath, const std::string& modelZipPassword, std::string& labelMap) {
bool result = ANSFDBase::Initialize(licenseKey, modelConfig, modelZipFilePath, modelZipPassword, labelMap);
// Serialize derived init against concurrent extract re-entries on the
// same folder. See ModelFolderLockGuard in ANSEngineCommon.h.
ModelFolderLockGuard _flg(_modelFolder, "ANSOVFD::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSOVFD::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
labelMap = "Face";
_licenseValid = true;
std::vector<std::string> labels{ labelMap };
@@ -47,6 +56,15 @@ namespace ANSCENTER {
// We need to get the _modelFolder
bool result = ANSFDBase::LoadModel(modelZipFilePath, modelZipPassword);
if (!result) return false;
// Serialize derived init against concurrent extract re-entries on the
// same folder. See ModelFolderLockGuard in ANSEngineCommon.h.
ModelFolderLockGuard _flg(_modelFolder, "ANSOVFD::LoadModel");
if (!_flg.acquired()) {
this->_logger.LogError("ANSOVFD::LoadModel",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
std::string onnxModel = CreateFilePath(_modelFolder, "scrfd.onnx");
//this->_face_detector = std::make_unique<SCRFD>(onnxModel);
_isInitialized = true;
@@ -62,6 +80,15 @@ namespace ANSCENTER {
try {
bool result = ANSFDBase::LoadModelFromFolder(licenseKey, modelConfig,modelName, className, modelFolder, labelMap);
if (!result) return false;
// Serialize derived init against concurrent extract re-entries on the
// same folder. See ModelFolderLockGuard in ANSEngineCommon.h.
ModelFolderLockGuard _flg(_modelFolder, "ANSOVFD::LoadModelFromFolder");
if (!_flg.acquired()) {
this->_logger.LogError("ANSOVFD::LoadModelFromFolder",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
std::string _modelName = modelName;
if (_modelName.empty()) {
_modelName = "scrfd";