From 55ca48007799628ff41ac8633b160dbfc0661eae Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 28 Nov 2024 17:15:05 +0800 Subject: [PATCH] feat: update fastdeploy (#8) --- maadeps/runtime_android.py | 1 + maadeps/runtime_linux.py | 1 + maadeps/runtime_macos.py | 1 + maadeps/runtime_windows.py | 1 + vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake | 6 +++--- vcpkg-overlay/ports/maa-fastdeploy/vcpkg.json | 7 +++---- vcpkg-overlay/ports/maa-onnxruntime/portfile.cmake | 4 ++-- vcpkg-overlay/ports/maa-onnxruntime/vcpkg.json | 3 ++- vcpkg.json | 2 +- 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/maadeps/runtime_android.py b/maadeps/runtime_android.py index 72e7f0b..ae438c1 100644 --- a/maadeps/runtime_android.py +++ b/maadeps/runtime_android.py @@ -8,6 +8,7 @@ from .vcpkg import triplet exclude = [ + "*onnxruntime_providers_shared*", "*opencv_img_hash*", ] diff --git a/maadeps/runtime_linux.py b/maadeps/runtime_linux.py index 99bd8a5..140f4a0 100644 --- a/maadeps/runtime_linux.py +++ b/maadeps/runtime_linux.py @@ -5,6 +5,7 @@ from .common import resdir exclude = [ + "*onnxruntime_providers_shared*", "*opencv_img_hash*", ] diff --git a/maadeps/runtime_macos.py b/maadeps/runtime_macos.py index 30c503a..2416878 100644 --- a/maadeps/runtime_macos.py +++ b/maadeps/runtime_macos.py @@ -2,6 +2,7 @@ import subprocess exclude = [ + "*onnxruntime_providers_shared*", "*opencv_img_hash*", ] diff --git a/maadeps/runtime_windows.py b/maadeps/runtime_windows.py index 46a85df..c22213f 100644 --- a/maadeps/runtime_windows.py +++ b/maadeps/runtime_windows.py @@ -3,6 +3,7 @@ exclude = [ + "bin/onnxruntime_providers_shared_maa.dll", "bin/opencv_img_hash*_maa.dll", "*.pdb", # mingw gcc-libs diff --git a/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake b/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake index 79774ce..d90a9a5 100644 --- a/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake +++ b/vcpkg-overlay/ports/maa-fastdeploy/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO MaaAssistantArknights/FastDeploy - REF 2896b6d3641c18218209c496ea149a773373fa8b - SHA512 2d8a9072763b9ccf7968dd43aa0077fcf45659caa1f90db7af6b1cbf7a74872729625a74faefee09b655ff9ec17fe9f589935335f3c393412e9e9b93feef8a1f + REPO MaaXYZ/FastDeploy + REF 913653fa90021dc9e3e8dd733fc27339d8a79dae + SHA512 e7f9e8361b38109937a3fb61b41bca2486d35b6db496ef57812a411590a4cda2adf4894db67c37f9e4c442efb4d3d15101b10663656b5abccd5c2d56a4d52b12 ) vcpkg_cmake_configure( diff --git a/vcpkg-overlay/ports/maa-fastdeploy/vcpkg.json b/vcpkg-overlay/ports/maa-fastdeploy/vcpkg.json index c71ca18..31fb2f2 100644 --- a/vcpkg-overlay/ports/maa-fastdeploy/vcpkg.json +++ b/vcpkg-overlay/ports/maa-fastdeploy/vcpkg.json @@ -1,9 +1,8 @@ { "name": "maa-fastdeploy", - "version": "2024-05-29", - "port-version": 1, - "description": "derp learning routines", - "homepage": "https://github.com/MaaAssistantArknights/FastDeploy", + "version": "1.0.7", + "port-version": 7, + "homepage": "https://github.com/PaddlePaddle/FastDeploy", "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ diff --git a/vcpkg-overlay/ports/maa-onnxruntime/portfile.cmake b/vcpkg-overlay/ports/maa-onnxruntime/portfile.cmake index 12f86d3..361c9f8 100644 --- a/vcpkg-overlay/ports/maa-onnxruntime/portfile.cmake +++ b/vcpkg-overlay/ports/maa-onnxruntime/portfile.cmake @@ -82,8 +82,8 @@ if("coreml" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH COREMLTOOLS_ROOT REPO apple/coremltools - REF 8.0 - SHA512 ed1c5140d8b613632dcc408b789176ec95c11e3e1a504df92d1f7930e79e6eb9de8a42c18cf19bb115e52d5c4c64ed22e61e6bb1e8d97ebb8291a6c1e8c42920 + REF 8.1 + SHA512 666f93eb29abdebba93e686486f4cd92f8e9e1a07e835b8e6cb652e6d0ba3ab2bd62d8743e7b121375abcb5f26939c0ac57f0262c28ac3b3aa8c17b75b93fbfd ) endif() message(STATUS "Using CoreML: ${COREMLTOOLS_ROOT}") diff --git a/vcpkg-overlay/ports/maa-onnxruntime/vcpkg.json b/vcpkg-overlay/ports/maa-onnxruntime/vcpkg.json index 9988557..d4b3607 100644 --- a/vcpkg-overlay/ports/maa-onnxruntime/vcpkg.json +++ b/vcpkg-overlay/ports/maa-onnxruntime/vcpkg.json @@ -1,6 +1,7 @@ { "name": "maa-onnxruntime", -"version-semver": "1.19.2", + "version-semver": "1.19.2", + "port-version": 1, "description": "ONNX Runtime: cross-platform, high performance ML inferencing and training accelerator", "homepage": "https://onnxruntime.ai/", "license": "MIT", diff --git a/vcpkg.json b/vcpkg.json index 49e0f52..eddae59 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "maa-meta", - "version": "2024-07-31", + "version": "2.6.6", "description": "meta manifest that tracks dependencies for MaaFramework", "homepage": "https://github.com/MaaXYZ/MaaDeps", "license": null,