From 37af007322f0dd5a21e536ab3bcf727970f1283a Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Mon, 12 Feb 2024 02:54:58 +0900 Subject: [PATCH] =?UTF-8?q?2.0.0-rc.0=E7=94=A8=E3=81=AB=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/modnet/Cargo.toml | 6 ++--- ort-sys/build.rs | 52 +++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/examples/modnet/Cargo.toml b/examples/modnet/Cargo.toml index 8ee083be..0eae04c4 100644 --- a/examples/modnet/Cargo.toml +++ b/examples/modnet/Cargo.toml @@ -5,7 +5,7 @@ version = "0.0.0" edition = "2021" [dependencies] -ort = { path = "../../" } +voicevox-ort = { path = "../../" } ndarray = "0.15" tracing-subscriber = { version = "0.3", default-features = false, features = [ "env-filter", "fmt" ] } image = "0.24" @@ -13,5 +13,5 @@ tracing = "0.1" show-image = { version = "0.13", features = [ "image", "raqote" ] } [features] -load-dynamic = [ "ort/load-dynamic" ] -cuda = [ "ort/cuda" ] +load-dynamic = [ "voicevox-ort/load-dynamic" ] +cuda = [ "voicevox-ort/cuda" ] diff --git a/ort-sys/build.rs b/ort-sys/build.rs index 8ad84d32..402282cb 100644 --- a/ort-sys/build.rs +++ b/ort-sys/build.rs @@ -277,74 +277,74 @@ fn prepare_libort_dir() -> (PathBuf, bool) { let target = env::var("TARGET").unwrap().to_string(); let (prebuilt_url, prebuilt_hash) = match target.as_str() { "aarch64-apple-darwin" => ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-osx-arm64-1.16.3.tgz", - "E23AB2606B4529B655C8BD08EB3E94C5E5AD4338460BC3A83F8015A838BB1AEF" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-osx-arm64-1.17.0.tgz", + "9391BD67F47F911FC9348844A0D8DCC09742E521F677F11D339EBD2D873189FF" ), //"aarch64-pc-windows-msvc" => ( // "https://parcel.pyke.io/v2/delivery/ortrs/packages/msort-binary/1.17.0/ortrs-msort_static-v1.17.0-aarch64-pc-windows-msvc.tgz", // "27DDC61E1416E3F1BC6137C8365B563F73BA5A6CE8D7008E5CD4E36B4F037FDA" //), "aarch64-unknown-linux-gnu" => ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-linux-arm64-1.16.3.tgz", - "B0E8016897310F3DBBCD57C8E27C79EFE61B8FEA70BA7C73AD5825E0438046BF" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-linux-arm64-1.17.0.tgz", + "F7FE4F8BAA348229AD1CCBF1A1EFE57061E15280E4CFA18EC21508ADE3760EA4" ), //"wasm32-unknown-emscripten" => ( // "https://parcel.pyke.io/v2/delivery/ortrs/packages/msort-binary/1.17.0/ortrs-msort_static-v1.17.0-wasm32-unknown-emscripten.tgz", // "E1ADBF06922649A59AB9D0459E9D5985B002C3AE830B512B7AED030BDA859C55" //), "x86_64-apple-darwin" => ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-osx-x86_64-1.16.3.tgz", - "8E6C725B755822D5B0064C55195AB3C286679BEC70E9C9B0DCADFD382495DF53" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-osx-x86_64-1.17.0.tgz", + "ADDA1382FD1DBCCA05F93E19F455585D16910F5B621AB2F068BC46B2D5DEB045" ), "x86_64-pc-windows-msvc" => { if cfg!(any(feature = "cuda", feature = "directml")) { ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-win-x64-gpu-1.16.3.tgz", - "CEEEA530AF6F85E081EF2860B637FB2D690D21924B3924B8AEEF091D6143CED6" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-win-x64-gpu-1.17.0.tgz", + "47603969633BA650704D2A12F12977C14DB780AF13F96AF72EE44D99045F2331" ) } else { ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-win-x64-1.16.3.tgz", - "9DF2215082A11431FFB27205B08F671147E10A95A60BED271BE239769DD3314F" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-win-x64-1.17.0.tgz", + "3DD15FBE4A0A689CA324BBA2319D81C3631537C8243140FA1F93A609DA8E7F10" ) } } "x86_64-unknown-linux-gnu" => { if cfg!(feature = "cuda") { ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-linux-x64-gpu-1.16.3.tgz", - "1BF7D14241FC9B05C124D6C095962466D2B9D13EA79A6FB87BE9A9FAA9CBBBB5" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-linux-x64-gpu-1.17.0.tgz", + "66FF4B35B9EF8E887959093FE9D17976BE9D5FD4412ED6C4B55D88EE35410281" ) } else { ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-linux-x64-1.16.3.tgz", - "4F16BFD2A184A062EA801D4A88A643896C733DCF5DDB7A96F637CF9BD21772D8" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-linux-x64-1.17.0.tgz", + "83214CA909838BCF5491E53B2A27A5E8A2F788DC3F4C68820BB0C01ECA2B7558" ) } } "i686-pc-windows-msvc" => ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-win-x86-1.16.3.tgz", - "EA99BD649F26972530004762B9B925334AD4CC92762768595C125756367B4DC6" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-win-x86-1.17.0.tgz", + "64B2AE803EA270DECF08C2143075262F8A608A8999DE988B2CFA4294470946DC" ), "aarch64-linux-android" => ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-android-arm64-1.16.3.tgz", - "7D9F05A4B760540F5132F3DF03B573C56568134EE680C27CA3AF1F406EC5436B" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-android-arm64-1.17.0.tgz", + "E5294ED5FF7F3279ECEDB0E9007EFFFC053AB50E6F44AEDB9B32CA6D9257F04F" ), "x86_64-linux-android" => ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-android-x64-1.16.3.tgz", - "76B945ED70B5E119599211A010EC1140AF9794DD0E2D5D79867F1FBB99236A2E" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-android-x64-1.17.0.tgz", + "2790DC9E1C5BD3A06E418C34007AE73AE1333E50A71330B30E6DE4653740A342" ), "aarch64-apple-ios" => ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-ios-arm64-1.16.3.tgz", - "DB4BA7CD9FF01C3C432E19F8EBE6DEA83D26F1EA59200CBBE1114EBFB645FC56" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-ios-arm64-1.17.0.tgz", + "0AE3B6755DCAE66D6F64A467D597CBABF085EE4F8761C3EE9D6944A013209500" ), "aarch64-apple-ios-sim" => ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-ios-sim-arm64-1.16.3.tgz", - "355998DAFA8B61813C00E865829483B3D4FFD80543698D488E0A34CB2200B741" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-ios-sim-arm64-1.17.0.tgz", + "17C8108ACA3CB8696B10BBDF7BC36C098A03A5667C45D767A01C6E6F375E979A" ), "x86_64-apple-ios" => ( - "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.16.3/onnxruntime-ios-sim-x86_64-1.16.3.tgz", - "E9FE3443F7A90D0E1FD7982B3DBBC1FCF83FD84342CBA63099441091B7FF481E" + "https://github.com/VOICEVOX/onnxruntime-builder/releases/download/1.17.0/onnxruntime-ios-sim-x86_64-1.17.0.tgz", + "A9038F24F7185594E35DA5A5144DDAA2E84D9F8B065272A956D6339F68AF05CD" ), x => panic!("downloaded binaries not available for target {x}\nyou may have to compile ONNX Runtime from source") };