feat(ANSODEngine): run a sealed model on TensorRT without unsealing it
A .ansmodel reaching the GPU path went to ModelOptimizer, which knows one way to open a model — unzip it — and failed on the first byte. Even past that, the TensorRT engine only ever parsed an ONNX file, so the one thing the format exists to prevent, a decrypted model on disk, was the only way it could have run. The builder now takes its bytes from memory when it has them. The path it is given still names the plan that gets cached beside it, because a plan is a built artefact and carries no model: the second run loads it and never needs the ONNX at all. For a package the plan lands in the folder the zip flow used, so a model converted from a zip reuses the plan that zip already built. OptimizeModelStr recognises a package and skips the unzip-and-optimise leg entirely: the handle below it opens the package in memory and builds the plan from the decrypted bytes, which is the same work by a shorter road. Still on the file path: the other TensorRT handlers (segmentation, pose, classification). Only the YOLO detector reads a package today. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -88,8 +88,20 @@ public:
|
||||
const std::array<float, 3>& subVals,
|
||||
const std::array<float, 3>& divVals,
|
||||
bool normalize,
|
||||
int maxSlotsPerGpu)
|
||||
int maxSlotsPerGpu,
|
||||
const void* onnxData = nullptr,
|
||||
size_t onnxSize = 0)
|
||||
{
|
||||
// A sealed .ansmodel is decrypted in memory and never written out, so
|
||||
// the caller hands the bytes down here: every Engine this call builds
|
||||
// parses them instead of opening modelPath, which only names the
|
||||
// TensorRT plan that gets cached.
|
||||
auto newEngine = [&]() {
|
||||
auto e = std::make_shared<Engine<T>>(options);
|
||||
if (onnxData != nullptr && onnxSize > 0) e->setOnnxBytes(onnxData, onnxSize);
|
||||
return e;
|
||||
};
|
||||
|
||||
// Optimizer / temporary engines: maxSlotsPerGpu==0 means the caller
|
||||
// only needs a lightweight, non-shared engine (e.g., OptimizeModelStr).
|
||||
// Bypass the pool cache entirely:
|
||||
@@ -99,7 +111,7 @@ public:
|
||||
// Note: maxSlotsPerGpu==1 is now the normal "1 slot per GPU" multi-GPU
|
||||
// round-robin mode, so it goes through the pool path below.
|
||||
if (maxSlotsPerGpu == 0) {
|
||||
auto engine = std::make_shared<Engine<T>>(options);
|
||||
auto engine = newEngine();
|
||||
bool ok = engine->buildLoadNetwork(modelPath, subVals, divVals, normalize);
|
||||
return ok ? engine : nullptr;
|
||||
}
|
||||
@@ -141,13 +153,13 @@ public:
|
||||
}
|
||||
|
||||
// Cache miss — create new Engine pool
|
||||
auto engine = std::make_shared<Engine<T>>(options);
|
||||
auto engine = newEngine();
|
||||
bool ok = engine->buildLoadNetwork(modelPath, subVals, divVals, normalize, maxSlotsPerGpu);
|
||||
if (!ok) {
|
||||
// Step 1: Force-evict all pools with refcount=0 to reclaim VRAM
|
||||
int evicted = forceEvictPending();
|
||||
if (evicted > 0) {
|
||||
engine = std::make_shared<Engine<T>>(options);
|
||||
engine = newEngine();
|
||||
ok = engine->buildLoadNetwork(modelPath, subVals, divVals, normalize, maxSlotsPerGpu);
|
||||
}
|
||||
|
||||
@@ -156,7 +168,7 @@ public:
|
||||
// consumes ~300-500 MB vs ~50-100 MB for a simple loadNetwork.
|
||||
// Lightweight mode: tasks queue for a single shared slot — slower but works.
|
||||
if (!ok) {
|
||||
engine = std::make_shared<Engine<T>>(options);
|
||||
engine = newEngine();
|
||||
ok = engine->buildLoadNetwork(modelPath, subVals, divVals, normalize);
|
||||
}
|
||||
|
||||
@@ -183,7 +195,7 @@ public:
|
||||
}
|
||||
|
||||
// Final retry — try lightweight again after delay
|
||||
engine = std::make_shared<Engine<T>>(options);
|
||||
engine = newEngine();
|
||||
ok = engine->buildLoadNetwork(modelPath, subVals, divVals, normalize);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user