Skip to content

Commit

Permalink
Reduce warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
porcuquine committed Apr 18, 2024
1 parent d216d3f commit 37db63e
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 24 deletions.
4 changes: 2 additions & 2 deletions examples/ski/ski/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ p3-util = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a
p3-challenger = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
p3-dft = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
p3-fri = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
p3-goldilocks = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
#p3-goldilocks = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
p3-keccak = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
p3-keccak-air = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
p3-blake3 = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
Expand All @@ -37,4 +37,4 @@ p3-poseidon2 = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871df
p3-symmetric = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
p3-uni-stark = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
p3-maybe-rayon = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
p3-bn254-fr = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
#p3-bn254-fr = { git = "ssh://[email protected]/Plonky3/Plonky3.git", rev = "2871dfe257a49583c763c94a879785188716f006" }
10 changes: 6 additions & 4 deletions examples/ski/ski/src/air/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,13 @@ pub trait ConsBuilder: BaseAirBuilder {
) where
E: Into<Self::Expr>,
{
todo!("add cons domain");
self.send(AirInteraction::new(
chain!(a.into_exprs(), b.into_exprs(), c.into_exprs()).collect(),
is_cons.into(),
InteractionKind::MemoSet,
));

todo!("add cons domain");
}

/// Receives a byte operation to be processed.
Expand All @@ -81,12 +82,13 @@ pub trait ConsBuilder: BaseAirBuilder {
) where
E: Into<Self::Expr>,
{
todo!("add cons domain");
self.receive(AirInteraction::new(
chain!(a.into_exprs(), b.into_exprs(), c.into_exprs()).collect(),
multiplicity.into(),
InteractionKind::MemoSet,
));

todo!("add cons domain");
}
}

Expand All @@ -102,12 +104,12 @@ pub trait RelationBuilder: BaseAirBuilder {
Etag: Into<Self::Expr>,
EReal: Into<Self::Expr>,
{
todo!("add relation domain");
self.send(AirInteraction::new(
chain!(a.into_exprs(), b.into_exprs(), [tag.into()]).collect(),
is_real.into(),
InteractionKind::MemoSet,
));
todo!("add relation domain");
}

/// Receives a byte operation to be processed.
Expand All @@ -121,11 +123,11 @@ pub trait RelationBuilder: BaseAirBuilder {
Etag: Into<Self::Expr>,
EMult: Into<Self::Expr>,
{
todo!("add relation domain");
self.receive(AirInteraction::new(
chain!(a.into_exprs(), b.into_exprs(), [tag.into()]).collect(),
multiplicity.into(),
InteractionKind::MemoSet,
));
todo!("add relation domain");
}
}
37 changes: 19 additions & 18 deletions examples/ski/ski/src/chips/mod.rs
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
use p3_air::{Air, AirBuilder, BaseAir};
use p3_field::{AbstractField, Field};
use p3_air::{Air, BaseAir};
use p3_field::Field;
use p3_matrix::dense::RowMajorMatrix;
use wp1_core::stark::SP1AirBuilder;
use wp1_derive::AlignedBorrow;

use std::mem::size_of;

struct EvalCols {}
struct ApplyCols {}
struct Eval1Cols {}
struct SCols {}
struct S1Cols {}
struct S2Cols {}
struct S3Cols {}
struct KCols {}
struct K1Cols {}
struct K2Cols {}
struct ICols {}
struct I1Cols {}
// struct EvalCols {}
// struct ApplyCols {}
// struct Eval1Cols {}
// struct SCols {}
// struct S1Cols {}
// struct S2Cols {}
// struct S3Cols {}
// struct KCols {}
// struct K1Cols {}
// struct K2Cols {}
// struct ICols {}
// struct I1Cols {}

#[derive(AlignedBorrow)]
struct CpuCols<T> {
x: T,
_x: T,
}

struct CpuChip {}
Expand All @@ -42,15 +42,15 @@ impl CpuChip {
}

impl<AB: SP1AirBuilder> Air<AB> for CpuChip {
fn eval(&self, builder: &mut AB) {
fn eval(&self, _builder: &mut AB) {
todo!()
}
}

#[cfg(test)]
mod tests {
use p3_baby_bear::BabyBear;
use p3_field::{AbstractField, Field};
use p3_field::AbstractField;
use p3_matrix::dense::RowMajorMatrix;
use wp1_core::{
stark::StarkGenericConfig,
Expand All @@ -59,11 +59,12 @@ mod tests {

use super::*;

#[allow(dead_code)]
fn prove_trace() {
let config = BabyBearPoseidon2::new();
let mut challenger = config.challenger();

let f = BabyBear::from_canonical_usize;
let _f = BabyBear::from_canonical_usize;

let trace: RowMajorMatrix<BabyBear> = CpuChip::generate_trace();

Expand Down

0 comments on commit 37db63e

Please sign in to comment.