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

@@ -4,7 +4,6 @@
#include <omp.h>
#include <include/paddleocr_utility.h>
namespace ANSCENTER {
bool ANSCPUOCR::Initialize(const std::string& licenseKey, OCRModelConfig modelConfig,
@@ -13,15 +12,6 @@ namespace ANSCENTER {
{
bool result = ANSOCRBase::Initialize(licenseKey, modelConfig, modelZipFilePath, modelZipPassword, engineMode);
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, "ANSCPUOCR::Initialize");
if (!_flg.acquired()) {
this->_logger.LogError("ANSCPUOCR::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
//Override the paddleocrv3 for openvino only
switch (_modelConfig.ocrLanguage) {
@@ -442,7 +432,6 @@ namespace ANSCENTER {
}
}
std::vector<ANSCENTER::OCRObject> ANSCPUOCR::RunInference(const cv::Mat& input,
const std::vector<cv::Rect>& Bbox,
const std::string& cameraId)