Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: use sync channels in pc2 #1500

Merged
merged 3 commits into from
Sep 7, 2021
Merged

fix: use sync channels in pc2 #1500

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb86c00
fix: use sync channels in pc2
dignifiedquire Aug 26, 2021
f479456
use bellperson/master
dignifiedquire Aug 26, 2021
f3b13f6
fix: use bellperson patch release instead of master
cryptonemo Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions storage-proofs-porep/src/stacked/vanilla/proof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,8 @@ impl<'a, Tree: 'static + MerkleTreeTrait, G: 'static + Hasher> StackedDrg<'a, Tr
ColumnArity: 'static + PoseidonArity,
TreeArity: PoseidonArity,
{
use crossbeam::channel::unbounded as channel;
use std::cmp::min;
use std::sync::mpsc::sync_channel as channel;
use std::sync::{Arc, RwLock};

use bellperson::bls::Fr;
Expand Down Expand Up @@ -513,12 +513,12 @@ impl<'a, Tree: 'static + MerkleTreeTrait, G: 'static + Hasher> StackedDrg<'a, Tr
let column_write_batch_size = SETTINGS.column_write_batch_size as usize;

// This channel will receive batches of columns and add them to the ColumnTreeBuilder.
let (builder_tx, builder_rx) = channel();
let (builder_tx, builder_rx) = channel(0);

let config_count = configs.len(); // Don't move config into closure below.
THREAD_POOL.scoped(|s| {
// This channel will receive the finished tree data to be written to disk.
let (writer_tx, writer_rx) = channel::<(Vec<Fr>, Vec<Fr>)>();
let (writer_tx, writer_rx) = channel::<(Vec<Fr>, Vec<Fr>)>(0);

s.execute(move || {
for i in 0..config_count {
Expand Down Expand Up @@ -861,10 +861,10 @@ impl<'a, Tree: 'static + MerkleTreeTrait, G: 'static + Hasher> StackedDrg<'a, Tr
where
TreeArity: PoseidonArity,
{
use crossbeam::channel::unbounded as channel;
use std::cmp::min;
use std::fs::OpenOptions;
use std::io::Write;
use std::sync::mpsc::sync_channel as channel;

use bellperson::bls::Fr;
use fr32::fr_into_bytes;
Expand All @@ -888,14 +888,14 @@ impl<'a, Tree: 'static + MerkleTreeTrait, G: 'static + Hasher> StackedDrg<'a, Tr
let max_gpu_tree_batch_size = SETTINGS.max_gpu_tree_batch_size as usize;

// This channel will receive batches of leaf nodes and add them to the TreeBuilder.
let (builder_tx, builder_rx) = channel::<(Vec<Fr>, bool)>();
let (builder_tx, builder_rx) = channel::<(Vec<Fr>, bool)>(0);
let config_count = configs.len(); // Don't move config into closure below.
let configs = &configs;
let tree_r_last_config = &tree_r_last_config;

THREAD_POOL.scoped(|s| {
// This channel will receive the finished tree data to be written to disk.
let (writer_tx, writer_rx) = channel::<Vec<Fr>>();
let (writer_tx, writer_rx) = channel::<Vec<Fr>>(0);

s.execute(move || {
for i in 0..config_count {
Expand Down