Add UseGpu property to ModelConfiguration and update network runtime configuration
This commit is contained in:
parent
2e9da07638
commit
f4f8a58646
3 changed files with 50 additions and 30 deletions
|
|
@ -139,6 +139,12 @@
|
|||
must match the class ordering used by the trained recognition network.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:AIFotoONLUS.Core.ModelConfiguration.UseGpu">
|
||||
<summary>
|
||||
When enabled, request OpenCV DNN CUDA backend/target for inference.
|
||||
The installed OpenCV runtime must have CUDA support or model loading/forwarding may fail.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:AIFotoONLUS.Core.ModelConfiguration.EnableCropSaving">
|
||||
<summary>
|
||||
When enabled, recognition crops will be saved to disk under
|
||||
|
|
|
|||
|
|
@ -55,6 +55,12 @@ namespace AIFotoONLUS.Core
|
|||
/// </summary>
|
||||
public string[] NumberClasses { get; set; } = new[] { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||
|
||||
/// <summary>
|
||||
/// When enabled, request OpenCV DNN CUDA backend/target for inference.
|
||||
/// The installed OpenCV runtime must have CUDA support or model loading/forwarding may fail.
|
||||
/// </summary>
|
||||
public bool UseGpu { get; set; } = false;
|
||||
|
||||
/// <summary>
|
||||
/// When enabled, recognition crops will be saved to disk under
|
||||
/// "logs/crops" for diagnostic inspection. Disabled by default.
|
||||
|
|
|
|||
|
|
@ -95,10 +95,8 @@ namespace AIFotoONLUS.Core
|
|||
_detectionNet = CvDnn.ReadNetFromDarknet(_cfg.DetectionCfg, _cfg.DetectionWeights);
|
||||
_recognitionNet = CvDnn.ReadNetFromDarknet(_cfg.RecognitionCfg, _cfg.RecognitionWeights);
|
||||
|
||||
_detectionNet.SetPreferableBackend(Backend.OPENCV);
|
||||
_detectionNet.SetPreferableTarget(Target.CPU);
|
||||
_recognitionNet.SetPreferableBackend(Backend.OPENCV);
|
||||
_recognitionNet.SetPreferableTarget(Target.CPU);
|
||||
ConfigureNetRuntime(_detectionNet, _cfg.UseGpu);
|
||||
ConfigureNetRuntime(_recognitionNet, _cfg.UseGpu);
|
||||
// Let OpenCV use multiple threads internally (use number of logical processors)
|
||||
try
|
||||
{
|
||||
|
|
@ -127,6 +125,19 @@ namespace AIFotoONLUS.Core
|
|||
|
||||
private string[] GetOutputLayerNames(Net net) => net.GetUnconnectedOutLayersNames();
|
||||
|
||||
private static void ConfigureNetRuntime(Net net, bool useGpu)
|
||||
{
|
||||
if (useGpu)
|
||||
{
|
||||
net.SetPreferableBackend(Backend.CUDA);
|
||||
net.SetPreferableTarget(Target.CUDA);
|
||||
return;
|
||||
}
|
||||
|
||||
net.SetPreferableBackend(Backend.OPENCV);
|
||||
net.SetPreferableTarget(Target.CPU);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Detect text regions in the supplied image using the detection network.
|
||||
/// </summary>
|
||||
|
|
@ -486,10 +497,8 @@ namespace AIFotoONLUS.Core
|
|||
{
|
||||
var det = CvDnn.ReadNetFromDarknet(_cfg.DetectionCfg, _cfg.DetectionWeights);
|
||||
var rec = CvDnn.ReadNetFromDarknet(_cfg.RecognitionCfg, _cfg.RecognitionWeights);
|
||||
det.SetPreferableBackend(Backend.OPENCV);
|
||||
det.SetPreferableTarget(Target.CPU);
|
||||
rec.SetPreferableBackend(Backend.OPENCV);
|
||||
rec.SetPreferableTarget(Target.CPU);
|
||||
ConfigureNetRuntime(det, _cfg.UseGpu);
|
||||
ConfigureNetRuntime(rec, _cfg.UseGpu);
|
||||
netsBag.Add((det, rec));
|
||||
return (det, rec);
|
||||
});
|
||||
|
|
@ -525,8 +534,7 @@ namespace AIFotoONLUS.Core
|
|||
try
|
||||
{
|
||||
using var tempRec = CvDnn.ReadNetFromDarknet(_cfg.RecognitionCfg, _cfg.RecognitionWeights);
|
||||
tempRec.SetPreferableBackend(Backend.OPENCV);
|
||||
tempRec.SetPreferableTarget(Target.CPU);
|
||||
ConfigureNetRuntime(tempRec, _cfg.UseGpu);
|
||||
var alt = RecognizeDigits(crop, tempRec, ctx);
|
||||
if (!string.IsNullOrEmpty(alt)) txt = alt;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue