Rename AbstractField and AbstractExtensionField (Plonky3#545)

* Rename AbstractField and AbstractExtensionField

* cargo fmt

* Comment update

* Update field/src/field.rs

Co-authored-by: Hamish Ivey-Law <[email protected]>

* Update field.rs

Minor comment fixes.

Update a typo and port @unzvfu's suggestions for `square` and `cube` to `double` as well.

---------

Co-authored-by: Hamish Ivey-Law <[email protected]>

Author: SyxtonPrime

air/src/air.rs

@@ -1,6 +1,6 @@
 use core::ops::{Add, Mul, Sub};
 
-use p3_field::{AbstractExtensionField, AbstractField, ExtensionField, Field};
+use p3_field::{ExtensionField, Field, FieldAlgebra, FieldExtensionAlgebra};
 use p3_matrix::dense::RowMajorMatrix;
 use p3_matrix::Matrix;
 
@@ -29,7 +29,7 @@ pub trait Air<AB: AirBuilder>: BaseAir<AB::F> {
 pub trait AirBuilder: Sized {
     type F: Field;
 
-    type Expr: AbstractField
+    type Expr: FieldAlgebra
         + From<Self::F>
         + Add<Self::Var, Output = Self::Expr>
         + Add<Self::F, Output = Self::Expr>
@@ -130,7 +130,7 @@ pub trait PairBuilder: AirBuilder {
 pub trait ExtensionBuilder: AirBuilder {
     type EF: ExtensionField<Self::F>;
 
-    type ExprEF: AbstractExtensionField<Self::Expr, F = Self::EF>;
+    type ExprEF: FieldExtensionAlgebra<Self::Expr, F = Self::EF>;
 
     type VarEF: Into<Self::ExprEF> + Copy + Send + Sync;
 

air/src/virtual_column.rs

@@ -2,7 +2,7 @@ use alloc::vec;
 use alloc::vec::Vec;
 use core::ops::Mul;
 
-use p3_field::{AbstractField, Field};
+use p3_field::{Field, FieldAlgebra};
 
 /// An affine function over columns in a PAIR.
 #[derive(Clone, Debug)]
@@ -110,7 +110,7 @@ impl<F: Field> VirtualPairCol<F> {
     pub fn apply<Expr, Var>(&self, preprocessed: &[Var], main: &[Var]) -> Expr
     where
         F: Into<Expr>,
-        Expr: AbstractField + Mul<F, Output = Expr>,
+        Expr: FieldAlgebra + Mul<F, Output = Expr>,
         Var: Into<Expr> + Copy,
     {
         let mut result = self.constant.into();

baby-bear/benches/bench_field.rs

@@ -2,7 +2,7 @@ use std::any::type_name;
 
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
 use p3_baby_bear::BabyBear;
-use p3_field::{AbstractField, Field};
+use p3_field::{Field, FieldAlgebra};
 use p3_field_testing::bench_func::{
     benchmark_add_latency, benchmark_add_throughput, benchmark_inv, benchmark_iter_sum,
     benchmark_mul_latency, benchmark_mul_throughput, benchmark_sub_latency,

baby-bear/src/baby_bear.rs

@@ -1,4 +1,4 @@
-use p3_field::{exp_1725656503, exp_u64_by_squaring, AbstractField, Field};
+use p3_field::{exp_1725656503, exp_u64_by_squaring, Field, FieldAlgebra};
 use p3_monty_31::{
     BarrettParameters, BinomialExtensionData, FieldParameters, MontyField31, MontyParameters,
     PackedMontyParameters, TwoAdicData,
@@ -26,7 +26,7 @@ impl BarrettParameters for BabyBearParameters {}
 impl FieldParameters for BabyBearParameters {
     const MONTY_GEN: BabyBear = BabyBear::new(31);
 
-    fn exp_u64_generic<AF: AbstractField>(val: AF, power: u64) -> AF {
+    fn exp_u64_generic<FA: FieldAlgebra>(val: FA, power: u64) -> FA {
         match power {
             1725656503 => exp_1725656503(val), // used to compute x^{1/7}
             _ => exp_u64_by_squaring(val, power),

baby-bear/src/extension.rs

@@ -3,7 +3,7 @@ mod test_quartic_extension {
     use alloc::format;
 
     use p3_field::extension::BinomialExtensionField;
-    use p3_field::{AbstractExtensionField, AbstractField};
+    use p3_field::{FieldAlgebra, FieldExtensionAlgebra};
     use p3_field_testing::{test_field, test_two_adic_extension_field};
 
     use crate::BabyBear;

baby-bear/src/mds.rs

@@ -49,7 +49,7 @@ pub type MdsMatrixBabyBear = MdsMatrixMontyField31<MDSBabyBearData>;
 
 #[cfg(test)]
 mod tests {
-    use p3_field::AbstractField;
+    use p3_field::FieldAlgebra;
     use p3_symmetric::Permutation;
 
     use super::MdsMatrixBabyBear;

baby-bear/src/poseidon2.rs

@@ -15,7 +15,7 @@
 
 use core::ops::Mul;
 
-use p3_field::{AbstractField, Field, PrimeField32};
+use p3_field::{Field, FieldAlgebra, PrimeField32};
 use p3_monty_31::{
     GenericPoseidon2LinearLayersMonty31, InternalLayerBaseParameters, InternalLayerParameters,
     MontyField31, Poseidon2ExternalLayerMonty31, Poseidon2InternalLayerMonty31,
@@ -50,7 +50,7 @@ pub type Poseidon2BabyBear<const WIDTH: usize> = Poseidon2<
 
 /// An implementation of the the matrix multiplications in the internal and external layers of Poseidon2.
 ///
-/// This can act on [AF; WIDTH] for any AbstractField which implements multiplication by BabyBear field elements.
+/// This can act on [FA; WIDTH] for any AbstractField which implements multiplication by BabyBear field elements.
 /// If you have either `[BabyBear::Packing; WIDTH]` or `[BabyBear; WIDTH]` it will be much faster
 /// to use `Poseidon2BabyBear<WIDTH>` instead of building a Poseidon2 permutation using this.
 pub type GenericPoseidon2LinearLayersBabyBear =
@@ -152,11 +152,11 @@ impl InternalLayerBaseParameters<BabyBearParameters, 16> for BabyBearInternalLay
         state[15] = sum - state[15];
     }
 
-    fn generic_internal_linear_layer<AF>(state: &mut [AF; 16])
+    fn generic_internal_linear_layer<FA>(state: &mut [FA; 16])
     where
-        AF: AbstractField + Mul<BabyBear, Output = AF>,
+        FA: FieldAlgebra + Mul<BabyBear, Output = FA>,
     {
-        let part_sum: AF = state[1..].iter().cloned().sum();
+        let part_sum: FA = state[1..].iter().cloned().sum();
         let full_sum = part_sum.clone() + state[0].clone();
 
         // The first three diagonal elements are -2, 1, 2 so we do something custom.
@@ -230,11 +230,11 @@ impl InternalLayerBaseParameters<BabyBearParameters, 24> for BabyBearInternalLay
         state[23] = sum - state[23];
     }
 
-    fn generic_internal_linear_layer<AF>(state: &mut [AF; 24])
+    fn generic_internal_linear_layer<FA>(state: &mut [FA; 24])
     where
-        AF: AbstractField + Mul<BabyBear, Output = AF>,
+        FA: FieldAlgebra + Mul<BabyBear, Output = FA>,
     {
-        let part_sum: AF = state[1..].iter().cloned().sum();
+        let part_sum: FA = state[1..].iter().cloned().sum();
         let full_sum = part_sum.clone() + state[0].clone();
 
         // The first three diagonal elements are -2, 1, 2 so we do something custom.
@@ -260,7 +260,7 @@ impl InternalLayerParameters<BabyBearParameters, 24> for BabyBearInternalLayerPa
 
 #[cfg(test)]
 mod tests {
-    use p3_field::AbstractField;
+    use p3_field::FieldAlgebra;
     use p3_symmetric::Permutation;
     use rand::{Rng, SeedableRng};
     use rand_xoshiro::Xoroshiro128Plus;

baby-bear/src/x86_64_avx2/poseidon2.rs

@@ -112,7 +112,7 @@ impl InternalLayerParametersAVX2<BabyBearParameters, 24> for BabyBearInternalLay
 
 #[cfg(test)]
 mod tests {
-    use p3_field::AbstractField;
+    use p3_field::FieldAlgebra;
     use p3_symmetric::Permutation;
     use rand::Rng;
 

bn254-fr/src/lib.rs

@@ -12,7 +12,7 @@ use ff::{Field as FFField, PrimeField as FFPrimeField};
 pub use halo2curves::bn256::Fr as FFBn254Fr;
 use halo2curves::serde::SerdeObject;
 use num_bigint::BigUint;
-use p3_field::{AbstractField, Field, Packable, PrimeField, TwoAdicField};
+use p3_field::{Field, FieldAlgebra, Packable, PrimeField, TwoAdicField};
 pub use poseidon2::Poseidon2Bn254;
 use rand::distributions::{Distribution, Standard};
 use rand::Rng;
@@ -89,7 +89,7 @@ impl Debug for Bn254Fr {
     }
 }
 
-impl AbstractField for Bn254Fr {
+impl FieldAlgebra for Bn254Fr {
     type F = Self;
 
     const ZERO: Self = Self::new(FFBn254Fr::ZERO);

bn254-fr/src/poseidon2.rs

@@ -4,7 +4,7 @@
 
 use std::sync::OnceLock;
 
-use p3_field::AbstractField;
+use p3_field::FieldAlgebra;
 use p3_poseidon2::{
     add_rc_and_sbox_generic, external_initial_permute_state, external_terminal_permute_state,
     internal_permute_state, matmul_internal, ExternalLayer, ExternalLayerConstants,

challenger/src/duplex_challenger.rs

@@ -160,7 +160,7 @@ where
 mod tests {
     use core::iter;
 
-    use p3_field::AbstractField;
+    use p3_field::FieldAlgebra;
     use p3_goldilocks::Goldilocks;
     use p3_symmetric::Permutation;
 

challenger/src/hash_challenger.rs

@@ -83,7 +83,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use p3_field::AbstractField;
+    use p3_field::FieldAlgebra;
     use p3_goldilocks::Goldilocks;
 
     use super::*;

challenger/src/lib.rs

@@ -17,7 +17,7 @@ pub use duplex_challenger::*;
 pub use grinding_challenger::*;
 pub use hash_challenger::*;
 pub use multi_field_challenger::*;
-use p3_field::{AbstractExtensionField, Field};
+use p3_field::{Field, FieldExtensionAlgebra};
 pub use serializing_challenger::*;
 
 pub trait CanObserve<T> {
@@ -52,11 +52,11 @@ pub trait CanSampleBits<T> {
 pub trait FieldChallenger<F: Field>:
     CanObserve<F> + CanSample<F> + CanSampleBits<usize> + Sync
 {
-    fn observe_ext_element<EF: AbstractExtensionField<F>>(&mut self, ext: EF) {
+    fn observe_ext_element<EF: FieldExtensionAlgebra<F>>(&mut self, ext: EF) {
         self.observe_slice(ext.as_base_slice());
     }
 
-    fn sample_ext_element<EF: AbstractExtensionField<F>>(&mut self) -> EF {
+    fn sample_ext_element<EF: FieldExtensionAlgebra<F>>(&mut self) -> EF {
         let vec = self.sample_vec(EF::D);
         EF::from_base_slice(&vec)
     }
@@ -115,12 +115,12 @@ where
     C: FieldChallenger<F>,
 {
     #[inline(always)]
-    fn observe_ext_element<EF: AbstractExtensionField<F>>(&mut self, ext: EF) {
+    fn observe_ext_element<EF: FieldExtensionAlgebra<F>>(&mut self, ext: EF) {
         (**self).observe_ext_element(ext)
     }
 
     #[inline(always)]
-    fn sample_ext_element<EF: AbstractExtensionField<F>>(&mut self) -> EF {
+    fn sample_ext_element<EF: FieldExtensionAlgebra<F>>(&mut self) -> EF {
         (**self).sample_ext_element()
     }
 }

circle/src/deep_quotient.rs

@@ -124,7 +124,7 @@ mod tests {
     use alloc::vec;
 
     use p3_field::extension::BinomialExtensionField;
-    use p3_field::AbstractField;
+    use p3_field::FieldAlgebra;
     use p3_matrix::dense::RowMajorMatrix;
     use p3_mersenne_31::Mersenne31;
     use rand::{random, thread_rng};

circle/src/domain.rs

@@ -233,7 +233,7 @@ mod tests {
 
     use hashbrown::HashSet;
     use itertools::izip;
-    use p3_field::{batch_multiplicative_inverse, AbstractField};
+    use p3_field::{batch_multiplicative_inverse, FieldAlgebra};
     use p3_mersenne_31::Mersenne31;
     use rand::thread_rng;
 

dft/src/naive.rs

@@ -36,7 +36,7 @@ mod tests {
     use alloc::vec;
 
     use p3_baby_bear::BabyBear;
-    use p3_field::{AbstractField, Field};
+    use p3_field::{Field, FieldAlgebra};
     use p3_goldilocks::Goldilocks;
     use p3_matrix::dense::RowMajorMatrix;
     use rand::thread_rng;