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

29
modules/ANSODEngine/ANSONNXYOLO.cpp
View File

@@ -98,7 +98,6 @@ namespace ANSCENTER {
const bool isClassification = !output_node_dims.empty()
&& output_node_dims[0].size() == 2;
cv::Mat canvas;
if (isClassification) {
// Classification: direct resize (no letterbox padding) — matches ANSONNXCL
@@ -1326,7 +1325,6 @@ namespace ANSCENTER {
const bool alreadyNormalized = (rawSum > 0.9f && rawSum < 1.1f
&& raw[0] >= 0.f); // probabilities are non-negative
std::vector<float> probs(nc);
if (alreadyNormalized) {
// Output is already softmax — use as-is (skip double softmax)
@@ -1775,15 +1773,6 @@ namespace ANSCENTER {
labelMap = VectorToCommaSeparatedString(_classes);
if (this->_loadEngineOnCreation) {
// Serialize session creation against concurrent extract re-entries
// on the same folder. See ModelFolderLockGuard in ANSEngineCommon.h.
ModelFolderLockGuard _flg(_modelFolder, "ANSONNXYOLO::Initialize");
if (!_flg.acquired()) {
_logger.LogError("ANSONNXYOLO::Initialize",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
return false;
}
if (!InitOrtEngine()) {
_logger.LogError("ANSONNXYOLO::Initialize",
"Failed to create ONNX Runtime engine: " + _modelFilePath,
@@ -1854,15 +1843,6 @@ namespace ANSCENTER {
}
if (this->_loadEngineOnCreation) {
// See ModelFolderLockGuard in ANSEngineCommon.h.
ModelFolderLockGuard _flg(_modelFolder, "ANSONNXYOLO::LoadModel");
if (!_flg.acquired()) {
_logger.LogError("ANSONNXYOLO::LoadModel",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
_modelLoadValid = false;
return false;
}
if (!InitOrtEngine()) { _modelLoadValid = false; return false; }
}
@@ -1938,15 +1918,6 @@ namespace ANSCENTER {
labelMap = VectorToCommaSeparatedString(_classes);
if (this->_loadEngineOnCreation) {
// See ModelFolderLockGuard in ANSEngineCommon.h.
ModelFolderLockGuard _flg(_modelFolder, "ANSONNXYOLO::LoadModelFromFolder");
if (!_flg.acquired()) {
_logger.LogError("ANSONNXYOLO::LoadModelFromFolder",
"Timed out waiting for model-folder lock: " + _modelFolder,
__FILE__, __LINE__);
_modelLoadValid = false;
return false;
}
if (!InitOrtEngine()) { _modelLoadValid = false; return false; }
}