Update stwo

Cargo.toml

@@ -18,13 +18,16 @@ repository = "https://github.com/raphaelDkhn/Luminair"
 license = "MIT"
 
 [workspace.dependencies]
-stwo-prover = { git = "https://github.com/starkware-libs/stwo", rev = "045963c", features = [
+stwo = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba", features = [
     "parallel",
 ], default-features = false }
-stwo-air-utils-derive = { git = "https://github.com/starkware-libs/stwo", rev = "045963c" }
-stwo-air-utils = { git = "https://github.com/starkware-libs/stwo", rev = "045963c" }
+stwo-constraint-framework = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba", features = [
+    "parallel", "prover", "std"
+], default-features = false }
+stwo-air-utils-derive = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba" }
+stwo-air-utils = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba" }
 luminal = { git = "https://github.com/raphaelDkhn/luminal.git", rev = "80ae0fd" }
-numerair = { git = "https://github.com/gizatechxyz/NumerAir.git", rev = "bb75385" }
+numerair = { git = "https://github.com/gizatechxyz/NumerAir.git", rev = "11d1d26" }
 rayon = "1.10.0"
 tracing = "0.1"
 tracing-subscriber = "0.3"
@@ -43,4 +46,4 @@ debug = false
 lto = true
 
 [profile.test]
-inherits = "release"
+inherits = "release"

crates/air/Cargo.toml

@@ -6,7 +6,8 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
-stwo-prover.workspace = true
+stwo.workspace = true
+stwo-constraint-framework.workspace=true
 stwo-air-utils-derive.workspace = true
 stwo-air-utils.workspace = true
 luminal.workspace = true
@@ -21,4 +22,4 @@ rayon.workspace = true
 bincode.workspace = true
 luminair_utils = { path = "../utils" }
 itertools = "0.12.0"
-serde_with = "3.14.0"
+serde_with = { version = "3.14.0", features = ["indexmap_2"] }

crates/air/src/components/add/component.rs

@@ -1,7 +1,7 @@
 use crate::components::{AddClaim, NodeElements};
 use num_traits::One;
 use numerair::eval::EvalFixedPoint;
-use stwo_prover::constraint_framework::{
+use stwo_constraint_framework::{
     EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry,
 };
 

crates/air/src/components/add/table.rs

@@ -1,11 +1,11 @@
 use num_traits::{One, Zero};
 use serde::{Deserialize, Serialize};
-use stwo_prover::core::{
-    backend::simd::{
+use stwo::{
+    core::fields::m31::M31,
+    prover::backend::simd::{
         conversion::{Pack, Unpack},
         m31::{PackedM31, N_LANES},
     },
-    fields::m31::M31,
 };
 
 use crate::components::TraceColumn;

crates/air/src/components/add/witness.rs

@@ -1,15 +1,13 @@
 use luminair_utils::TraceError;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
+use stwo::prover::backend::simd::{
+    m31::{PackedM31, LOG_N_LANES, N_LANES},
+    qm31::PackedQM31,
+    SimdBackend,
+};
+use stwo_constraint_framework::{LogupTraceGenerator, Relation};
 use stwo_air_utils::trace::component_trace::ComponentTrace;
 use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized};
-use stwo_prover::{
-    constraint_framework::{logup::LogupTraceGenerator, Relation},
-    core::backend::simd::{
-        m31::{PackedM31, LOG_N_LANES, N_LANES},
-        qm31::PackedQM31,
-        SimdBackend,
-    },
-};
 
 use crate::{
     components::{

crates/air/src/components/contiguous/component.rs

@@ -1,6 +1,6 @@
 use crate::components::{ContiguousClaim, NodeElements};
 use num_traits::One;
-use stwo_prover::constraint_framework::{
+use stwo_constraint_framework::{
     EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry,
 };
 

crates/air/src/components/contiguous/table.rs

@@ -1,11 +1,11 @@
 use num_traits::{One, Zero};
 use serde::{Deserialize, Serialize};
-use stwo_prover::core::{
-    backend::simd::{
+use stwo::{
+    core::fields::m31::M31,
+    prover::backend::simd::{
         conversion::{Pack, Unpack},
         m31::{PackedM31, N_LANES},
     },
-    fields::m31::M31,
 };
 
 use crate::components::TraceColumn;

crates/air/src/components/contiguous/witness.rs

@@ -2,14 +2,12 @@ use luminair_utils::TraceError;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
 use stwo_air_utils::trace::component_trace::ComponentTrace;
 use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized};
-use stwo_prover::{
-    constraint_framework::{logup::LogupTraceGenerator, Relation},
-    core::backend::simd::{
-        m31::{PackedM31, LOG_N_LANES, N_LANES},
-        qm31::PackedQM31,
-        SimdBackend,
-    },
+use stwo::prover::backend::simd::{
+    m31::{PackedM31, LOG_N_LANES, N_LANES},
+    qm31::PackedQM31,
+    SimdBackend,
 };
+use stwo_constraint_framework::{LogupTraceGenerator, Relation};
 
 use crate::{
     components::{ContiguousClaim, InteractionClaim, NodeElements},

crates/air/src/components/exp2/component.rs

@@ -1,6 +1,6 @@
 use crate::components::{lookups::exp2::Exp2LookupElements, Exp2Claim, NodeElements};
 use num_traits::One;
-use stwo_prover::constraint_framework::{
+use stwo_constraint_framework::{
     EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry,
 };
 

crates/air/src/components/exp2/table.rs

@@ -1,11 +1,11 @@
 use num_traits::{One, Zero};
 use serde::{Deserialize, Serialize};
-use stwo_prover::core::{
-    backend::simd::{
+use stwo::{
+    core::fields::m31::M31,
+    prover::backend::simd::{
         conversion::{Pack, Unpack},
         m31::{PackedM31, N_LANES},
     },
-    fields::m31::M31,
 };
 
 use super::witness::N_TRACE_COLUMNS;

crates/air/src/components/exp2/witness.rs

@@ -2,14 +2,12 @@ use luminair_utils::TraceError;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
 use stwo_air_utils::trace::component_trace::ComponentTrace;
 use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized};
-use stwo_prover::{
-    constraint_framework::{logup::LogupTraceGenerator, Relation},
-    core::backend::simd::{
-        m31::{PackedM31, LOG_N_LANES, N_LANES},
-        qm31::PackedQM31,
-        SimdBackend,
-    },
+use stwo::prover::backend::simd::{
+    m31::{PackedM31, LOG_N_LANES, N_LANES},
+    qm31::PackedQM31,
+    SimdBackend,
 };
+use stwo_constraint_framework::{LogupTraceGenerator, Relation};
 
 use crate::{
     components::{

crates/air/src/components/inputs/components.rs

@@ -1,6 +1,6 @@
 use crate::components::{InputsClaim, NodeElements};
 use num_traits::One;
-use stwo_prover::constraint_framework::{
+use stwo_constraint_framework::{
     EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry,
 };
 

crates/air/src/components/inputs/table.rs

@@ -1,11 +1,11 @@
 use num_traits::{One, Zero};
 use serde::{Deserialize, Serialize};
-use stwo_prover::core::{
-    backend::simd::{
+use stwo::{
+    core::fields::m31::M31,
+    prover::backend::simd::{
         conversion::{Pack, Unpack},
         m31::{PackedM31, N_LANES},
     },
-    fields::m31::M31,
 };
 
 use crate::components::TraceColumn;

crates/air/src/components/inputs/witness.rs

@@ -2,14 +2,12 @@ use luminair_utils::TraceError;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
 use stwo_air_utils::trace::component_trace::ComponentTrace;
 use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized};
-use stwo_prover::{
-    constraint_framework::{logup::LogupTraceGenerator, Relation},
-    core::backend::simd::{
-        m31::{PackedM31, LOG_N_LANES, N_LANES},
-        qm31::PackedQM31,
-        SimdBackend,
-    },
+use stwo::prover::backend::simd::{
+    m31::{PackedM31, LOG_N_LANES, N_LANES},
+    qm31::PackedQM31,
+    SimdBackend,
 };
+use stwo_constraint_framework::{LogupTraceGenerator, Relation};
 
 use crate::{
     components::{

crates/air/src/components/less_than/component.rs

@@ -1,8 +1,6 @@
 use num_traits::One;
-use stwo_prover::{
-    constraint_framework::{EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry},
-    core::fields::m31::M31,
-};
+use stwo::core::fields::m31::M31;
+use stwo_constraint_framework::{EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry};
 
 use crate::{
     components::{lookups::range_check::RangeCheckLookupElements, LessThanClaim, NodeElements},

crates/air/src/components/less_than/table.rs

@@ -1,11 +1,11 @@
 use num_traits::{One, Zero};
 use serde::{Deserialize, Serialize};
-use stwo_prover::core::{
-    backend::simd::{
+use stwo::{
+    core::fields::m31::M31,
+    prover::backend::simd::{
         conversion::{Pack, Unpack},
         m31::{PackedM31, N_LANES},
     },
-    fields::m31::M31,
 };
 
 use super::witness::N_TRACE_COLUMNS;

crates/air/src/components/less_than/witness.rs

@@ -2,14 +2,12 @@ use luminair_utils::TraceError;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
 use stwo_air_utils::trace::component_trace::ComponentTrace;
 use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized};
-use stwo_prover::{
-    constraint_framework::{logup::LogupTraceGenerator, Relation},
-    core::backend::simd::{
-        m31::{PackedM31, LOG_N_LANES, N_LANES},
-        qm31::PackedQM31,
-        SimdBackend,
-    },
+use stwo::prover::backend::simd::{
+    m31::{PackedM31, LOG_N_LANES, N_LANES},
+    qm31::PackedQM31,
+    SimdBackend,
 };
+use stwo_constraint_framework::{LogupTraceGenerator, Relation};
 
 use crate::{
     components::{

crates/air/src/components/log2/component.rs

@@ -1,6 +1,6 @@
 use crate::components::{lookups::log2::Log2LookupElements, Log2Claim, NodeElements};
 use num_traits::One;
-use stwo_prover::constraint_framework::{
+use stwo_constraint_framework::{
     EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry,
 };
 

crates/air/src/components/log2/table.rs

@@ -1,11 +1,11 @@
 use num_traits::{One, Zero};
 use serde::{Deserialize, Serialize};
-use stwo_prover::core::{
-    backend::simd::{
+use stwo::{
+    core::fields::m31::M31,
+    prover::backend::simd::{
         conversion::{Pack, Unpack},
         m31::{PackedM31, N_LANES},
     },
-    fields::m31::M31,
 };
 
 use super::witness::N_TRACE_COLUMNS;

crates/air/src/components/log2/witness.rs

@@ -2,14 +2,12 @@ use luminair_utils::TraceError;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
 use stwo_air_utils::trace::component_trace::ComponentTrace;
 use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized};
-use stwo_prover::{
-    constraint_framework::{logup::LogupTraceGenerator, Relation},
-    core::backend::simd::{
-        m31::{PackedM31, LOG_N_LANES, N_LANES},
-        qm31::PackedQM31,
-        SimdBackend,
-    },
+use stwo::prover::backend::simd::{
+    m31::{PackedM31, LOG_N_LANES, N_LANES},
+    qm31::PackedQM31,
+    SimdBackend,
 };
+use stwo_constraint_framework::{LogupTraceGenerator, Relation};
 
 use crate::{
     components::{

crates/air/src/components/lookups/exp2/component.rs

@@ -1,4 +1,4 @@
-use stwo_prover::constraint_framework::{
+use stwo_constraint_framework::{
     preprocessed_columns::PreProcessedColumnId, EvalAtRow, FrameworkComponent, FrameworkEval,
     RelationEntry,
 };

crates/air/src/components/lookups/exp2/mod.rs

@@ -1,7 +1,8 @@
 use std::sync::atomic::Ordering;
 
 use serde::{Deserialize, Serialize};
-use stwo_prover::{core::fields::m31::BaseField, relation};
+use stwo::core::fields::m31::BaseField;
+use stwo_constraint_framework::relation;
 
 use crate::{
     components::lookups::exp2::table::{Exp2LookupTraceTable, Exp2LookupTraceTableRow},

crates/air/src/components/lookups/exp2/table.rs

@@ -1,11 +1,11 @@
 use num_traits::Zero;
 use serde::{Deserialize, Serialize};
-use stwo_prover::core::{
-    backend::simd::{
+use stwo::{
+    core::fields::m31::M31,
+    prover::backend::simd::{
         conversion::{Pack, Unpack},
         m31::{PackedM31, N_LANES},
     },
-    fields::m31::M31,
 };
 
 use crate::components::TraceColumn;

crates/air/src/components/lookups/exp2/witness.rs

@@ -3,14 +3,12 @@ use num_traits::One;
 use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator};
 use stwo_air_utils::trace::component_trace::ComponentTrace;
 use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized};
-use stwo_prover::{
-    constraint_framework::{logup::LogupTraceGenerator, Relation},
-    core::backend::simd::{
-        m31::{PackedM31, LOG_N_LANES, N_LANES},
-        qm31::PackedQM31,
-        SimdBackend,
-    },
+use stwo::prover::backend::simd::{
+    m31::{PackedM31, LOG_N_LANES, N_LANES},
+    qm31::PackedQM31,
+    SimdBackend,
 };
+use stwo_constraint_framework::{LogupTraceGenerator, Relation};
 
 use crate::{
     components::{

crates/air/src/components/lookups/log2/component.rs

@@ -1,4 +1,4 @@
-use stwo_prover::constraint_framework::{
+use stwo_constraint_framework::{
     preprocessed_columns::PreProcessedColumnId, EvalAtRow, FrameworkComponent, FrameworkEval,
     RelationEntry,
 };

crates/air/src/components/lookups/log2/mod.rs

@@ -1,7 +1,8 @@
 use std::sync::atomic::Ordering;
 
 use serde::{Deserialize, Serialize};
-use stwo_prover::{core::fields::m31::BaseField, relation};
+use stwo::core::fields::m31::BaseField;
+use stwo_constraint_framework::relation;
 
 use crate::{
     components::lookups::log2::table::{Log2LookupTraceTable, Log2LookupTraceTableRow},
@@ -42,4 +43,4 @@ impl Log2Lookup {
             });
         }
     }
-}
+}

crates/air/src/components/lookups/log2/table.rs

@@ -1,11 +1,11 @@
 use num_traits::Zero;
 use serde::{Deserialize, Serialize};
-use stwo_prover::core::{
-    backend::simd::{
+use stwo::{
+    core::fields::m31::M31,
+    prover::backend::simd::{
         conversion::{Pack, Unpack},
         m31::{PackedM31, N_LANES},
     },
-    fields::m31::M31,
 };
 
 use crate::components::TraceColumn;