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

chore: Update for Sphinx v1.0.0-rc.1 #298

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

chore: Update for Sphinx v1.0.0-rc.1 #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7f0064
chore: Update for Sphinx v1.0.0-rc.1
wwared Sep 9, 2024
4904b94
chore: rustfmt
wwared Sep 10, 2024
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
77 changes: 42 additions & 35 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ p3-poseidon2 = { git = "https://github.com/argumentcomputer/Plonky3.git", branch
p3-symmetric = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
p3-uni-stark = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
p3-util = { git = "https://github.com/argumentcomputer/Plonky3.git", branch = "sp1" }
sphinx-core = { git = "https://github.com/argumentcomputer/sphinx.git", branch = "dev"}
sphinx-derive = { git = "https://github.com/argumentcomputer/sphinx.git", branch = "dev" }
sphinx-core = { git = "https://github.com/argumentcomputer/sphinx.git", branch = "forward_ports_44"}
sphinx-derive = { git = "https://github.com/argumentcomputer/sphinx.git", branch = "forward_ports_44" }
anyhow = "1.0.72"
ascent = { git = "https://github.com/argumentcomputer/ascent.git" }
arc-swap = "1.7.1"
Expand Down
13 changes: 6 additions & 7 deletions benches/fib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use p3_field::AbstractField;
use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
use sphinx_core::{
air::MachineAir,
stark::{LocalProver, StarkGenericConfig, StarkMachine},
stark::{DefaultProver, MachineProver, StarkGenericConfig, StarkMachine},
utils::{BabyBearPoseidon2, SphinxCoreOpts},
};
use std::time::Duration;
Expand Down Expand Up @@ -46,11 +46,7 @@ fn build_lurk_expr(arg: usize) -> String {
fn setup<H: Chipset<BabyBear>>(
arg: usize,
toplevel: &Toplevel<BabyBear, H>,
) -> (
List<BabyBear>,
FuncChip<'_, BabyBear, H>,
QueryRecord<BabyBear>,
) {
) -> (List<BabyBear>, FuncChip<BabyBear, H>, QueryRecord<BabyBear>) {
let code = build_lurk_expr(arg);
let zstore = &mut lurk_zstore();
let ZPtr { tag, digest } = zstore.read(&code).unwrap();
Expand Down Expand Up @@ -125,7 +121,10 @@ fn e2e(c: &mut Criterion) {
let mut challenger_p = machine.config().challenger();
let opts = SphinxCoreOpts::default();
let shard = Shard::new(&record);
machine.prove::<LocalProver<_, _>>(&pk, shard, &mut challenger_p, opts);
let prover = DefaultProver::new(machine);
prover
.prove(&pk, vec![shard], &mut challenger_p, opts)
.unwrap();
},
BatchSize::SmallInput,
)
Expand Down
13 changes: 6 additions & 7 deletions benches/lcs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use p3_field::AbstractField;
use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
use sphinx_core::{
air::MachineAir,
stark::{LocalProver, StarkGenericConfig, StarkMachine},
stark::{DefaultProver, MachineProver, StarkGenericConfig, StarkMachine},
utils::{BabyBearPoseidon2, SphinxCoreOpts},
};
use std::time::Duration;
Expand Down Expand Up @@ -50,11 +50,7 @@ fn setup<'a, H: Chipset<BabyBear>>(
a: &'a str,
b: &'a str,
toplevel: &'a Toplevel<BabyBear, H>,
) -> (
List<BabyBear>,
FuncChip<'a, BabyBear, H>,
QueryRecord<BabyBear>,
) {
) -> (List<BabyBear>, FuncChip<BabyBear, H>, QueryRecord<BabyBear>) {
let code = build_lurk_expr(a, b);
let zstore = &mut lurk_zstore();
let ZPtr { tag, digest } = zstore.read(&code).unwrap();
Expand Down Expand Up @@ -129,7 +125,10 @@ fn e2e(c: &mut Criterion) {
let mut challenger_p = machine.config().challenger();
let opts = SphinxCoreOpts::default();
let shard = Shard::new(&record);
machine.prove::<LocalProver<_, _>>(&pk, shard, &mut challenger_p, opts);
let prover = DefaultProver::new(machine);
prover
.prove(&pk, vec![shard], &mut challenger_p, opts)
.unwrap();
},
BatchSize::SmallInput,
)
Expand Down
13 changes: 6 additions & 7 deletions benches/sum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use p3_field::AbstractField;
use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
use sphinx_core::{
air::MachineAir,
stark::{LocalProver, StarkGenericConfig, StarkMachine},
stark::{DefaultProver, MachineProver, StarkGenericConfig, StarkMachine},
utils::{BabyBearPoseidon2, SphinxCoreOpts},
};
use std::time::Duration;
Expand Down Expand Up @@ -50,11 +50,7 @@ fn build_lurk_expr(n: usize) -> String {
fn setup<H: Chipset<BabyBear>>(
n: usize,
toplevel: &Toplevel<BabyBear, H>,
) -> (
List<BabyBear>,
FuncChip<'_, BabyBear, H>,
QueryRecord<BabyBear>,
) {
) -> (List<BabyBear>, FuncChip<BabyBear, H>, QueryRecord<BabyBear>) {
let code = build_lurk_expr(n);

let zstore = &mut lurk_zstore();
Expand Down Expand Up @@ -130,7 +126,10 @@ fn e2e(c: &mut Criterion) {
let mut challenger_p = machine.config().challenger();
let opts = SphinxCoreOpts::default();
let shard = Shard::new(&record);
machine.prove::<LocalProver<_, _>>(&pk, shard, &mut challenger_p, opts);
let prover = DefaultProver::new(machine);
prover
.prove(&pk, vec![shard], &mut challenger_p, opts)
.unwrap();
},
BatchSize::SmallInput,
)
Expand Down
8 changes: 3 additions & 5 deletions src/air/debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use p3_matrix::dense::{RowMajorMatrix, RowMajorMatrixView};
use p3_matrix::stack::VerticalPair;
use p3_matrix::Matrix;
use sphinx_core::air::MachineAir;
use sphinx_core::stark::MachineRecord;
use std::collections::BTreeMap;

type LocalRowView<'a, F> = VerticalPair<RowMajorMatrixView<'a, F>, RowMajorMatrixView<'a, F>>;
Expand Down Expand Up @@ -118,14 +117,13 @@ impl<F: PrimeField32> TraceQueries<F> {
/// Helper function to execute and test queries and constraints using `debug_constraints_collecting_queries`
pub fn debug_chip_constraints_and_queries_with_sharding<F: PrimeField32, C: Chipset<F>>(
record: &QueryRecord<F>,
chips: &[LairChip<'_, F, C>],
chips: &[LairChip<F, C>],
config: Option<ShardingConfig>,
) {
let full_shard = Shard::new(record);
let shards = if let Some(config) = config {
full_shard.shard(&config)
config.shard(record)
} else {
vec![full_shard]
vec![Shard::new(&record.clone())]
};

let lookup_queries: Vec<_> = shards
Expand Down
4 changes: 2 additions & 2 deletions src/lair/air.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ fn eval_depth<F: Field, AB>(
out.extend(dep_depth.iter().cloned());
}

impl<'a, AB, H: Chipset<AB::F>> Air<AB> for FuncChip<'a, AB::F, H>
impl<AB, H: Chipset<AB::F>> Air<AB> for FuncChip<AB::F, H>
where
AB: AirBuilder + LookupBuilder,
<AB as AirBuilder>::Var: Debug,
{
fn eval(&self, builder: &mut AB) {
self.func.eval(builder, self.toplevel, self.layout_sizes)
self.func.eval(builder, &self.toplevel, self.layout_sizes)
}
}

Expand Down
Loading