From 14f6d7fb7c872bb51f18bdce58550a56aa3eeebc Mon Sep 17 00:00:00 2001 From: thewh1teagle <61390950+thewh1teagle@users.noreply.github.com> Date: Sun, 11 Aug 2024 18:23:08 +0300 Subject: [PATCH] fix: link msvc dynamic --- Cargo.lock | 12 ++++++------ core/Cargo.toml | 2 +- scripts/pre_build.js | 8 ++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 152367f7..31852a35 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2608,9 +2608,9 @@ dependencies = [ [[package]] name = "knf-rs" -version = "0.1.8" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba1ee3494dfeb9e33033e1470b172ee60ca5aca9813776be4800e1aae6ad37c" +checksum = "16373e9d1c0fe40f938246a58212acfbc708a0a51f827aa35a7681fdc394393a" dependencies = [ "eyre 0.6.12", "knf-rs-sys", @@ -2619,9 +2619,9 @@ dependencies = [ [[package]] name = "knf-rs-sys" -version = "0.1.8" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7340a6ff8044531604fec3be5905f4509bc2a6b20e2d54bf50e0e089f2f41f6" +checksum = "791cc8085699d508e0980f1213551d4402d66c5f534395ffa712afe89e4d5e54" dependencies = [ "bindgen", "cmake", @@ -3894,9 +3894,9 @@ dependencies = [ [[package]] name = "pyannote-rs" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5168c76d017d87b7b6e382a205738d37337781bb2b42d2c2d0585fc3d488012" +checksum = "667ea916a23076e5b9dfa97024f2794452e6c2686dfc3d76c879c71d7ef103ba" dependencies = [ "eyre 0.6.12", "hound", diff --git a/core/Cargo.toml b/core/Cargo.toml index 592ea653..9e582e7e 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -35,7 +35,7 @@ tokio = { version = "1.35.1", features = [ ] } serde_json = { workspace = true } futures-util = "0.3.30" -pyannote-rs = "0.2.2" +pyannote-rs = "0.2.4" [dev-dependencies] diff --git a/scripts/pre_build.js b/scripts/pre_build.js index 89a774ff..ce16579f 100755 --- a/scripts/pre_build.js +++ b/scripts/pre_build.js @@ -238,6 +238,7 @@ if (!process.env.GITHUB_ENV) { } if (hasFeature('cuda')) { console.log(`$env:CUDA_PATH = "${cudaPath}"`) + console.log(`$env:KNF_STATIC_CRT = "0"`) } if (hasFeature('opencl')) { console.log(`$env:CLBlast_DIR = "${exports.clblast}"`) @@ -294,6 +295,13 @@ if (process.env.GITHUB_ENV) { await fs.appendFile(process.env.GITHUB_ENV, cmakeBuildType) } + if (hasFeature('cuda')) { + // link msvc dynamic + const staticCrt = 'KNF_STATIC_CRT=0\n' + console.log('Adding ENV', staticCrt) + await fs.appendFile(process.env.GITHUB_ENV, staticCrt) + } + if (hasFeature('older-cpu')) { await fs.appendFile(process.env.GITHUB_ENV, `WHISPER_NO_AVX=ON\n`) await fs.appendFile(process.env.GITHUB_ENV, `WHISPER_NO_AVX2=ON\n`)