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

Remove locks

Browse Source
This commit is contained in:
Tuan Nghia Nguyen
2026-04-24 17:10:29 +10:00
parent 7a11c9617b
commit 3a527d2dad
51 changed files with 38 additions and 1251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
modules/ANSODEngine/ANSONNXCL.cpp
View File

@@ -721,7 +721,6 @@ namespace ANSCENTER
className = "ClassID_" + std::to_string(bestClassId);
}
Object detection;
if (m_imgWidth > 20 && m_imgHeight > 20) {
detection.box = cv::Rect(10, 10, m_imgWidth - 20, m_imgHeight - 20);
@@ -882,15 +881,6 @@ namespace ANSCENTER
_modelLoadValid = false;
bool result = ANSODBase::Initialize(licenseKey, modelConfig, modelZipFilePath, modelZipPassword, 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, "ANSONNXCL::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSONNXCL::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
// Parsing for YOLO only here
_modelConfig = modelConfig;
_modelConfig.detectionType = ANSCENTER::DetectionType::CLASSIFICATION;
@@ -952,15 +942,6 @@ namespace ANSCENTER
try {
bool result = ANSODBase::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, "ANSONNXCL::LoadModel");
if (!_flg.acquired()) {
this->_logger.LogError("ANSONNXCL::LoadModel",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
_modelConfig.detectionType = ANSCENTER::DetectionType::CLASSIFICATION;
_modelConfig.modelType = ModelType::TENSORRT;
_modelConfig.inpHeight = 224;
@@ -1017,15 +998,6 @@ namespace ANSCENTER
try {
bool result = ANSODBase::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, "ANSONNXCL::LoadModelFromFolder");
if (!_flg.acquired()) {
this->_logger.LogError("ANSONNXCL::LoadModelFromFolder",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
std::string _modelName = modelName;
if (_modelName.empty()) {
_modelName = "train_last";