bump versions

sdcb · Jun 25, 2024 · 2900763 · 2900763
1 parent 26b62d3
commit 2900763
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/build/00-common.linq b/build/00-common.linq
@@ -23,8 +23,8 @@ static ProjectVersion[] Projects = new[]
 {
 	new ProjectVersion("Sdcb.Onnx", "1.11.22.423"), // 1.11.22.423
 	new ProjectVersion("Sdcb.Mkldnn", "0.19"), // 0.19
-	new ProjectVersion("Sdcb.Paddle2Onnx", "1.0.0.2"), // 1.0.0-rc.2
-	new ProjectVersion("Sdcb.PaddleInference", "2.5.0.1"),
+	new ProjectVersion("Sdcb.Paddle2Onnx", "1.0.0-rc.2"), // 1.0.0.2
+	new ProjectVersion("Sdcb.PaddleInference", "2.6.1"),
 	new ProjectVersion("Sdcb.PaddleOCR", "2.7.0.2"),
 	new ProjectVersion("Sdcb.PaddleOCR.Models.Online", "2.7.0.1"),
 	new ProjectVersion("Sdcb.PaddleOCR.Models.Shared", "2.7.0.1"),

diff --git a/build/01-build-native.linq b/build/01-build-native.linq
@@ -16,23 +16,25 @@ async Task Main()
 	await SetupAsync(QueryCancelToken);
 	//await new LinuxNuGetSource().Process(QueryCancelToken);
 
-	string mklDnnUrl = "https://paddle-inference-lib.bj.bcebos.com/2.6.0/cxx_c/Windows/CPU/x86-64_avx-mkl-vs2019/paddle_inference_c.zip";
+	string mklDnnUrl = "https://io.starworks.cc:88/paddlesharp/native-libs/2.6.1/mkldnn/c.zip";
 
-	await MakeWin64Onnx(mklDnnUrl, QueryCancelToken);
-	await MakeWin64Mkldnn(mklDnnUrl, QueryCancelToken);
-	await MakeWin64Paddle2Onnx(mklDnnUrl, QueryCancelToken);
+	//await MakeWin64Onnx(mklDnnUrl, QueryCancelToken);
+	//await MakeWin64Mkldnn(mklDnnUrl, QueryCancelToken);
+	//await MakeWin64Paddle2Onnx(mklDnnUrl, QueryCancelToken);
 
-	await MakeWin64PaddleMkl("mkl", mklDnnUrl, QueryCancelToken);
-	//await MakeWin64PaddleOpenblas("openblas", "https://io.starworks.cc:88/paddlesharp/native-libs/2.5.1/openblas.zip", QueryCancelToken);
-	//await MakeWin64PaddleOpenblas("openblas-noavx", "https://io.starworks.cc:88/paddlesharp/native-libs/2.5.1/openblas-noavx.zip", QueryCancelToken);
-	//await MakeWin64PaddleMkl("cuda102_cudnn76_tr72_sm61_75", "https://io.starworks.cc:88/paddlesharp/native-libs/2.5.1/cu102.zip", QueryCancelToken);
-	//await MakeWin64PaddleMkl("cuda118_cudnn86_tr85_sm86_89", "https://io.starworks.cc:88/paddlesharp/native-libs/2.5.1/cu118.zip", QueryCancelToken);
+	//await MakeWin64PaddleMkl("mkl", mklDnnUrl, QueryCancelToken);
+	//await MakeWin64PaddleOpenblas("openblas", "https://io.starworks.cc:88/paddlesharp/native-libs/2.6.1/openblas/c.zip", QueryCancelToken);
+	//await MakeWin64PaddleOpenblas("openblas-noavx", "https://io.starworks.cc:88/paddlesharp/native-libs/2.6.1/openblas-noavx/c.zip", QueryCancelToken);
+	await MakeWin64PaddleGpu("cu120-sm86-89", "https://io.starworks.cc:88/paddlesharp/native-libs/2.6.1/cu120-sm86-89/c-rebuild.zip", QueryCancelToken);
+	await MakeWin64PaddleGpu("cu120-sm61-75", "https://io.starworks.cc:88/paddlesharp/native-libs/2.6.1/cu120-sm61-75/c-rebuild.zip", QueryCancelToken);
 }
 
 static Task MakeWin64PaddleOpenblas(string ridSuffix, string url, CancellationToken cancellationToken = default)
 	=> Make("Sdcb.PaddleInference", "win-x64", $"win64.{ridSuffix}", new("paddle_inference_c.dll", "openblas.dll"), url, new[] { "Sdcb.Onnx", "Sdcb.Paddle2Onnx" }, cancellationToken);
 static Task MakeWin64PaddleMkl(string ridSuffix, string url, CancellationToken cancellationToken = default)
 	=> Make("Sdcb.PaddleInference", "win-x64", $"win64.{ridSuffix}", new("paddle_inference_c.dll", "mkldnn.dll"), url, new[] { "Sdcb.Onnx", "Sdcb.Paddle2Onnx", "Sdcb.Mkldnn" }, cancellationToken);
+static Task MakeWin64PaddleGpu(string ridSuffix, string url, CancellationToken cancellationToken = default)
+	=> Make("Sdcb.PaddleInference", "win-x64", $"win64.{ridSuffix}", new("paddle_inference_c.dll", "mkldnn.dll", "common.dll"), url, new[] { "Sdcb.Onnx", "Sdcb.Paddle2Onnx", "Sdcb.Mkldnn" }, cancellationToken);
 static Task MakeWin64Onnx(string url, CancellationToken cancellationToken = default) 
 	=> Make("Sdcb.Onnx", "win-x64", "win64", new("onnxruntime.dll", "onnxruntime_providers_shared.dll"), url, null, cancellationToken);
 static Task MakeWin64Mkldnn(string url, CancellationToken cancellationToken = default)