2024.4.0

sdcb · Sep 23, 2024 · b47a8ea · b47a8ea
1 parent 9908dd4
commit b47a8ea
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 14 deletions.
diff --git a/build/00-common.linq b/build/00-common.linq
@@ -21,9 +21,9 @@ static void DotNetRun(string args) => Run("dotnet", args.Dump(), Encoding.GetEnc
 static void Run(string exe, string args, Encoding encoding) => Util.Cmd(exe, args, encoding);
 static ProjectVersion[] Projects = new[]
 {
-	new ProjectVersion("Sdcb.OpenVINO", "0.6.7"),
-	new ProjectVersion("Sdcb.OpenVINO.Extensions.OpenCvSharp4", "0.6.7"),
-	new ProjectVersion("Sdcb.OpenVINO.PaddleOCR", "0.6.3"),
+	new ProjectVersion("Sdcb.OpenVINO", "0.6.8"),
+	new ProjectVersion("Sdcb.OpenVINO.Extensions.OpenCvSharp4", "0.6.8"),
+	new ProjectVersion("Sdcb.OpenVINO.PaddleOCR", "0.6.8"),
 	new ProjectVersion("Sdcb.OpenVINO.PaddleOCR.Models.Online", "0.6.2"),
 };
 

diff --git a/build/02-publish-proget-nuget.linq b/build/02-publish-proget-nuget.linq
@@ -37,7 +37,7 @@ void Refresh()
 {
 	string dir = Path.Combine(Path.GetDirectoryName(Util.CurrentQueryPath)!, "nupkgs");
 	IEnumerable<string> pkgs = Directory.EnumerateFiles(dir, "*.nupkg")
-		.Where(x => !x.Contains("-preview.1"))
+		.Where(x => !x.Contains("2024.3.0"))
 		;
 	dc.Content = new
 	{

diff --git a/generator/Sdcb.OpenVINO.AutoGen/Headers/Generators/StructsGenerator.cs b/generator/Sdcb.OpenVINO.AutoGen/Headers/Generators/StructsGenerator.cs
@@ -39,7 +39,7 @@ private static GeneratedUnit TransformOne(Class @class, Dictionary<string, Typed
             for (int i = 0; i < @class.Fields.Count; i++)
             {
                 Field field = @class.Fields[i];
-                DoxygenTags itemTags = DoxygenTags.Parse(field.Comment.Text);
+                DoxygenTags itemTags = DoxygenTags.Parse(field.Comment?.Text);
                 w.WriteLines(itemTags.ToBriefComment());
                 w.WriteLine($"public {CSharpUtils.TypeTransform(field.Type)} {CSharpUtils.CSharpKeywordTransform(field.Name)};");
                 if (i != @class.Fields.Count - 1) w.WriteLine();

diff --git a/generator/Sdcb.OpenVINO.AutoGen/Program.cs b/generator/Sdcb.OpenVINO.AutoGen/Program.cs
@@ -15,7 +15,7 @@
 IServiceProvider services = ConfigureServices();
 //ExtractedInfo info = (await services.GetRequiredService<HeadersDownloader>().DownloadAsync());
 AppSettings appSettings = services.GetRequiredService<AppSettings>();
-string url = "https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.3/windows/w_openvino_toolkit_windows_2024.3.0.16041.1e3b88e4e3f_x86_64.zip";
+string url = "https://storage.openvinotoolkit.org/repositories/openvino/packages/2024.4/windows/w_openvino_toolkit_windows_2024.4.0.16579.c3152d32c9c_x86_64.zip";
 ExtractedInfo info = await HeadersDownloader.DirectDownloadAsync(url, services.GetRequiredService<ArtifactDownloader>(), appSettings.DownloadFolder);
 ParsedInfo parsed = HeadersParser.Parse(info);
 GeneratedAll all = GeneratedAll.Generate(parsed);

diff --git a/generator/Sdcb.OpenVINO.NuGetBuilder/Program.cs b/generator/Sdcb.OpenVINO.NuGetBuilder/Program.cs
@@ -16,11 +16,11 @@ static async Task Main(string[] args)
         IServiceProvider sp = ConfigureServices();
         ArtifactDownloader w = sp.GetRequiredService<ArtifactDownloader>();
         StorageNodeRoot root = sp.GetRequiredService<StorageNodeRoot>();
-        string purpose = args.Length > 0 ? args[0] : "win64";
+        string purpose = args.Length > 0 ? args[0] : "windows";
         string? versionSuffix = null; // null or "preview.1", can't be ""
         string dir = Path.Combine(DirectoryUtils.SearchFileInCurrentAndParentDirectories(new DirectoryInfo("."), "OpenVINO.NET.sln").DirectoryName!,
             "build", "nupkgs");
-        VersionFolder vf = root.For(SemanticVersion.Parse("2024.3.0"));
+        VersionFolder vf = root.LatestStableVersion;
 
         switch (purpose)
         {

diff --git a/projects/PaddleOCR/Sdcb.OpenVINO.PaddleOCR/Sdcb.OpenVINO.PaddleOCR.csproj b/projects/PaddleOCR/Sdcb.OpenVINO.PaddleOCR/Sdcb.OpenVINO.PaddleOCR.csproj
@@ -36,8 +36,8 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="Sdcb.OpenVINO" Version="0.6.5" Condition="'$(Configuration)' != 'Debug'" />
-    <PackageReference Include="Sdcb.OpenVINO.Extensions.OpenCvSharp4" Version="0.6.1" Condition="'$(Configuration)' != 'Debug'" />
+    <PackageReference Include="Sdcb.OpenVINO" Version="0.6.8" Condition="'$(Configuration)' != 'Debug'" />
+    <PackageReference Include="Sdcb.OpenVINO.Extensions.OpenCvSharp4" Version="0.6.8" Condition="'$(Configuration)' != 'Debug'" />
 
     <ProjectReference Include="..\..\..\src\Sdcb.OpenVINO\Sdcb.OpenVINO.csproj" Condition="'$(Configuration)' == 'Debug'" />
     <ProjectReference Include="..\..\..\src\Sdcb.OpenVINO.Extensions.OpenCvSharp4\Sdcb.OpenVINO.Extensions.OpenCvSharp4.csproj" Condition="'$(Configuration)' == 'Debug'" />

diff --git a/src/Sdcb.OpenVINO.Extensions.OpenCvSharp4/Sdcb.OpenVINO.Extensions.OpenCvSharp4.csproj b/src/Sdcb.OpenVINO.Extensions.OpenCvSharp4/Sdcb.OpenVINO.Extensions.OpenCvSharp4.csproj
@@ -34,7 +34,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Sdcb.OpenVINO\Sdcb.OpenVINO.csproj" Condition="'$(Configuration)' == 'Debug'" />
-    <PackageReference Include="Sdcb.OpenVINO" Version="0.6.1" Condition="'$(Configuration)' != 'Debug'" />
+    <PackageReference Include="Sdcb.OpenVINO" Version="0.6.8" Condition="'$(Configuration)' != 'Debug'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Sdcb.OpenVINO/Natives/NativeMethods.g.cs b/src/Sdcb.OpenVINO/Natives/NativeMethods.g.cs
@@ -11,18 +11,18 @@ public static unsafe partial class NativeMethods
 
     /// <summary>Print the error info.</summary>
     /// <param name="status">a status code.</param>
-    [DllImport(Dll, CallingConvention = CallingConvention.Cdecl), CSourceInfo("ov_common.h", 206, 207, "ov_base_c_api")]
+    [DllImport(Dll, CallingConvention = CallingConvention.Cdecl), CSourceInfo("ov_common.h", 225, 226, "ov_base_c_api")]
     public static extern byte* ov_get_error_info(ov_status_e status);
 
 
     /// <summary>free char</summary>
     /// <param name="content">The pointer to the char to free.</param>
-    [DllImport(Dll, CallingConvention = CallingConvention.Cdecl), CSourceInfo("ov_common.h", 214, 215, "ov_base_c_api")]
+    [DllImport(Dll, CallingConvention = CallingConvention.Cdecl), CSourceInfo("ov_common.h", 233, 234, "ov_base_c_api")]
     public static extern void ov_free(byte* content);
 
 
     /// <summary>Get the last error msg.</summary>
-    [DllImport(Dll, CallingConvention = CallingConvention.Cdecl), CSourceInfo("ov_common.h", 221, 222, "ov_base_c_api")]
+    [DllImport(Dll, CallingConvention = CallingConvention.Cdecl), CSourceInfo("ov_common.h", 240, 241, "ov_base_c_api")]
     public static extern byte* ov_get_last_err_msg();
 
 

diff --git a/src/Sdcb.OpenVINO/Natives/Structs.g.cs b/src/Sdcb.OpenVINO/Natives/Structs.g.cs
@@ -5,6 +5,15 @@ namespace Sdcb.OpenVINO.Natives;
 
 
 
+[StructLayout(LayoutKind.Sequential), CSourceInfo("ov_common.h", 215, 218, "")]
+public unsafe struct ov_encryption_callbacks
+{
+    public delegate*<byte*,nint,byte*,nint*, void>* encrypt_func;
+
+    public delegate*<byte*,nint,byte*,nint*, void>* decrypt_func;
+}
+
+
 /// <summary>type define ov_compiled_model_t from ov_compiled_model</summary>
 [StructLayout(LayoutKind.Sequential), CSourceInfo("ov_compiled_model.h", 26, 26, "ov_compiled_model_c_api")]
 public struct ov_compiled_model