Skip to content

Commit f563bf3

Browse files
feat(deps): update and add gpu feature (#891)
feat(deps): update and add gpu feature
2 parents 01a03d7 + 45c61fd commit f563bf3

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

fil-proofs-tooling/Cargo.toml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,25 @@ human-size = "0.4"
2222
prettytable-rs = "0.8"
2323
regex = "1.1.6"
2424
commandspec = "0.12.2"
25-
bellperson = "0.2.0"
25+
bellperson = "0.3"
2626
chrono = { version = "0.4.7", features = ["serde"] }
27-
fil-sapling-crypto = "0.1.0"
27+
fil-sapling-crypto = "0.1.2"
2828
memmap = "0.7.0"
2929
paired = "0.15.0"
3030
rand = "0.4"
3131
storage-proofs = { path = "../storage-proofs"}
3232
filecoin-proofs = { path = "../filecoin-proofs"}
3333
tempfile = "3.0.8"
3434
cpu-time = "0.1.0"
35-
git2 = "0.9.2"
36-
heim = "0.0.5"
35+
git2 = "0.10.1"
36+
heim = "0.0.7"
3737
futures-preview = "0.3.0-alpha.17"
3838
raw-cpuid = "6.1.0"
3939
blake2s_simd = "0.5.6"
4040
pretty_env_logger = "0.3.1"
4141
log = "0.4.8"
42+
uom = "0.25.0"
43+
44+
[features]
45+
default = []
46+
gpu = ["storage-proofs/gpu", "filecoin-proofs/gpu", "bellperson/gpu", "fil-sapling-crypto/gpu"]

fil-proofs-tooling/src/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl SystemMetadata {
109109
.unwrap_or_default(),
110110
processor_cores_logical: cpu_logical,
111111
processor_cores_physical: cpu_physical,
112-
memory_total_bytes: memory.total().get(),
112+
memory_total_bytes: memory.total().get::<uom::si::information::byte>(),
113113
})
114114
}
115115
}

filecoin-proofs/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ regex = "1"
2828
ff = "0.4.0"
2929
blake2b_simd = "0.5"
3030
phase21 = "0.3"
31-
bellperson = "0.2"
31+
bellperson = "0.3"
3232
paired = "0.15"
33-
fil-sapling-crypto = "0.1.1"
33+
fil-sapling-crypto = "0.1.2"
3434
clap = "2"
3535
log = "0.4.7"
3636
pretty_env_logger = "0.3.0"
@@ -56,6 +56,7 @@ cpu-profile = []
5656
heap-profile = []
5757
simd = ["storage-proofs/simd"]
5858
asm = ["storage-proofs/asm"]
59+
gpu = ["storage-proofs/gpu", "bellperson/gpu", "fil-sapling-crypto/gpu", "phase21/gpu"]
5960

6061
[[bench]]
6162
name = "preprocessing"

storage-proofs/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ blake2b_simd = "0.5"
4040
blake2s_simd = "0.5"
4141
toml = "0.5"
4242
ff = "0.4.0"
43-
bellperson = "0.2"
44-
paired = { version = "0.15", features = ["serde"] }
45-
fil-sapling-crypto = "0.1.1"
43+
bellperson = "0.3"
44+
paired = { version = "0.15.1", features = ["serde"] }
45+
fil-sapling-crypto = "0.1.2"
4646
serde_json = "1.0"
4747
log = "0.4.7"
4848
pretty_env_logger = "0.3.0"
@@ -54,6 +54,7 @@ asm = ["sha2/sha2-asm"]
5454
mem-trees = []
5555
big-sector-sizes-bench = []
5656
unchecked-degrees = []
57+
gpu = ["bellperson/gpu", "fil-sapling-crypto/gpu"]
5758

5859
[dev-dependencies]
5960
proptest = "0.7"

0 commit comments

Comments
 (0)