Skip to content

Commit 4176a1e

Browse files
authored
Merge pull request #434 from filecoin-project/fixed-rows-to-discard
feat: add option to not require a t_aux file to be present
2 parents 4f55a65 + 8bf8a4f commit 4176a1e

File tree

3 files changed

+33
-21
lines changed

3 files changed

+33
-21
lines changed

install-filcrypto

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,19 @@ build_from_source() {
208208
use_multicore_sdr=""
209209
fi
210210

211+
# By default the number or rows to discard of the TreeRLast can be set via
212+
# `FIL_PROOFS_ROWS_TO_DISCARD`. When SupraSeal PC2 is used, then this
213+
# number is fixed.
214+
use_fixed_rows_to_discard=""
215+
if [ "${FFI_USE_FIXED_ROWS_TO_DISCARD}" == "1" ]; then
216+
use_fixed_rows_to_discard=",fixed-rows-to-discard"
217+
fi
218+
211219
# Add feature specific rust flags as needed here.
212220
if [ "${FFI_USE_BLST_PORTABLE}" == "1" ]; then
213-
additional_flags="${additional_flags} --no-default-features --features ${use_multicore_sdr},blst-portable${gpu_flags}"
221+
additional_flags="${additional_flags} --no-default-features --features ${use_multicore_sdr},blst-portable${gpu_flags}${use_fixed_rows_to_discard}"
214222
else
215-
additional_flags="${additional_flags} --no-default-features --features ${use_multicore_sdr}${gpu_flags}"
223+
additional_flags="${additional_flags} --no-default-features --features ${use_multicore_sdr}${gpu_flags}${use_fixed_rows_to_discard}"
216224
fi
217225

218226
echo "Using additional build flags: ${additional_flags}"

rust/Cargo.lock

Lines changed: 19 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ lazy_static = "1.4.0"
4747
serde = "1.0.117"
4848
serde_tuple = "0.5"
4949
safer-ffi = { version = "0.0.7", features = ["proc_macros"] }
50-
filecoin-proofs-api = { version = "16.0", default-features = false }
50+
filecoin-proofs-api = { version = "16.1", default-features = false }
5151

5252
[dev-dependencies]
5353
memmap2 = "0.5"
@@ -61,3 +61,6 @@ cuda-supraseal = ["filecoin-proofs-api/cuda-supraseal", "rust-gpu-tools/cuda", "
6161
opencl = ["filecoin-proofs-api/opencl", "rust-gpu-tools/opencl", "fvm2/opencl", "fvm3/opencl", "fvm4/opencl"]
6262
multicore-sdr = ["filecoin-proofs-api/multicore-sdr"]
6363
c-headers = ["safer-ffi/headers"]
64+
# This feature enables a fixed number of discarded rows for TreeR. The `FIL_PROOFS_ROWS_TO_DISCARD`
65+
# setting is ignored, no `TemporaryAux` file will be written.
66+
fixed-rows-to-discard = ["filecoin-proofs-api/fixed-rows-to-discard"]

0 commit comments

Comments
 (0)