feat(ODEngine): load a model from memory, not only from a path
Every engine built its session from a file path, which is why opening an encrypted model package means inflating it to a directory first: the unprotected model lands on disk, is optimised, and is zipped back into a cache. The new package format cannot avoid that from the outside — the engines have to be able to take bytes. ANSModelSource.h introduces a ModelSource (a path, or bytes with a name for logs) and one MakeSession that builds from either. The six ONNX engines — classification, OBB, pose, segmentation, YOLO12 and YOLO — each gain a load overload taking it, with the existing string form delegating so no caller changes. The Windows wide-path conversion and the from-memory call now live in one place instead of the eleven copies they were spread across; YOLOOD, which had only the Windows branch, becomes portable as a side effect. The factories are named rather than implicit, so a call with a plain string literal still resolves to the path overload without ambiguity. Not compiled here: this layer builds only where CUDA is present, so verification on this machine was the new header compiled and run, plus a structural check that every engine declares and defines both overloads, calls MakeSession exactly once, and has no raw session construction left. It needs a build on a CUDA box before it ships. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -267,6 +267,11 @@ namespace ANSCENTER {
|
||||
}
|
||||
}
|
||||
bool ANSONNXSEG::Init(const std::string& modelPath, bool useGPU, int deviceId)
|
||||
{
|
||||
return Init(ModelSource::File(modelPath), useGPU, deviceId);
|
||||
}
|
||||
|
||||
bool ANSONNXSEG::Init(const ModelSource& model, bool useGPU, int deviceId)
|
||||
{
|
||||
std::lock_guard<std::recursive_mutex> lock(_mutex);
|
||||
try {
|
||||
@@ -415,12 +420,7 @@ namespace ANSCENTER {
|
||||
}
|
||||
|
||||
// ── Load model ──────────────────────────────────────────────────────
|
||||
#ifdef _WIN32
|
||||
std::wstring w_modelPath = std::wstring(modelPath.begin(), modelPath.end());
|
||||
session = Ort::Session(env, w_modelPath.c_str(), sessionOptions);
|
||||
#else
|
||||
session = Ort::Session(env, modelPath.c_str(), sessionOptions);
|
||||
#endif
|
||||
session = MakeSession(env, model, sessionOptions);
|
||||
|
||||
numInputNodes = session.GetInputCount();
|
||||
numOutputNodes = session.GetOutputCount();
|
||||
|
||||
Reference in New Issue
Block a user