refactor(math/config/curves): math/config/curves moved out of math to…

… a 'named' folder + use project-root path + prepare for using named fields and not just named curves for STARK primes (#400)
mratsim · Jun 25, 2024 · 0718fce · 0718fce
1 parent 5290d6b
commit 0718fce
Show file tree

Hide file tree

Showing 429 changed files with 1,670 additions and 1,694 deletions.
diff --git a/benchmarks-threadpool/black_scholes/threadpool_black_scholes.nim b/benchmarks-threadpool/black_scholes/threadpool_black_scholes.nim
@@ -21,7 +21,7 @@ import
   # Stdlib
   system/ansi_c, std/[strformat, os, strutils, math, cpuinfo, streams, strscans],
   # Constantine
-  ../../constantine/threadpool
+  constantine/threadpool
 
 when defined(linux):
   # bench

diff --git a/benchmarks-threadpool/bouncing_producer_consumer/threadpool_bpc.nim b/benchmarks-threadpool/bouncing_producer_consumer/threadpool_bpc.nim
@@ -2,7 +2,7 @@ import
   # STD lib
   std/[os, strutils, cpuinfo, strformat, math],
   # Library
-  ../../constantine/threadpool,
+  constantine/threadpool,
   # bench
   ../wtime, ../resources
 

diff --git a/benchmarks-threadpool/dfs/threadpool_dfs.nim b/benchmarks-threadpool/dfs/threadpool_dfs.nim
@@ -9,7 +9,7 @@ import
   # Stdlib
   std/[strformat, os, strutils, cpuinfo],
   # Library
-  ../../constantine/threadpool
+  constantine/threadpool
 
 when not defined(windows):
   # bench

diff --git a/benchmarks-threadpool/fibonacci/threadpool_fib.nim b/benchmarks-threadpool/fibonacci/threadpool_fib.nim
@@ -2,7 +2,7 @@ import
   # STD lib
   std/[os, strutils, cpuinfo, strformat, math],
   # Library
-  ../../constantine/threadpool
+  constantine/threadpool
 
 when not defined(windows):
   # bench

diff --git a/benchmarks-threadpool/heat/threadpool_heat.nim b/benchmarks-threadpool/heat/threadpool_heat.nim
@@ -35,7 +35,7 @@ import
   # Stdlib
   system/ansi_c, std/[strformat, os, strutils, math, cpuinfo],
   # Library
-  ../../constantine/threadpool
+  constantine/threadpool
 when not defined(windows):
   # bench
   import ../wtime, ../resources

diff --git a/benchmarks-threadpool/histogram_2D/threadpool_histogram.nim b/benchmarks-threadpool/histogram_2D/threadpool_histogram.nim
@@ -9,7 +9,7 @@ import
   # Stdlib
   system/ansi_c, std/[os, strutils, cpuinfo, math, strformat, locks],
   # Constantine
-  ../../constantine/threadpool
+  constantine/threadpool
 
 when not defined(windows):
   # bench

diff --git a/benchmarks-threadpool/logsumexp/threadpool_logsumexp.nim b/benchmarks-threadpool/logsumexp/threadpool_logsumexp.nim
@@ -9,7 +9,7 @@ import
   # Stdlib
   system/ansi_c, std/[strformat, os, strutils, cpuinfo, math, random, locks],
   # Constantine
-  ../../constantine/threadpool
+  constantine/threadpool
 
 when not defined(windows):
   # bench
@@ -399,4 +399,4 @@ proc main() =
 
   tp.shutdown()
 
-main()
+main()
diff --git a/benchmarks-threadpool/matmul_cache_oblivious/threadpool_matmul_co.nim b/benchmarks-threadpool/matmul_cache_oblivious/threadpool_matmul_co.nim
@@ -19,7 +19,7 @@ import
   # Stdlib
   system/ansi_c, std/[strformat, os, strutils, math, cpuinfo],
   # Library
-  ../../constantine/threadpool,
+  constantine/threadpool,
   # bench
   ../wtime, ../resources
 

diff --git a/benchmarks-threadpool/matrix_transposition/threadpool_transposes.nim b/benchmarks-threadpool/matrix_transposition/threadpool_transposes.nim
@@ -12,7 +12,7 @@ import
   # Stdlib
   system/ansi_c, std/[strformat, os, strutils, math, cpuinfo],
   # Constantine
-  ../../constantine/threadpool
+  constantine/threadpool
 
 when not defined(windows):
   # bench
@@ -316,4 +316,4 @@ proc main() =
   wv_free(bufOut)
   wv_free(bufIn)
 
-main()
+main()
diff --git a/benchmarks-threadpool/nqueens/threadpool_nqueens.nim b/benchmarks-threadpool/nqueens/threadpool_nqueens.nim
@@ -39,7 +39,7 @@ import
   # Stdlib
   system/ansi_c, std/[strformat, os, strutils, cpuinfo],
   # library
-  ../../constantine/threadpool
+  constantine/threadpool
 
 when not defined(windows):
   # bench

diff --git a/benchmarks-threadpool/single_task_producer/threadpool_spc.nim b/benchmarks-threadpool/single_task_producer/threadpool_spc.nim
@@ -2,7 +2,7 @@ import
   # STD lib
   system/ansi_c, std/[os, strutils, cpuinfo, strformat, math],
   # Library
-  ../../constantine/threadpool,
+  constantine/threadpool,
   # bench
   ../wtime, ../resources
 

diff --git a/benchmarks/bench_blueprint.nim b/benchmarks/bench_blueprint.nim
@@ -14,9 +14,9 @@
 
 import
   # Internal
-  ../constantine/platforms/abstractions,
+  constantine/platforms/abstractions,
   # Helpers
-  ../helpers/prng_unsafe,
+  helpers/prng_unsafe,
   ./platforms,
   # Standard library
   std/[monotimes, times, strformat, strutils, macros]

diff --git a/benchmarks/bench_ec_g1.nim b/benchmarks/bench_ec_g1.nim
@@ -8,9 +8,9 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/elliptic/[
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/elliptic/[
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian,
     ec_shortweierstrass_jacobian_extended],

diff --git a/benchmarks/bench_ec_g1_batch.nim b/benchmarks/bench_ec_g1_batch.nim
@@ -8,9 +8,9 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/elliptic/[
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/elliptic/[
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian,
     ec_shortweierstrass_jacobian_extended],

diff --git a/benchmarks/bench_ec_g1_scalar_mul.nim b/benchmarks/bench_ec_g1_scalar_mul.nim
@@ -8,9 +8,9 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/elliptic/[
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/elliptic/[
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian],
   # Helpers

diff --git a/benchmarks/bench_ec_g2.nim b/benchmarks/bench_ec_g2.nim
@@ -8,10 +8,10 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/extension_fields,
-  ../constantine/math/elliptic/[
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/extension_fields,
+  constantine/math/elliptic/[
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian,
     ec_shortweierstrass_jacobian_extended],

diff --git a/benchmarks/bench_ec_g2_scalar_mul.nim b/benchmarks/bench_ec_g2_scalar_mul.nim
@@ -8,10 +8,10 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/extension_fields,
-  ../constantine/math/elliptic/[
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/extension_fields,
+  constantine/math/elliptic/[
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian],
   # Helpers

diff --git a/benchmarks/bench_ec_msm_bandersnatch.nim b/benchmarks/bench_ec_msm_bandersnatch.nim
@@ -8,11 +8,11 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/elliptic/ec_twistededwards_projective,
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/elliptic/ec_twistededwards_projective,
   # Helpers
-  ../helpers/prng_unsafe,
+  helpers/prng_unsafe,
   ./bench_elliptic_parallel_template
 
 # ############################################################

diff --git a/benchmarks/bench_ec_msm_bls12_381_g1.nim b/benchmarks/bench_ec_msm_bls12_381_g1.nim
@@ -8,13 +8,13 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/elliptic/[
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/elliptic/[
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian],
   # Helpers
-  ../helpers/prng_unsafe,
+  helpers/prng_unsafe,
   ./bench_elliptic_parallel_template
 
 # ############################################################

diff --git a/benchmarks/bench_ec_msm_bls12_381_g2.nim b/benchmarks/bench_ec_msm_bls12_381_g2.nim
@@ -8,13 +8,13 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/extension_fields,
-  ../constantine/math/elliptic/[
+  constantine/named/algebra,
+  constantine/math/extension_fields,
+  constantine/math/elliptic/[
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian],
   # Helpers
-  ../helpers/prng_unsafe,
+  helpers/prng_unsafe,
   ./bench_elliptic_parallel_template
 
 # ############################################################

diff --git a/benchmarks/bench_ec_msm_bn254_snarks_g1.nim b/benchmarks/bench_ec_msm_bn254_snarks_g1.nim
@@ -8,9 +8,9 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/elliptic/[
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/elliptic/[
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian],
   # Helpers

diff --git a/benchmarks/bench_ec_msm_pasta.nim b/benchmarks/bench_ec_msm_pasta.nim
@@ -8,13 +8,13 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/elliptic/[
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/elliptic/[
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian],
   # Helpers
-  ../helpers/prng_unsafe,
+  helpers/prng_unsafe,
   ./bench_elliptic_parallel_template
 
 # ############################################################

diff --git a/benchmarks/bench_elliptic_parallel_template.nim b/benchmarks/bench_elliptic_parallel_template.nim
@@ -8,9 +8,9 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/elliptic/[
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/elliptic/[
     ec_shortweierstrass_affine,
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian,
@@ -19,11 +19,11 @@ import
     ec_multi_scalar_mul,
     ec_scalar_mul, ec_scalar_mul_vartime,
     ec_multi_scalar_mul_parallel],
-  ../constantine/math/constants/zoo_subgroups,
+  constantine/named/zoo_subgroups,
   # Threadpool
-  ../constantine/threadpool/[threadpool, partitioners],
+  constantine/threadpool/[threadpool, partitioners],
   # Helpers
-  ../helpers/prng_unsafe,
+  helpers/prng_unsafe,
   ./bench_elliptic_template,
   ./bench_blueprint
 

diff --git a/benchmarks/bench_elliptic_template.nim b/benchmarks/bench_elliptic_template.nim
@@ -14,24 +14,24 @@
 
 import
   # Internals
-  ../constantine/platforms/abstractions,
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/io/io_bigints,
-  ../constantine/math/elliptic/[
+  constantine/platforms/abstractions,
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/io/io_bigints,
+  constantine/math/elliptic/[
     ec_shortweierstrass_affine,
     ec_shortweierstrass_projective,
     ec_shortweierstrass_jacobian,
     ec_shortweierstrass_jacobian_extended,
     ec_shortweierstrass_batch_ops,
     ec_scalar_mul, ec_endomorphism_accel],
-    ../constantine/math/constants/zoo_subgroups,
+    constantine/named/zoo_subgroups,
   # Helpers
-  ../helpers/prng_unsafe,
+  helpers/prng_unsafe,
   ./platforms,
   ./bench_blueprint,
   # Reference unsafe scalar multiplication
-  ../constantine/math/elliptic/ec_scalar_mul_vartime
+  constantine/math/elliptic/ec_scalar_mul_vartime
 
 export notes
 export abstractions # generic sandwich on SecretBool and SecretBool in Jacobian sum

diff --git a/benchmarks/bench_eth_bls_signatures.nim b/benchmarks/bench_eth_bls_signatures.nim
@@ -8,15 +8,15 @@
 
 import
   # Internals
-  ../constantine/[
+  constantine/[
     ethereum_bls_signatures_parallel,
     ethereum_eip2333_bls12381_key_derivation],
-  ../constantine/math/arithmetic,
-  ../constantine/threadpool/threadpool,
+  constantine/math/arithmetic,
+  constantine/threadpool/threadpool,
   # Std
   std/[os, cpuinfo],
   # Helpers
-  ../helpers/prng_unsafe,
+  helpers/prng_unsafe,
   ./bench_blueprint
 
 proc separator*() = separator(180)

diff --git a/benchmarks/bench_eth_eip2537_subgroup_checks_impact.nim b/benchmarks/bench_eth_eip2537_subgroup_checks_impact.nim
@@ -8,10 +8,10 @@
 
 import
   # Internals
-  ../constantine/math/config/curves,
-  ../constantine/math/arithmetic,
-  ../constantine/math/extension_fields,
-  ../constantine/math/elliptic/ec_shortweierstrass_jacobian,
+  constantine/named/algebra,
+  constantine/math/arithmetic,
+  constantine/math/extension_fields,
+  constantine/math/elliptic/ec_shortweierstrass_jacobian,
   # Helpers
   ./bench_elliptic_template
 

diff --git a/benchmarks/bench_eth_eip4844_kzg.nim b/benchmarks/bench_eth_eip4844_kzg.nim
@@ -8,14 +8,14 @@
 
 import
   # Internals
-  ../constantine/ethereum_eip4844_kzg_parallel,
-  ../constantine/math/io/io_fields,
-  ../constantine/math/config/[curves, type_ff],
-  ../constantine/threadpool/threadpool,
-  ../constantine/csprngs/sysrand,
-  ../constantine/platforms/primitives,
+  constantine/ethereum_eip4844_kzg_parallel,
+  constantine/named/algebra,
+  constantine/math/io/io_fields,
+  constantine/threadpool/threadpool,
+  constantine/csprngs/sysrand,
+  constantine/platforms/primitives,
   # Helpers
-  ../helpers/prng_unsafe,
+  helpers/prng_unsafe,
   ./bench_blueprint,
   # Standard library
   std/[os, strutils]