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

31
modules/ANSODEngine/ANSPOSE.cpp
View File

@@ -37,15 +37,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, "ANSPOSE::LoadModel");
if (!_flg.acquired()) {
this->_logger.LogError("ANSPOSE::LoadModel",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
_device = GetOpenVINODevice(_core);
// 0. Check if the configuration file exist
if (FileExist(_modelConfigFile)) {
@@ -90,15 +81,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, "ANSPOSE::LoadModelFromFolder");
if (!_flg.acquired()) {
this->_logger.LogError("ANSPOSE::LoadModelFromFolder",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
std::string _modelName = modelName;
if (_modelName.empty()) {
_modelName = "ansposesetimation";
@@ -154,7 +136,6 @@ namespace ANSCENTER {
}
}
bool ANSPOSE::Initialize(std::string licenseKey, ModelConfig modelConfig, const std::string& modelZipFilePath, const std::string& modelZipPassword, std::string& labelMap) {
std::lock_guard<std::recursive_mutex> lock(_mutex);
ModelLoadingGuard mlg(_modelLoading);
@@ -163,15 +144,6 @@ namespace ANSCENTER {
this->_logger.LogDebug("ANSPOSE::Initialize. OpenVINO version", openVINOVersion, __FILE__, __LINE__);
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, "ANSPOSE::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSPOSE::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
// Parsing for ABNORMAL only here
_modelConfig = modelConfig;
_modelConfig.detectionType = ANSCENTER::DetectionType::KEYPOINT;
@@ -420,8 +392,6 @@ namespace ANSCENTER {
}
// std::vector<Object> ANSPOSE::RunInference(const cv::Mat& input, const std::string& camera_id) {
// std::lock_guard<std::recursive_mutex> lock(_mutex);
// std::vector<Object> output;
@@ -470,7 +440,6 @@ namespace ANSCENTER {
// _poseEstimationPipeline->waitForTotalCompletion();
// std::unique_ptr<ResultBase> result = _poseEstimationPipeline->getResult();
// /* static const std::pair<int, int> keypointsOP[] = {
// {1, 2},
// {1, 5},