Ivolkg/sparse ccs (#99)

Needs [this](NethermindEth/lattirust#66) PR in lattirust --------- Co-authored-by: v0-e <xyz.vieira@gmail.com>
NethermindEth · Nov 28, 2024 · c461204 · c461204
1 parent d8c499f
commit c461204
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/latticefold/benches/linearization.rs b/latticefold/benches/linearization.rs
@@ -137,6 +137,7 @@ fn linearization_benchmarks<
 macro_rules! define_params {
     ($w:expr, $b:expr, $l:expr, $b_small:expr, $k:expr) => {
         paste::paste! {
+
             #[derive(Clone)]
             struct [<DecompParamsWithB $b W $w b $b_small K $k>];
 
@@ -149,21 +150,22 @@ macro_rules! define_params {
         }
     };
 }
+
 #[macro_export]
 macro_rules! run_single_goldilocks_benchmark {
-    ( $crit:expr, $io:expr, $cw:expr, $w:expr, $b:expr, $l:expr,  $b_small:expr, $k:expr) => {
+    ($crit:expr, $io:expr, $cw:expr, $w:expr, $b:expr, $l:expr, $b_small:expr, $k:expr) => {
         define_params!($w, $b, $l, $b_small, $k);
         paste::paste! {
             linearization_benchmarks::<$io, $cw, $w, {$w * $l}, GoldilocksChallengeSet, GoldilocksRingNTT, [<DecompParamsWithB $b W $w b $b_small K $k>]>($crit);
-
         }
     };
 }
+
 macro_rules! run_single_starkprime_benchmark {
     ($crit:expr, $io:expr, $cw:expr, $w:expr, $b:expr, $l:expr, $b_small:expr, $k:expr) => {
         define_params!($w, $b, $l, $b_small, $k);
         paste::paste! {
-            linearization_benchmarks::<$io, $cw, $w,{$w * $l}, StarkChallengeSet, StarkRingNTT, [<DecompParamsWithB $b W $w b $b_small K $k>]>($crit);
+            linearization_benchmarks::<$io, $cw, $w, {$w * $l}, StarkChallengeSet, StarkRingNTT, [<DecompParamsWithB $b W $w b $b_small K $k>]>($crit);
         }
     };
 }

diff --git a/latticefold/src/arith/r1cs.rs b/latticefold/src/arith/r1cs.rs
@@ -1,4 +1,4 @@
-use lattirust_linear_algebra::sparse_matrix::dense_matrix_to_sparse;
+use lattirust_linear_algebra::sparse_matrix::dense_matrix_u64_to_sparse;
 use lattirust_linear_algebra::SparseMatrix;
 use lattirust_ring::Ring;
 
@@ -78,7 +78,12 @@ impl<R: Ring> RelaxedR1CS<R> {
 }
 
 pub fn to_F_matrix<R: Ring>(M: Vec<Vec<usize>>) -> SparseMatrix<R> {
-    dense_matrix_to_sparse(to_F_dense_matrix::<R>(M))
+    // dense_matrix_to_sparse(to_F_dense_matrix::<R>(M))
+    let M_u64: Vec<Vec<u64>> = M
+        .iter()
+        .map(|m| m.iter().map(|r| *r as u64).collect())
+        .collect();
+    dense_matrix_u64_to_sparse(M_u64)
 }
 
 pub fn to_F_dense_matrix<R: Ring>(M: Vec<Vec<usize>>) -> Vec<Vec<R>> {
@@ -118,7 +123,7 @@ pub fn get_test_r1cs<R: Ring>() -> R1CS<R> {
 pub fn get_test_dummy_r1cs<R: Ring, const X_LEN: usize, const WIT_LEN: usize>(
     rows: usize,
 ) -> R1CS<R> {
-    let R1CS_A = to_F_matrix::<R>(create_dummy_identity_matrix(rows, X_LEN + WIT_LEN + 1));
+    let R1CS_A = create_dummy_identity_sparse_matrix(rows, X_LEN + WIT_LEN + 1);
     let R1CS_B = R1CS_A.clone();
     let R1CS_C = R1CS_A.clone();
 
@@ -137,6 +142,21 @@ pub fn create_dummy_identity_matrix(rows: usize, columns: usize) -> Vec<Vec<usiz
     matrix
 }
 
+pub fn create_dummy_identity_sparse_matrix<R: Ring>(
+    rows: usize,
+    columns: usize,
+) -> SparseMatrix<R> {
+    let mut matrix = SparseMatrix {
+        n_rows: rows,
+        n_cols: columns,
+        coeffs: vec![vec![]; rows],
+    };
+    for (i, row) in matrix.coeffs.iter_mut().enumerate() {
+        row.push((R::one(), i));
+    }
+    matrix
+}
+
 pub fn get_test_z<R: Ring>(input: usize) -> Vec<R> {
     // z = (1, io, w)
     to_F_vec(vec![