Simplify the code, remove OpenCvSharp dependencies from the code, and…

… handle common models.
openvinotoolkit · Oct 19, 2023 · 732887c · 732887c
1 parent cabc899
commit 732887c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 16 deletions.
diff --git a/modules/csharp_api/csharp/core/compiled_model.cs b/modules/csharp_api/csharp/core/compiled_model.cs
@@ -1,5 +1,4 @@
-using OpenCvSharp;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;

diff --git a/modules/csharp_api/csharp/core/infer_request.cs b/modules/csharp_api/csharp/core/infer_request.cs
@@ -1,5 +1,4 @@
-using OpenCvSharp;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;

diff --git a/modules/csharp_api/csharp/core/model.cs b/modules/csharp_api/csharp/core/model.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using static OpenCvSharp.FileStorage;
 
 namespace OpenVinoSharp
 {

diff --git a/modules/csharp_api/csharp/core/partial_shape.cs b/modules/csharp_api/csharp/core/partial_shape.cs
@@ -1,5 +1,4 @@
-using OpenCvSharp;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing.Drawing2D;
 using System.Linq;

diff --git a/modules/csharp_api/csharp/core/tensor.cs b/modules/csharp_api/csharp/core/tensor.cs
@@ -46,11 +46,11 @@ public Tensor(IntPtr ptr)
         /// <param name="type">Tensor element type</param>
         /// <param name="shape">Tensor shape</param>
         /// <param name="mat">Image data</param>
-        public Tensor(element.Type type, Shape shape, OvMat mat) 
+        public Tensor(element.Type type, Shape shape, byte[] mat) 
         {
-            int l =mat.mat_data.Length;
+            int l =mat.Length;
             IntPtr data = Marshal.AllocHGlobal(l);
-            Marshal.Copy(mat.mat_data, 0, data, (int)mat.mat_data_size);
+            Marshal.Copy(mat, 0, data, (int)mat.Length);
             HandleException.handler(
                 NativeMethods.ov_tensor_create_from_host_ptr
                 ((uint)type.get_type(), shape.shape, data, ref m_ptr));

diff --git a/modules/csharp_api/csharp/exception/exception.cs b/modules/csharp_api/csharp/exception/exception.cs
@@ -1,5 +1,4 @@
-using OpenCvSharp;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;

diff --git a/modules/csharp_api/csharp/native_methods/ov_base.cs b/modules/csharp_api/csharp/native_methods/ov_base.cs
@@ -11,6 +11,6 @@ namespace OpenVinoSharp
     /// </summary>
     public partial class NativeMethods
     {
-        private const string dll_extern = "./openvino2023.1/openvino_c.dll";
+        private const string dll_extern = "openvino_c";
     }
 }
diff --git a/modules/csharp_api/csharp/native_methods/ov_infer_request.cs b/modules/csharp_api/csharp/native_methods/ov_infer_request.cs
@@ -1,12 +1,10 @@
-using OpenCvSharp;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
 using System.Threading.Tasks;
-using static OpenCvSharp.Stitcher;
 
 namespace OpenVinoSharp
 {