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

30
modules/ANSODEngine/ANSONNXSEG.cpp
View File

@@ -549,7 +549,6 @@ namespace ANSCENTER {
}
}
cv::Mat ANSONNXSEG::preprocess(const cv::Mat& image, float*& blobPtr, std::vector<int64_t>& inputTensorShape) {
std::lock_guard<std::recursive_mutex> lock(_mutex);
m_imgWidth = image.cols;
@@ -988,7 +987,6 @@ namespace ANSCENTER {
}
}
std::vector<Object> ANSONNXSEG::segment(const cv::Mat& image, const std::string& camera_id) {
std::lock_guard<std::recursive_mutex> lock(_mutex);
@@ -1136,7 +1134,6 @@ namespace ANSCENTER {
}
}
// Public functions
ANSONNXSEG::~ANSONNXSEG() {
Destroy();
@@ -1158,15 +1155,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, "ANSONNXSEG::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSONNXSEG::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
// Parsing for YOLO only here
_modelConfig = modelConfig;
_modelConfig.detectionType = ANSCENTER::DetectionType::SEGMENTATION;
@@ -1229,15 +1217,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, "ANSONNXSEG::LoadModel");
if (!_flg.acquired()) {
this->_logger.LogError("ANSONNXSEG::LoadModel",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
_modelConfig.detectionType = ANSCENTER::DetectionType::SEGMENTATION;
_modelConfig.modelType = ModelType::ONNXSEG;
_modelConfig.inpHeight = 640;
@@ -1295,15 +1274,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, "ANSONNXSEG::LoadModelFromFolder");
if (!_flg.acquired()) {
this->_logger.LogError("ANSONNXSEG::LoadModelFromFolder",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
std::string _modelName = modelName;
if (_modelName.empty()) {
_modelName = "train_last";