revert-revert-erasure and erasure fixes (#3833)

* fix erasure, more tests for full blobs, more metrics

* Revert "Revert "Use Rust erasure library and turn on erasure (#3768)" (#3827)"

This reverts commit 4b8cb72977.
This commit is contained in:
Rob Walker
2019-04-17 15:13:54 -07:00
committed by GitHub
parent e03215c4c0
commit 6bef16a6a1
13 changed files with 707 additions and 789 deletions

View File

@ -24,9 +24,8 @@ fn main() {
let chacha = !env::var("CARGO_FEATURE_CHACHA").is_err();
let cuda = !env::var("CARGO_FEATURE_CUDA").is_err();
let erasure = !env::var("CARGO_FEATURE_ERASURE").is_err();
if chacha || cuda || erasure {
if chacha || cuda {
println!("cargo:rerun-if-changed={}", perf_libs_dir);
println!("cargo:rustc-link-search=native={}", perf_libs_dir);
}
@ -46,30 +45,4 @@ fn main() {
println!("cargo:rustc-link-lib=dylib=cuda");
println!("cargo:rustc-link-lib=dylib=cudadevrt");
}
if erasure {
#[cfg(any(target_os = "macos", target_os = "ios"))]
{
println!(
"cargo:rerun-if-changed={}/libgf_complete.dylib",
perf_libs_dir
);
println!("cargo:rerun-if-changed={}/libJerasure.dylib", perf_libs_dir);
}
#[cfg(all(unix, not(any(target_os = "macos", target_os = "ios"))))]
{
println!("cargo:rerun-if-changed={}/libgf_complete.so", perf_libs_dir);
println!("cargo:rerun-if-changed={}/libJerasure.so", perf_libs_dir);
}
#[cfg(windows)]
{
println!(
"cargo:rerun-if-changed={}/libgf_complete.dll",
perf_libs_dir
);
println!("cargo:rerun-if-changed={}/libJerasure.dll", perf_libs_dir);
}
println!("cargo:rustc-link-lib=dylib=Jerasure");
println!("cargo:rustc-link-lib=dylib=gf_complete");
}
}