Remove locks

This commit is contained in:
2026-04-24 17:10:29 +10:00
parent 7a11c9617b
commit 3a527d2dad
51 changed files with 38 additions and 1251 deletions

View File

@@ -55,15 +55,6 @@ namespace ANSCENTER {
ANS_DBG("FaceRecognizer", "ANSFRBase::Initialize FAILED");
return false;
}
// Serialize derived init against concurrent extract re-entries on the
// same folder. See ModelFolderLockGuard in Utility.h.
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSFR::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSFR::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
#ifdef CPU_MODE
engineType = EngineType::CPU;
ANS_DBG("FaceRecognizer", "CPU_MODE forced: engineType=CPU");
@@ -208,15 +199,6 @@ namespace ANSCENTER {
try {
bool result = ANSFRBase::LoadModel(modelZipFilePath, modelZipPassword);
if (!result) return false;
// Serialize derived init against concurrent extract re-entries on the
// same folder. See ModelFolderLockGuard in Utility.h.
ANSCENTER::ModelFolderLockGuard _flg(_modelFolder, "ANSFaceRecognizer::LoadModel");
if (!_flg.acquired()) {
this->_logger.LogError("ANSFaceRecognizer::LoadModel",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
if (engineType == EngineType::NVIDIA_GPU) {
std::string onnxfile = CreateFilePath(_modelFolder, "ansfacerecognizer.onnx");
@@ -1280,8 +1262,6 @@ namespace ANSCENTER {
//}
}
// Old method
//std::tuple<std::vector<std::string>, std::vector<float>> ANSFaceRecognizer::SearchForFaces(std::vector<std::vector<float>> detectedEmbeddings) {
// std::lock_guard<std::recursive_mutex> lock(_mutex);
@@ -1556,8 +1536,6 @@ namespace ANSCENTER {
}
} */
// Before refactor (working version)
/*std::vector<float> ANSFaceRecognizer::Feature(const cv::Mat& image,
ANSCENTER::Object bBox) {
@@ -2114,8 +2092,6 @@ namespace ANSCENTER {
// }
//}
// std::vector<std::vector<float>> ANSFaceRecognizer::Forward(const cv::Mat& input, std::vector<ANSCENTER::Object> outputBbox)
// {
// std::vector<std::vector<float>> detectedEmbeddings;