Skip to content

Commit 35344c0

Browse files
sdcbsdcb
committed
upgrade to 2024.1.0
1 parent 53aa52f commit 35344c0

6 files changed

Lines changed: 23 additions & 15 deletions

File tree

‎build/00-common.linq‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static void DotNetRun(string args) => Run("dotnet", args.Dump(), Encoding.GetEnc
2121
static void Run(string exe, string args, Encoding encoding) => Util.Cmd(exe, args, encoding);
2222
static ProjectVersion[] Projects = new[]
2323
{
24-
new ProjectVersion("Sdcb.OpenVINO", "0.6.4"),
24+
new ProjectVersion("Sdcb.OpenVINO", "0.6.5"),
2525
new ProjectVersion("Sdcb.OpenVINO.Extensions.OpenCvSharp4", "0.6.1"),
2626
new ProjectVersion("Sdcb.OpenVINO.PaddleOCR", "0.6.3"),
2727
new ProjectVersion("Sdcb.OpenVINO.PaddleOCR.Models.Online", "0.6.2"),

‎build/02-publish-proget-nuget.linq‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void Refresh()
3737
{
3838
string dir = Path.Combine(Path.GetDirectoryName(Util.CurrentQueryPath)!, "nupkgs");
3939
IEnumerable<string> pkgs = Directory.EnumerateFiles(dir, "*.nupkg")
40-
.Where(x => !x.Contains("-preview.2"))
40+
.Where(x => !x.Contains("-preview.1"))
4141
;
4242
dc.Content = new
4343
{

‎generator/Sdcb.OpenVINO.NuGetBuilder/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ static async Task Main(string[] args)
1717
ArtifactDownloader w = sp.GetRequiredService<ArtifactDownloader>();
1818
StorageNodeRoot root = sp.GetRequiredService<StorageNodeRoot>();
1919
string purpose = args.Length > 0 ? args[0] : "win64";
20-
string? versionSuffix = null; // null or "preview.1", can't be ""
20+
string? versionSuffix = "preview.1"; // null or "preview.1", can't be ""
2121
string dir = Path.Combine(DirectoryUtils.SearchFileInCurrentAndParentDirectories(new DirectoryInfo("."), "OpenVINO.NET.sln").DirectoryName!,
2222
"build", "nupkgs");
2323

@@ -85,7 +85,7 @@ private static async Task Build_Linuxs(ArtifactDownloader w, StorageNodeRoot roo
8585
}
8686
}
8787

88-
static IServiceProvider ConfigureServices()
88+
static ServiceProvider ConfigureServices()
8989
{
9090
return new ServiceCollection()
9191
.AddSingleton<ICachedHttpGetService>(_ => new CachedHttpGetService("cache"))

‎projects/PaddleOCR/Sdcb.OpenVINO.PaddleOCR.Tests/Sdcb.OpenVINO.PaddleOCR.Tests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
19-
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.8.0.20230708" />
20-
<PackageReference Include="Sdcb.OpenVINO.runtime.ubuntu.22.04-x64" Version="2023.2.0" />
21-
<PackageReference Include="Sdcb.OpenVINO.runtime.win-x64" Version="2023.1.0" />
22-
<PackageReference Include="xunit" Version="2.6.3" />
23-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24177-07" />
19+
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
20+
<PackageReference Include="Sdcb.OpenVINO.runtime.ubuntu.22.04-x64" Version="2024.1.0" />
21+
<PackageReference Include="Sdcb.OpenVINO.runtime.win-x64" Version="2024.1.0" />
22+
<PackageReference Include="xunit" Version="2.8.0" />
23+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
<PrivateAssets>all</PrivateAssets>
2626
</PackageReference>
27-
<PackageReference Include="coverlet.collector" Version="6.0.0">
27+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
<PrivateAssets>all</PrivateAssets>
3030
</PackageReference>

‎projects/PaddleOCR/Sdcb.OpenVINO.PaddleOCR/Sdcb.OpenVINO.PaddleOCR.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>
3838

39-
<PackageReference Include="Sdcb.OpenVINO" Version="0.6.1" Condition="'$(Configuration)' != 'Debug'" />
39+
<PackageReference Include="Sdcb.OpenVINO" Version="0.6.5" Condition="'$(Configuration)' != 'Debug'" />
4040
<PackageReference Include="Sdcb.OpenVINO.Extensions.OpenCvSharp4" Version="0.6.1" Condition="'$(Configuration)' != 'Debug'" />
4141

4242
<ProjectReference Include="..\..\..\src\Sdcb.OpenVINO\Sdcb.OpenVINO.csproj" Condition="'$(Configuration)' == 'Debug'" />

‎src/Sdcb.OpenVINO/Natives/OpenVINOLibraryLoader.cs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,19 @@ static OpenVINOLibraryLoader()
5757

5858
#if LINQPad || NETCOREAPP3_1_OR_GREATER
5959

60+
public static List<string> SupportedVersionSuffixes { get; set; } = new()
61+
{
62+
"2410",
63+
"2400",
64+
"2330",
65+
"2320",
66+
"2310",
67+
};
68+
6069
private static IntPtr OpenVINOImportResolver(string libraryName, Assembly assembly, DllImportSearchPath? searchPath)
6170
{
6271
if (libraryName == Dll)
6372
{
64-
string[] allowedVersions = new[] { "2400", "2330", "2320", "2310" };
6573
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
6674
{
6775
return LoadWithDeps(assembly, searchPath, new LibDeps("openvino_c.dll", new string[]
@@ -71,7 +79,7 @@ private static IntPtr OpenVINOImportResolver(string libraryName, Assembly assemb
7179
}
7280
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
7381
{
74-
return LoadWithDeps(assembly, searchPath, allowedVersions.Select(v => new LibDeps($"libopenvino_c.{v}.dylib", new string[]
82+
return LoadWithDeps(assembly, searchPath, SupportedVersionSuffixes.Select(v => new LibDeps($"libopenvino_c.{v}.dylib", new string[]
7583
{
7684
$"libopenvino.{v}.dylib",
7785
})).ToArray());
@@ -86,7 +94,7 @@ private static IntPtr OpenVINOImportResolver(string libraryName, Assembly assemb
8694
else
8795
{
8896
/* linux or others */
89-
return LoadWithDeps(assembly, searchPath, allowedVersions.Select(v => new LibDeps($"libopenvino_c.so.{v}", new string[]
97+
return LoadWithDeps(assembly, searchPath, SupportedVersionSuffixes.Select(v => new LibDeps($"libopenvino_c.so.{v}", new string[]
9098
{
9199
$"libtbb.so.12",
92100
$"libopenvino.so.{v}",

0 commit comments

Comments
 (0)