Browse Source

Change DnnInvoke.GetAvailableBackends() to DnnInvoke.AvailableBackends.

pull/348/merge
Canming Huang 5 years ago
parent
commit
bbe9047fae
  1. 2
      Emgu.CV.Example/XamarinForms/Core/AboutPage.cs
  2. 5
      Emgu.CV.Example/XamarinForms/Core/MaskRcnnPage.cs
  3. 28
      Emgu.CV/Dnn/DnnInvoke.cs

2
Emgu.CV.Example/XamarinForms/Core/AboutPage.cs

@ -29,7 +29,7 @@ namespace Emgu.CV.XamarinForms
}
var dnnBackends = DnnInvoke.GetAvailableBackends();
var dnnBackends = DnnInvoke.AvailableBackends;
List<String> dnnBackendsText = new List<string>();
foreach (var dnnBackend in dnnBackends)
{

5
Emgu.CV.Example/XamarinForms/Core/MaskRcnnPage.cs

@ -73,7 +73,8 @@ namespace Emgu.CV.XamarinForms
_maskRcnnDetector = Emgu.CV.Dnn.DnnInvoke.ReadNetFromTensorflow(manager.Files[0].LocalFile, manager.Files[2].LocalFile);
//prefer cuda backend if available
foreach (BackendTargetPair p in DnnInvoke.GetAvailableBackends())
foreach (BackendTargetPair p in DnnInvoke.AvailableBackends)
{
if (p.Backend == Dnn.Backend.Cuda && p.Target == Target.Cuda)
{
@ -230,7 +231,7 @@ namespace Emgu.CV.XamarinForms
button.Clicked += OnButtonClicked;
BackendTargetPair[] availableBackends = Emgu.CV.Dnn.DnnInvoke.GetAvailableBackends();
BackendTargetPair[] availableBackends = Emgu.CV.Dnn.DnnInvoke.AvailableBackends;
StringBuilder availableBackendsStr = new StringBuilder("Available backends: " + System.Environment.NewLine);
foreach (BackendTargetPair p in availableBackends)

28
Emgu.CV/Dnn/DnnInvoke.cs

@ -476,23 +476,25 @@ namespace Emgu.CV.Dnn
/// <summary>
/// Get the list of available DNN Backends
/// </summary>
/// <returns>The available backend and target pair</returns>
public static BackendTargetPair[] GetAvailableBackends()
public static BackendTargetPair[] AvailableBackends
{
using (VectorOfInt viBackends = new VectorOfInt())
using (VectorOfInt viTargets = new VectorOfInt())
get
{
cveDNNGetAvailableBackends(viBackends, viTargets);
int[] backendArr = viBackends.ToArray();
int[] targetArr = viTargets.ToArray();
BackendTargetPair[] availableBackends = new BackendTargetPair[backendArr.Length];
for (int i = 0; i < backendArr.Length; i++)
using (VectorOfInt viBackends = new VectorOfInt())
using (VectorOfInt viTargets = new VectorOfInt())
{
availableBackends[i] = new BackendTargetPair((Backend) backendArr[i], (Target) targetArr[i]);
}
cveDNNGetAvailableBackends(viBackends, viTargets);
int[] backendArr = viBackends.ToArray();
int[] targetArr = viTargets.ToArray();
return availableBackends;
BackendTargetPair[] availableBackends = new BackendTargetPair[backendArr.Length];
for (int i = 0; i < backendArr.Length; i++)
{
availableBackends[i] = new BackendTargetPair((Backend) backendArr[i], (Target) targetArr[i]);
}
return availableBackends;
}
}
}

Loading…
Cancel
Save