do not build openblas

This commit is contained in:
Andrey Tkachenko 2020-08-27 15:34:18 +04:00
parent fcc0093c1c
commit dd992bc30b
3 changed files with 9 additions and 11 deletions

View File

@ -9,7 +9,7 @@ build = "build.rs"
[dependencies] [dependencies]
cblas = "0.2.0" cblas = "0.2.0"
openblas-src = { version = "0.9.0", features = ["cache", "static"] } openblas-src = { version = "0.9.0", features = ["system"] }
serde = {version = "1.0", features = ["derive"]} serde = {version = "1.0", features = ["derive"]}
serde_json = "1.0" serde_json = "1.0"
@ -20,7 +20,6 @@ flate2 = "1.0.17"
tar = "0.4.29" tar = "0.4.29"
curl = "0.4.33" curl = "0.4.33"
anyhow = "1.0.32" anyhow = "1.0.32"
reqwest = {version = "0.10.7", features = ["blocking"]}
[dev-dependencies] [dev-dependencies]
audrey = "0.2" audrey = "0.2"

View File

@ -82,6 +82,7 @@ fn main() {
.extra_warnings(false) .extra_warnings(false)
.static_flag(true) .static_flag(true)
.cpp(true) .cpp(true)
.flag("-mno-avx")
.include(openfst_dir.join("src/include")) .include(openfst_dir.join("src/include"))
.file(openfst_dir.join("src/lib/compat.cc")) .file(openfst_dir.join("src/lib/compat.cc"))
.file(openfst_dir.join("src/lib/flags.cc")) .file(openfst_dir.join("src/lib/flags.cc"))
@ -95,10 +96,10 @@ fn main() {
.file(openfst_dir.join("src/lib/weight.cc")) .file(openfst_dir.join("src/lib/weight.cc"))
.file(openfst_dir.join("src/extensions/ngram/bitmap-index.cc")) .file(openfst_dir.join("src/extensions/ngram/bitmap-index.cc"))
.file(openfst_dir.join("src/extensions/ngram/nthbit.cc")) .file(openfst_dir.join("src/extensions/ngram/nthbit.cc"))
.try_compile("libopenfst") .compile("libopenfst");
.unwrap();
cc::Build::new() cc::Build::new()
.flag("-mno-avx")
.warnings(false) .warnings(false)
.extra_warnings(false) .extra_warnings(false)
.static_flag(true) .static_flag(true)
@ -110,8 +111,7 @@ fn main() {
.file("resources/vosk-api/src/model.cc") .file("resources/vosk-api/src/model.cc")
.file("resources/vosk-api/src/spk_model.cc") .file("resources/vosk-api/src/spk_model.cc")
.file("resources/vosk-api/src/vosk_api.cc") .file("resources/vosk-api/src/vosk_api.cc")
.try_compile("libvosk") .compile("libvosk");
.unwrap();
Command::new("sh") Command::new("sh")
.arg("-c") .arg("-c")
@ -120,6 +120,7 @@ fn main() {
.expect("Failed get_version.sh!"); .expect("Failed get_version.sh!");
cc::Build::new() cc::Build::new()
.flag("-mno-avx")
.warnings(false) .warnings(false)
.extra_warnings(false) .extra_warnings(false)
.static_flag(true) .static_flag(true)
@ -315,7 +316,5 @@ fn main() {
// .file("resources/kaldi/src/online2/online-speex-wrapper.cc") // .file("resources/kaldi/src/online2/online-speex-wrapper.cc")
.file("resources/kaldi/src/online2/online-timing.cc") .file("resources/kaldi/src/online2/online-timing.cc")
// .file("resources/kaldi/src/online2/onlinebin-util.cc") // .file("resources/kaldi/src/online2/onlinebin-util.cc")
.compile("libkaldi");
.try_compile("libkaldi")
.unwrap();
} }

View File

@ -42,11 +42,11 @@ pub fn main() {
if model.feed(&mut sess, buff.as_slice()) { if model.feed(&mut sess, buff.as_slice()) {
println!("{:?}", model.get_result(&mut sess)); println!("{:?}", model.get_result(&mut sess));
} else { } else {
println!("{:?}", model.get_partial_result(&mut sess)); // println!("{:?}", model.get_partial_result(&mut sess));
} }
} }
println!("{:?}", model.get_final_result(&mut sess)); println!("{:?}", model.get_final_result(sess));
// let audio_buf :Vec<_> = if desc.sample_rate() == SAMPLE_RATE { // let audio_buf :Vec<_> = if desc.sample_rate() == SAMPLE_RATE {
// .map(|s| s.unwrap()).collect() // .map(|s| s.unwrap()).collect()