move staticFor to the inner repo, not helpers/ for unblocking nimble install (#216)

2023-02-07 13:11:44 +01:00 · 2023-02-07 13:11:44 +01:00 · 7c5421ffdc
parent a11fca9c60
commit 7c5421ffdc
32 changed files with 19 additions and 34 deletions
--- a/benchmarks/bench_ec_g1.nim
+++ b/benchmarks/bench_ec_g1.nim
@ -14,7 +14,6 @@ import
    ec_shortweierstrass_projective,
    ec_shortweierstrass_jacobian],
  # Helpers
-  ../helpers/static_for,
  ./bench_elliptic_template

 # ############################################################
--- a/benchmarks/bench_ec_g1_batch.nim
+++ b/benchmarks/bench_ec_g1_batch.nim
@ -17,7 +17,7 @@ import
    ec_shortweierstrass_batch_ops_parallel],
  ../constantine/platforms/threadpool/threadpool,
  # Helpers
-  ../helpers/[static_for, prng_unsafe],
+  ../helpers/prng_unsafe,
  ./bench_elliptic_template,
  ./bench_blueprint

--- a/benchmarks/bench_ec_g2.nim
+++ b/benchmarks/bench_ec_g2.nim
@ -15,7 +15,6 @@ import
    ec_shortweierstrass_projective,
    ec_shortweierstrass_jacobian],
  # Helpers
-  ../helpers/static_for,
  ./bench_elliptic_template,
  # Standard library
  std/strutils
--- a/benchmarks/bench_fields_template.nim
+++ b/benchmarks/bench_fields_template.nim
@ -23,7 +23,7 @@ import
  ../helpers/prng_unsafe,
  ./bench_blueprint

-export notes
+export notes, abstractions
 proc separator*() = separator(165)
 proc smallSeparator*() = separator(8)

--- a/benchmarks/bench_fp.nim
+++ b/benchmarks/bench_fp.nim
@ -13,7 +13,6 @@ import
  ../constantine/math/io/io_bigints,
  ../constantine/math/constants/zoo_square_roots,
  # Helpers
-  ../helpers/static_for,
  ./bench_fields_template

 # ############################################################
--- a/benchmarks/bench_fp12.nim
+++ b/benchmarks/bench_fp12.nim
@ -11,7 +11,6 @@ import
  ../constantine/math/config/curves,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_fields_template

 # ############################################################
--- a/benchmarks/bench_fp2.nim
+++ b/benchmarks/bench_fp2.nim
@ -11,7 +11,6 @@ import
  ../constantine/math/config/curves,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_fields_template

 # ############################################################
--- a/benchmarks/bench_fp4.nim
+++ b/benchmarks/bench_fp4.nim
@ -11,7 +11,6 @@ import
  ../constantine/math/config/curves,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_fields_template

 # ############################################################
--- a/benchmarks/bench_fp6.nim
+++ b/benchmarks/bench_fp6.nim
@ -11,7 +11,6 @@ import
  ../constantine/math/config/curves,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_fields_template

 # ############################################################
--- a/benchmarks/bench_fp_double_precision.nim
+++ b/benchmarks/bench_fp_double_precision.nim
@ -19,7 +19,7 @@ import
  ../constantine/math/arithmetic,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/[prng_unsafe, static_for],
+  ../helpers/prng_unsafe,
  ./platforms,
  # Standard library
  std/[monotimes, times, strformat, strutils]
@ -218,7 +218,7 @@ proc reduce2x*(T: typedesc, iters: int) =
    r.redc2x(t)

 proc reduce2xViaDivision*(T: typedesc, iters: int) =
-  
+
  const bits2x = 2 * T.C.getCurveBitWidth()
  var r: matchingBigInt(T.C)
  let t = rng.random_unsafe(BigInt[bits2x])
--- a/benchmarks/bench_pairing_bls12_377.nim
+++ b/benchmarks/bench_pairing_bls12_377.nim
@ -12,7 +12,6 @@ import
  ../constantine/math/arithmetic,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_pairing_template

 # ############################################################
--- a/benchmarks/bench_pairing_bls12_381.nim
+++ b/benchmarks/bench_pairing_bls12_381.nim
@ -12,7 +12,6 @@ import
  ../constantine/math/arithmetic,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_pairing_template

 # ############################################################
--- a/benchmarks/bench_pairing_bn254_nogami.nim
+++ b/benchmarks/bench_pairing_bn254_nogami.nim
@ -12,7 +12,6 @@ import
  ../constantine/math/arithmetic,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_pairing_template

 # ############################################################
--- a/benchmarks/bench_pairing_bn254_snarks.nim
+++ b/benchmarks/bench_pairing_bn254_snarks.nim
@ -12,7 +12,6 @@ import
  ../constantine/math/arithmetic,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_pairing_template

 # ############################################################
--- a/benchmarks/bench_pairing_template.nim
+++ b/benchmarks/bench_pairing_template.nim
@ -31,6 +31,7 @@ import
  ../helpers/prng_unsafe,
  ./bench_blueprint

+export abstractions
 export zoo_pairings # generic sandwich https://github.com/nim-lang/Nim/issues/11225
 export notes
 proc separator*() = separator(132)
--- a/benchmarks/bench_summary_bls12_377.nim
+++ b/benchmarks/bench_summary_bls12_377.nim
@ -12,7 +12,6 @@ import
  ../constantine/math/arithmetic,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_summary_template

 # ############################################################
--- a/benchmarks/bench_summary_bls12_381.nim
+++ b/benchmarks/bench_summary_bls12_381.nim
@ -12,7 +12,6 @@ import
  ../constantine/math/arithmetic,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_summary_template

 # ############################################################
--- a/benchmarks/bench_summary_bn254_nogami.nim
+++ b/benchmarks/bench_summary_bn254_nogami.nim
@ -12,7 +12,6 @@ import
  ../constantine/math/arithmetic,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_summary_template

 # ############################################################
--- a/benchmarks/bench_summary_bn254_snarks.nim
+++ b/benchmarks/bench_summary_bn254_snarks.nim
@ -12,7 +12,6 @@ import
  ../constantine/math/arithmetic,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_summary_template

 # ############################################################
--- a/benchmarks/bench_summary_pasta.nim
+++ b/benchmarks/bench_summary_pasta.nim
@ -12,7 +12,6 @@ import
  ../constantine/math/arithmetic,
  ../constantine/math/extension_fields,
  # Helpers
-  ../helpers/static_for,
  ./bench_summary_template

 # ############################################################
--- a/benchmarks/bench_summary_template.nim
+++ b/benchmarks/bench_summary_template.nim
@ -32,7 +32,7 @@ import
  ../constantine/hashes,
  ../constantine/hash_to_curve/hash_to_curve,
  # Helpers
-  ../helpers/[prng_unsafe, static_for],
+  ../helpers/prng_unsafe,
  ./bench_blueprint

 export
--- a/constantine/platforms/primitives.nim
+++ b/constantine/platforms/primitives.nim
@ -18,7 +18,7 @@ import
    extended_precision
  ],
  ./bithacks,
-  ../../helpers/static_for
+  ./static_for

 export
  ct_types,
--- a/constantine/platforms/static_for.nim
+++ b/constantine/platforms/static_for.nim
--- a/tests/gpu/t_nvidia_fp.nim
+++ b/tests/gpu/t_nvidia_fp.nim
@ -7,7 +7,7 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.


-import 
+import
  # Standard library
  std/[unittest, times],
  # Internal
@ -17,7 +17,7 @@ import
  ../../constantine/math/arithmetic,
  ../../constantine/math_gpu/fields_nvidia,
  # Test utilities
-  ../../helpers/[prng_unsafe, static_for]
+  ../../helpers/prng_unsafe

 var rng: RngState
 let seed = uint32(getTime().toUnix() and (1'i64 shl 32 - 1)) # unixTime mod 2^32
@ -87,7 +87,7 @@ proc t_field_add(curve: static Curve) =
    let b = rng.random_long01Seq(Fp[curve])

    var rCPU, rGPU_32, rGPU_64: Fp[curve]
-    
+
    rCPU.sum(a, b)
    fpAdd32.exec(rGPU_32, a, b)
    fpAdd64.exec(rGPU_64, a, b)
@ -101,7 +101,7 @@ proc t_field_add(curve: static Curve) =
    let b = rng.random_long01Seq(Fr[curve])

    var rCPU, rGPU_32, rGPU_64: Fr[curve]
-    
+
    rCPU.sum(a, b)
    frAdd32.exec(rGPU_32, a, b)
    frAdd64.exec(rGPU_64, a, b)
--- a/tests/math/t_fp12_exponentiation.nim
+++ b/tests/math/t_fp12_exponentiation.nim
@ -16,7 +16,7 @@ import
  ../../constantine/math/config/curves,
  ../../constantine/math/io/io_extfields,
  # Test utilities
-  ../../helpers/[prng_unsafe, static_for]
+  ../../helpers/prng_unsafe

 const
  Iters = 2
--- a/tests/math/t_fp2_sqrt.nim
+++ b/tests/math/t_fp2_sqrt.nim
@ -16,7 +16,7 @@ import
  ../../constantine/math/config/curves,
  ../../constantine/math/io/io_extfields,
  # Test utilities
-  ../../helpers/[prng_unsafe, static_for]
+  ../../helpers/prng_unsafe

 const
  Iters = 8
--- a/tests/math/t_fp_tower_frobenius_template.nim
+++ b/tests/math/t_fp_tower_frobenius_template.nim
@ -23,7 +23,7 @@ import
  ../../constantine/math/arithmetic,
  ../../constantine/math/isogenies/frobenius,
  # Test utilities
-  ../../helpers/[prng_unsafe, static_for]
+  ../../helpers/prng_unsafe

 export unittest # Generic sandwich

--- a/tests/math/t_fp_tower_template.nim
+++ b/tests/math/t_fp_tower_template.nim
@ -23,7 +23,7 @@ import
  ../../constantine/math/arithmetic,
  ../../constantine/math/io/io_extfields,
  # Test utilities
-  ../../helpers/[prng_unsafe, static_for]
+  ../../helpers/prng_unsafe

 export unittest # Generic sandwich

--- a/tests/math/t_pairing_bls12_377_line_functions.nim
+++ b/tests/math/t_pairing_bls12_377_line_functions.nim
@ -21,7 +21,7 @@ import
    ec_scalar_mul],
  ../../constantine/math/pairings/lines_eval,
  # Test utilities
-  ../../helpers/[prng_unsafe, static_for]
+  ../../helpers/prng_unsafe

 const
  Iters = 4
--- a/tests/math/t_pairing_bls12_381_line_functions.nim
+++ b/tests/math/t_pairing_bls12_381_line_functions.nim
@ -20,7 +20,7 @@ import
    ec_shortweierstrass_projective],
  ../../constantine/math/pairings/lines_eval,
  # Test utilities
-  ../../helpers/[prng_unsafe, static_for]
+  ../../helpers/prng_unsafe

 const
  Iters = 4
--- a/tests/math/t_pairing_cyclotomic_subgroup.nim
+++ b/tests/math/t_pairing_cyclotomic_subgroup.nim
@ -18,7 +18,7 @@ import
  ../../constantine/math/pairings/cyclotomic_subgroups,
  ../../constantine/math/isogenies/frobenius,
  # Test utilities
-  ../../helpers/[prng_unsafe, static_for]
+  ../../helpers/prng_unsafe

 const
  Iters = 4
--- a/tests/math/t_pairing_mul_fp12_by_lines.nim
+++ b/tests/math/t_pairing_mul_fp12_by_lines.nim
@ -17,7 +17,7 @@ import
  ../../constantine/math/io/io_extfields,
  ../../constantine/math/pairings/lines_eval,
  # Test utilities
-  ../../helpers/[prng_unsafe, static_for]
+  ../../helpers/prng_unsafe

 const
  Iters = 8