diff --git a/fil-proofs-param/Cargo.toml b/fil-proofs-param/Cargo.toml index 4b714b25e..93eabbf87 100644 --- a/fil-proofs-param/Cargo.toml +++ b/fil-proofs-param/Cargo.toml @@ -13,42 +13,24 @@ storage-proofs-core = { path = "../storage-proofs-core", version = "^11.0.0", de storage-proofs-porep = { path = "../storage-proofs-porep", version = "^11.0.0", default-features = false } storage-proofs-post = { path = "../storage-proofs-post", version = "^11.0.0", default-features = false } storage-proofs-update = { path = "../storage-proofs-update", version = "^11.0.0", default-features = false } -filecoin-hashers = { version = "^6.0.0", path = "../filecoin-hashers", default-features = false, features = ["poseidon", "sha256"] } filecoin-proofs = { version = "^11.0.0", path = "../filecoin-proofs", default-features = false } -bitvec = "1.0.0" rand = "0.8" lazy_static = "1.2" -memmap = "0.7" pbr = "1.0" -byteorder = "1" itertools = "0.10.3" -serde = { version = "1.0", features = ["rc", "derive"] } serde_json = "1.0" -ff = "0.11.0" blake2b_simd = "1.0.0" -bellperson = "0.18.0" log = "0.4.7" fil_logger = "0.1.6" env_proxy = "0.4" flate2 = { version = "1.0.9", features = ["rust_backend"]} tar = "0.4.26" -rayon = "1.1.0" -blake2s_simd = "1.0.0" -hex = "0.4.0" -merkletree = "0.21.0" -bincode = "1.1.2" anyhow = "1.0.23" -rand_xorshift = "0.3.0" -sha2 = "0.10.2" -typenum = "1.11.2" gperftools = { version = "0.2", optional = true } -generic-array = "0.14.4" structopt = "0.3.12" humansize = "1.1.0" indicatif = "0.16.2" -group = "0.11.0" dialoguer = "0.10.0" -clap = "3.1.6" [dependencies.reqwest] version = "0.11.10" @@ -56,9 +38,7 @@ default-features = false features = ["blocking", "native-tls-vendored"] [dev-dependencies] -criterion = "0.3" rexpect = "0.4.0" -pretty_assertions = "1.2.0" failure = "0.1.7" tempfile = "3" @@ -68,5 +48,5 @@ cpu-profile = ["gperftools"] heap-profile = ["gperftools/heap"] simd = ["storage-proofs-core/simd"] asm = ["storage-proofs-core/asm"] -cuda = ["storage-proofs-core/cuda", "storage-proofs-porep/cuda", "storage-proofs-post/cuda", "storage-proofs-update/cuda", "bellperson/cuda"] -opencl = ["storage-proofs-core/opencl", "storage-proofs-porep/opencl", "storage-proofs-post/opencl", "storage-proofs-update/opencl", "bellperson/opencl"] +cuda = ["storage-proofs-core/cuda", "storage-proofs-porep/cuda", "storage-proofs-post/cuda", "storage-proofs-update/cuda"] +opencl = ["storage-proofs-core/opencl", "storage-proofs-porep/opencl", "storage-proofs-post/opencl", "storage-proofs-update/opencl"] diff --git a/fil-proofs-tooling/Cargo.toml b/fil-proofs-tooling/Cargo.toml index 644fc1ac3..98d4d20b5 100644 --- a/fil-proofs-tooling/Cargo.toml +++ b/fil-proofs-tooling/Cargo.toml @@ -13,15 +13,11 @@ readme = "README.md" storage-proofs-core = { path = "../storage-proofs-core", version = "^11.0.0", default-features = false} storage-proofs-porep = { path = "../storage-proofs-porep", version = "^11.0.0", default-features = false } storage-proofs-post = { path = "../storage-proofs-post", version = "^11.0.0", default-features = false } -storage-proofs-update = { path = "../storage-proofs-update", version = "^11.0.0", default-features = false } filecoin-proofs = { path = "../filecoin-proofs", default-features = false } filecoin-hashers = { path = "../filecoin-hashers", default-features = false, features = ["poseidon", "blake2s", "sha256"] } clap = { version = "3.1.6", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -toml = "0.5" -lazy_static = "1.2" -glob = "0.3" regex = "1.3.7" commandspec = "0.12.2" chrono = { version = "0.4.7", features = ["serde"] } @@ -36,11 +32,9 @@ async-std = "1.6" blake2s_simd = "1.0.0" fil_logger = "0.1.6" log = "0.4.8" -uom = "0.32.0" merkletree = "0.21.0" bincode = "1.1.2" anyhow = "1.0.23" -ff = "0.11.0" rand_xorshift = "0.3.0" bytefmt = "0.1.7" rayon = "1.3.0" @@ -61,7 +55,6 @@ cuda = [ "storage-proofs-core/cuda", "storage-proofs-porep/cuda", "storage-proofs-post/cuda", - "storage-proofs-update/cuda", "filecoin-proofs/cuda", "bellperson/cuda", "filecoin-hashers/cuda", @@ -70,7 +63,6 @@ opencl = [ "storage-proofs-core/opencl", "storage-proofs-porep/opencl", "storage-proofs-post/opencl", - "storage-proofs-update/opencl", "filecoin-proofs/opencl", "bellperson/opencl", "filecoin-hashers/opencl", diff --git a/filecoin-proofs/Cargo.toml b/filecoin-proofs/Cargo.toml index a733d4056..ea5cdb900 100644 --- a/filecoin-proofs/Cargo.toml +++ b/filecoin-proofs/Cargo.toml @@ -14,42 +14,33 @@ storage-proofs-porep = { path = "../storage-proofs-porep", version = "^11.0.0", storage-proofs-post = { path = "../storage-proofs-post", version = "^11.0.0", default-features = false } storage-proofs-update = { path = "../storage-proofs-update", version = "^11.0.0", default-features = false } filecoin-hashers = { version = "^6.0.0", path = "../filecoin-hashers", default-features = false, features = ["poseidon", "sha256"] } -bitvec = "1.0.0" rand = "0.8" lazy_static = "1.2" memmap = "0.7" -byteorder = "1" -itertools = "0.10.3" serde = { version = "1.0", features = ["rc", "derive"] } serde_json = "1.0" -ff = "0.11.0" blake2b_simd = "1.0.0" bellperson = "0.18.0" log = "0.4.7" -fil_logger = "0.1.6" rayon = "1.1.0" -blake2s_simd = "1.0.0" hex = "0.4.0" merkletree = "0.21.0" bincode = "1.1.2" anyhow = "1.0.23" -rand_xorshift = "0.3.0" sha2 = "0.10.2" typenum = "1.11.2" gperftools = { version = "0.2", optional = true } generic-array = "0.14.4" -group = "0.11.0" -byte-slice-cast = "1.0.0" fr32 = { path = "../fr32", version = "^4.0.0", default-features = false } once_cell = "1.8.0" blstrs = "0.4.0" [dev-dependencies] criterion = "0.3" -rexpect = "0.4.0" -pretty_assertions = "1.2.0" -failure = "0.1.7" tempfile = "3" +ff = "0.11.0" +fil_logger = "0.1.6" +rand_xorshift = "0.3.0" [features] default = ["opencl"] @@ -64,7 +55,6 @@ cuda = [ "storage-proofs-update/cuda", "bellperson/cuda", "filecoin-hashers/cuda", - "fr32/cuda", ] opencl = [ "storage-proofs-core/opencl", @@ -73,7 +63,6 @@ opencl = [ "storage-proofs-update/opencl", "bellperson/opencl", "filecoin-hashers/opencl", - "fr32/opencl", ] multicore-sdr = ["storage-proofs-porep/multicore-sdr"] big-tests = [] diff --git a/fr32/Cargo.toml b/fr32/Cargo.toml index a3baee6fb..58d91db85 100644 --- a/fr32/Cargo.toml +++ b/fr32/Cargo.toml @@ -9,7 +9,6 @@ repository = "https://github.com/filecoin-project/rust-fil-proofs" [dependencies] anyhow = "1.0.23" -bellperson = "0.18.0" byte-slice-cast = "1.0.0" byteorder = "1" ff = "0.11.0" @@ -24,11 +23,6 @@ pretty_assertions = "1.2.0" rand = "0.8" rand_xorshift = "0.3" -[features] -default = [] -cuda = ["bellperson/cuda"] -opencl = ["bellperson/opencl"] - [[bench]] name = "fr" harness = false diff --git a/sha2raw/Cargo.toml b/sha2raw/Cargo.toml index ae06f1ebd..79da76ee7 100644 --- a/sha2raw/Cargo.toml +++ b/sha2raw/Cargo.toml @@ -12,7 +12,6 @@ edition = "2018" [dependencies] digest = "0.10.3" -block-buffer = "0.10.2" fake-simd = "0.1" opaque-debug = "0.3" sha2-asm = { version = "0.6", optional = true } @@ -25,7 +24,6 @@ version = "1.4.0" cpufeatures = "0.2.2" [dev-dependencies] -digest = { version = "0.10.3", features = ["dev", "std"] } sha2 = "0.10.2" rand = "0.8.5" rand_xorshift = "0.3.0" diff --git a/storage-proofs-core/Cargo.toml b/storage-proofs-core/Cargo.toml index c5ab127d2..8fc361a9c 100644 --- a/storage-proofs-core/Cargo.toml +++ b/storage-proofs-core/Cargo.toml @@ -22,40 +22,35 @@ lazy_static = "1.2" memmap = "0.7" aes = "0.8.1" sha2 = "0.10.2" -tempfile = "3" fs2 = "0.4" rayon = "1.0.0" serde = { version = "1.0", features = ["derive"]} blake2b_simd = "1.0.0" -blake2s_simd = "1.0.0" -toml = "0.5" ff = "0.11.0" bellperson = "0.18.0" serde_json = "1.0" log = "0.4.7" rand_chacha = "0.3" -hex = "0.4.0" generic-array = "0.14.4" anyhow = "1.0.23" thiserror = "1.0.6" -neptune = { version = "5.1.0", features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] } cpu-time = { version = "1.0", optional = true } gperftools = { version = "0.2", optional = true } num_cpus = "1.10.1" semver = "1.0.6" fr32 = { path = "../fr32", version = "^4.0.0"} -pairing = "0.21" blstrs = "0.4.0" cbc = { version = "0.1.2", features = ["std"] } [dev-dependencies] proptest = "1.0.0" criterion = "0.3" -bitvec = "1.0.0" rand_xorshift = "0.3.0" pretty_assertions = "1.2.0" sha2raw = { path = "../sha2raw", version = "^6.0.0"} filecoin-hashers = { path = "../filecoin-hashers", version = "^6.0.0", default-features = false, features = ["blake2s", "sha256", "poseidon"] } +tempfile = "3" +blake2s_simd = "1.0.0" [features] default = ["opencl"] @@ -65,8 +60,8 @@ big-sector-sizes-bench = [] measurements = ["cpu-time", "gperftools"] profile = ["measurements"] -cuda = ["bellperson/cuda", "neptune/cuda", "filecoin-hashers/cuda", "fr32/cuda"] -opencl = ["bellperson/opencl", "neptune/opencl", "filecoin-hashers/opencl", "fr32/opencl"] +cuda = ["bellperson/cuda", "filecoin-hashers/cuda"] +opencl = ["bellperson/opencl", "filecoin-hashers/opencl"] [[bench]] name = "sha256" diff --git a/storage-proofs-porep/Cargo.toml b/storage-proofs-porep/Cargo.toml index 8d3408e3e..8a11b48a7 100644 --- a/storage-proofs-porep/Cargo.toml +++ b/storage-proofs-porep/Cargo.toml @@ -10,11 +10,9 @@ readme = "README.md" [dependencies] crossbeam = "0.8" -digest = "0.10.3" storage-proofs-core = { path = "../storage-proofs-core", version = "^11.0.0", default-features = false} sha2raw = { path = "../sha2raw", version = "^6.0.0"} filecoin-hashers = { path = "../filecoin-hashers", version = "^6.0.0", default-features = false, features = ["poseidon", "sha256"]} -rand = "0.8" merkletree = "0.21.0" mapr = "0.8.0" num-bigint = "0.4.3" @@ -40,8 +38,6 @@ libc = "0.2" fdlimit = "0.2.0" fr32 = { path = "../fr32", version = "^4.0.0", default-features = false } yastl = "0.1.2" -pairing = "0.21" -fil_logger = "0.1.6" blstrs = "0.4.0" [target."cfg(target_arch = \"aarch64\")".dependencies] @@ -51,15 +47,17 @@ sha2 = { version = "0.10.2", features = ["compress"] } [dev-dependencies] tempfile = "3" +rand = "0.8" rand_xorshift = "0.3.0" criterion = "0.3.2" glob = "0.3.0" filecoin-hashers = { path = "../filecoin-hashers", version = "^6.0.0", default-features = false, features = ["poseidon", "sha256", "blake2s"]} +fil_logger = "0.1.6" [features] default = ["opencl", "multicore-sdr"] -cuda = ["storage-proofs-core/cuda", "filecoin-hashers/cuda", "neptune/cuda", "bellperson/cuda", "fr32/cuda"] -opencl = ["storage-proofs-core/opencl", "filecoin-hashers/opencl", "neptune/opencl", "bellperson/opencl", "fr32/opencl"] +cuda = ["storage-proofs-core/cuda", "filecoin-hashers/cuda", "neptune/cuda", "bellperson/cuda"] +opencl = ["storage-proofs-core/opencl", "filecoin-hashers/opencl", "neptune/opencl", "bellperson/opencl"] isolated-testing = [] multicore-sdr = ["hwloc"] diff --git a/storage-proofs-post/Cargo.toml b/storage-proofs-post/Cargo.toml index 6ef74e96c..0143f01a2 100644 --- a/storage-proofs-post/Cargo.toml +++ b/storage-proofs-post/Cargo.toml @@ -11,23 +11,17 @@ readme = "README.md" [dependencies] storage-proofs-core = { path = "../storage-proofs-core", version = "^11.0.0", default-features = false} filecoin-hashers = { path = "../filecoin-hashers", version = "^6.0.0", default-features = false, features = ["poseidon", "sha256"]} -rand = "0.8" -merkletree = "0.21.0" byteorder = "1" -crossbeam = "0.8" sha2 = "0.10.2" rayon = "1.0.0" serde = { version = "1.0", features = ["derive"]} blake2b_simd = "1.0.0" -blake2s_simd = "1.0.0" ff = "0.11.0" bellperson = "0.18.0" log = "0.4.7" hex = "0.4.0" generic-array = "0.14.4" anyhow = "1.0.23" -neptune = { version = "5.1.0", features = ["arity2", "arity4", "arity8", "arity11", "arity16", "arity24", "arity36"] } -num_cpus = "1.10.1" fr32 = { path = "../fr32", version = "^4.0.0", default-features = false } blstrs = "0.4.0" @@ -35,9 +29,10 @@ blstrs = "0.4.0" tempfile = "3" pretty_assertions = "1.2.0" filecoin-hashers = { path = "../filecoin-hashers", version = "^6.0.0", default-features = false, features = ["poseidon", "sha256", "blake2s"]} +rand = "0.8" rand_xorshift = "0.3.0" [features] default = ["opencl"] -cuda = ["storage-proofs-core/cuda", "filecoin-hashers/cuda", "fr32/cuda", "neptune/cuda"] -opencl = ["storage-proofs-core/opencl", "filecoin-hashers/opencl", "fr32/opencl", "neptune/opencl"] +cuda = ["storage-proofs-core/cuda", "filecoin-hashers/cuda"] +opencl = ["storage-proofs-core/opencl", "filecoin-hashers/opencl"] diff --git a/storage-proofs-update/Cargo.toml b/storage-proofs-update/Cargo.toml index 0284c9851..49b8cb429 100644 --- a/storage-proofs-update/Cargo.toml +++ b/storage-proofs-update/Cargo.toml @@ -40,7 +40,6 @@ opencl = [ "filecoin-hashers/opencl", "neptune/opencl", "bellperson/opencl", - "fr32/opencl", ] cuda = [ "storage-proofs-core/cuda", @@ -48,7 +47,6 @@ cuda = [ "filecoin-hashers/cuda", "neptune/cuda", "bellperson/cuda", - "fr32/cuda", ] multicore-sdr = [ "storage-proofs-porep/multicore-sdr",