diff --git a/build/00-common.linq b/build/00-common.linq index 8cf2a90..4bdce5b 100644 --- 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-rc.2"), // 1.0.0-rc.2 - new ProjectVersion("Sdcb.PaddleInference", "2.5.0.1"), + new ProjectVersion("Sdcb.Paddle2Onnx", "1.0.0.2"), // 1.0.0-rc.2 + new ProjectVersion("Sdcb.PaddleInference", "2.5.1"), new ProjectVersion("Sdcb.PaddleOCR", "2.7.0-preview.1"), new ProjectVersion("Sdcb.PaddleOCR.Models.Online", "2.7.0-preview.1"), new ProjectVersion("Sdcb.PaddleOCR.Models.Shared", "2.7.0-preview.1"), diff --git a/build/01-build-native.linq b/build/01-build-native.linq index fa1dd0a..8e745ba 100644 --- a/build/01-build-native.linq +++ b/build/01-build-native.linq @@ -16,17 +16,17 @@ async Task Main() await SetupAsync(QueryCancelToken); //await new LinuxNuGetSource().Process(QueryCancelToken); - string mklDnnUrl = "https://io.starworks.cc:88/paddlesharp/native-libs/2.5.0/x64-mkldnn-avx.zip"; + string mklDnnUrl = "https://io.starworks.cc:88/paddlesharp/native-libs/2.5.1/mkldnn.zip"; await MakeWin64Onnx(mklDnnUrl, QueryCancelToken); await MakeWin64Mkldnn(mklDnnUrl, QueryCancelToken); await MakeWin64Paddle2Onnx(mklDnnUrl, QueryCancelToken); await MakeWin64PaddleMkl("mkl", mklDnnUrl, QueryCancelToken); - await MakeWin64PaddleOpenblas("openblas", "https://paddle-inference-lib.bj.bcebos.com/2.5.0/cxx_c/Windows/CPU/x86-64_avx-openblas-vs2017/paddle_inference_c.zip", QueryCancelToken); - await MakeWin64PaddleOpenblas("openblas-noavx", "https://io.starworks.cc:88/paddlesharp/native-libs/2.5.0/x64-openblas-noavx.zip", QueryCancelToken); - await MakeWin64PaddleMkl("cuda102_cudnn76_tr72_sm61_75", "https://io.starworks.cc:88/paddlesharp/native-libs/2.5.0/cuda102-cudnn76-tr72-sm61%2C75.zip", QueryCancelToken); - await MakeWin64PaddleMkl("cuda118_cudnn86_tr85_sm86_89", "https://io.starworks.cc:88/paddlesharp/native-libs/2.5.0/cuda118-cudnn86-tr85-sm86%2C89.zip", 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); } static Task MakeWin64PaddleOpenblas(string ridSuffix, string url, CancellationToken cancellationToken = default) diff --git a/tests/Sdcb.Paddle2Onnx.Tests/Sdcb.Paddle2Onnx.Tests.csproj b/tests/Sdcb.Paddle2Onnx.Tests/Sdcb.Paddle2Onnx.Tests.csproj index 97bd14e..3cf8371 100644 --- a/tests/Sdcb.Paddle2Onnx.Tests/Sdcb.Paddle2Onnx.Tests.csproj +++ b/tests/Sdcb.Paddle2Onnx.Tests/Sdcb.Paddle2Onnx.Tests.csproj @@ -13,7 +13,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Sdcb.PaddleInference.Tests/Sdcb.PaddleInference.Tests.csproj b/tests/Sdcb.PaddleInference.Tests/Sdcb.PaddleInference.Tests.csproj index 082c71e..3bb273e 100644 --- a/tests/Sdcb.PaddleInference.Tests/Sdcb.PaddleInference.Tests.csproj +++ b/tests/Sdcb.PaddleInference.Tests/Sdcb.PaddleInference.Tests.csproj @@ -11,7 +11,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Sdcb.PaddleOCR.Tests/Sdcb.PaddleOCR.Tests.csproj b/tests/Sdcb.PaddleOCR.Tests/Sdcb.PaddleOCR.Tests.csproj index 009b078..25145b5 100644 --- a/tests/Sdcb.PaddleOCR.Tests/Sdcb.PaddleOCR.Tests.csproj +++ b/tests/Sdcb.PaddleOCR.Tests/Sdcb.PaddleOCR.Tests.csproj @@ -29,7 +29,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Sdcb.RotationDetector.Tests/Sdcb.RotationDetector.Tests.csproj b/tests/Sdcb.RotationDetector.Tests/Sdcb.RotationDetector.Tests.csproj index 2056348..95ea060 100644 --- a/tests/Sdcb.RotationDetector.Tests/Sdcb.RotationDetector.Tests.csproj +++ b/tests/Sdcb.RotationDetector.Tests/Sdcb.RotationDetector.Tests.csproj @@ -12,7 +12,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive