Merge pull request #2057 from vneiger/fix_flint_test_clear

flint_test_clear
flintlib · Aug 27, 2024 · 042e378 · 042e378
2 parents 338df24 + cdc62e1
commit 042e378
Show file tree

Hide file tree

Showing 111 changed files with 140 additions and 134 deletions.
diff --git a/examples/fq_poly.c b/examples/fq_poly.c
@@ -158,7 +158,7 @@ int main(void)
         fmpz_clear(p);
     }
 
-    FLINT_TEST_CLEANUP(state);
+    FLINT_TEST_CLEAR(state);
 
     return 0;
 }

diff --git a/examples/radix.c b/examples/radix.c
@@ -122,7 +122,7 @@ int main(void)
     flint_free(b);
     fmpz_mod_ctx_clear(ctx);
 
-    FLINT_TEST_CLEANUP(state);
+    FLINT_TEST_CLEAR(state);
 
     return 0;
 }
diff --git a/src/aprcl/profile/p-is_prime_aprcl.c b/src/aprcl/profile/p-is_prime_aprcl.c
@@ -760,5 +760,7 @@ int main(void)
         flint_free(ns);
     }
 
+    FLINT_TEST_CLEAR(state)
+
     return 0;
 }
diff --git a/src/aprcl/profile/p-is_prime_aprcl_big.c b/src/aprcl/profile/p-is_prime_aprcl_big.c
@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "flint.h"
 #include "profiler.h"
 #include "fmpz.h"
 #include "aprcl.h"
@@ -419,5 +420,7 @@ int main(void)
         fmpz_clear(n);
     }
 
+    FLINT_TEST_CLEAR(state)
+
     return 0;
 }
diff --git a/src/fft/profile/p-mul_mfa_truncate_sqrt2.c b/src/fft/profile/p-mul_mfa_truncate_sqrt2.c
@@ -55,7 +55,7 @@ main(void)
        flint_free(i1);
     }
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 
     flint_printf("done\n");
     return 0;

diff --git a/src/fft/profile/p-mul_truncate_sqrt2.c b/src/fft/profile/p-mul_truncate_sqrt2.c
@@ -55,7 +55,7 @@ main(void)
        flint_free(i1);
     }
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 
     flint_printf("done\n");
     return 0;

diff --git a/src/fft/tune/tune-fft.c b/src/fft/tune/tune-fft.c
@@ -169,8 +169,9 @@ main(void)
 
     flint_printf("#define FFT_MULMOD_2EXPP1_CUTOFF %wd\n\n", ((mp_limb_t) 1 << best_d)*best_w/(2*FLINT_BITS));
 
-    flint_rand_clear(state);
-
     flint_printf("#endif\n");
+
+    FLINT_TEST_CLEAR(state);
+
     return 0;
 }
diff --git a/src/flint.h.in b/src/flint.h.in
@@ -351,7 +351,7 @@ FLINT_INLINE ulong n_randint(flint_rand_t state, ulong limit)
    FLINT_GC_INIT(); \
    flint_rand_init(xxx)
 
-#define FLINT_TEST_CLEANUP(xxx) \
+#define FLINT_TEST_CLEAR(xxx) \
    flint_rand_clear(xxx); \
    flint_cleanup_master();
 

diff --git a/src/fmpz/profile/p-addmul.c b/src/fmpz/profile/p-addmul.c
@@ -77,7 +77,7 @@ sample_new(void * arg, ulong count)
     _fmpz_vec_clear(res, ntests);
     _fmpz_vec_clear(a, ntests);
     _fmpz_vec_clear(b, ntests);
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void
@@ -111,7 +111,7 @@ sample_old(void * arg, ulong count)
     _fmpz_vec_clear(res, ntests);
     _fmpz_vec_clear(a, ntests);
     _fmpz_vec_clear(b, ntests);
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 slong sizes[] = { 10, 30, 60, 62, 64, 66, 80, 128, 160, 256, 512, 1024, 4096, 0 };

diff --git a/src/fmpz/profile/p-aors_ui.c b/src/fmpz/profile/p-aors_ui.c
@@ -439,7 +439,7 @@ sample_add_new(void * arg, ulong count)
     _fmpz_vec_clear(res, ntests);
     _fmpz_vec_clear(a, ntests);
     flint_free(b);
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void
@@ -474,7 +474,7 @@ sample_add_old(void * arg, ulong count)
     _fmpz_vec_clear(res, ntests);
     _fmpz_vec_clear(a, ntests);
     flint_free(b);
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void
@@ -509,7 +509,7 @@ sample_sub_new(void * arg, ulong count)
     _fmpz_vec_clear(res, ntests);
     _fmpz_vec_clear(a, ntests);
     flint_free(b);
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void
@@ -544,7 +544,7 @@ sample_sub_old(void * arg, ulong count)
     _fmpz_vec_clear(res, ntests);
     _fmpz_vec_clear(a, ntests);
     flint_free(b);
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 

diff --git a/src/fmpz/profile/p-div_qr.c b/src/fmpz/profile/p-div_qr.c
@@ -50,7 +50,7 @@ void sample_ndiv_qr(void * arg, ulong count)
     fmpz_clear(b);
     fmpz_clear(nmax);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_fdiv_qr(void * arg, ulong count)
@@ -90,7 +90,7 @@ void sample_fdiv_qr(void * arg, ulong count)
     fmpz_clear(b);
     fmpz_clear(nmax);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_cdiv_qr(void * arg, ulong count)
@@ -130,7 +130,7 @@ void sample_cdiv_qr(void * arg, ulong count)
     fmpz_clear(b);
     fmpz_clear(nmax);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_tdiv_qr(void * arg, ulong count)
@@ -170,7 +170,7 @@ void sample_tdiv_qr(void * arg, ulong count)
     fmpz_clear(b);
     fmpz_clear(nmax);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 int main(void)

diff --git a/src/fmpz/profile/p-fdiv_qr_preinvn.c b/src/fmpz/profile/p-fdiv_qr_preinvn.c
@@ -66,7 +66,7 @@ void sample(void * arg, ulong count)
    fmpz_clear(b);
    fmpz_clear(c);
    fmpz_clear(r);
-   flint_rand_clear(state);
+   FLINT_TEST_CLEAR(state);
 }
 
 int main(void)

diff --git a/src/fmpz/profile/p-fmma.c b/src/fmpz/profile/p-fmma.c
@@ -103,7 +103,7 @@ void sample_small(void * arg, ulong count)
     fmpz_clear(c);
     fmpz_clear(d);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_small_old(void * arg, ulong count)
@@ -136,7 +136,7 @@ void sample_small_old(void * arg, ulong count)
     fmpz_clear(c);
     fmpz_clear(d);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_small_zeros(void * arg, ulong count)
@@ -170,7 +170,7 @@ void sample_small_zeros(void * arg, ulong count)
     fmpz_clear(c);
     fmpz_clear(d);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_small_zeros_old(void * arg, ulong count)
@@ -204,7 +204,7 @@ void sample_small_zeros_old(void * arg, ulong count)
     fmpz_clear(c);
     fmpz_clear(d);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_big_zeros(void * arg, ulong count)
@@ -238,7 +238,7 @@ void sample_big_zeros(void * arg, ulong count)
     fmpz_clear(c);
     fmpz_clear(d);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_big_zeros_old(void * arg, ulong count)
@@ -272,7 +272,7 @@ void sample_big_zeros_old(void * arg, ulong count)
     fmpz_clear(c);
     fmpz_clear(d);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 int main(void)

diff --git a/src/fmpz/profile/p-gcd.c b/src/fmpz/profile/p-gcd.c
@@ -105,7 +105,7 @@ sample_new(void * arg, ulong count)
     fmpz_clear(a);
     fmpz_clear(b);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void
@@ -135,7 +135,7 @@ sample_old(void * arg, ulong count)
     fmpz_clear(a);
     fmpz_clear(b);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 int

diff --git a/src/fmpz/profile/p-gcd3.c b/src/fmpz/profile/p-gcd3.c
@@ -178,7 +178,7 @@ sample_new(void * arg, ulong count)
     fmpz_clear(a);
     fmpz_clear(b);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void
@@ -210,7 +210,7 @@ sample_old(void * arg, ulong count)
     fmpz_clear(a);
     fmpz_clear(b);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 int

diff --git a/src/fmpz/profile/p-mul.c b/src/fmpz/profile/p-mul.c
@@ -77,7 +77,7 @@ sample_new(void * arg, ulong count)
     _fmpz_vec_clear(res, ntests);
     _fmpz_vec_clear(a, ntests);
     _fmpz_vec_clear(b, ntests);
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void
@@ -111,7 +111,7 @@ sample_old(void * arg, ulong count)
     _fmpz_vec_clear(res, ntests);
     _fmpz_vec_clear(a, ntests);
     _fmpz_vec_clear(b, ntests);
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 slong sizes[] = { 10, 30, 60, 62, 64, 66, 80, 128, 160, 256, 512, 1024, 4096, 0 };

diff --git a/src/fmpz/profile/p-mul_2exp.c b/src/fmpz/profile/p-mul_2exp.c
@@ -69,9 +69,9 @@ sample_new(void * arg, ulong count)
         prof_stop();
     }
 
-    flint_rand_clear(state);
     fmpz_clear(res);
     fmpz_clear(a);
+    FLINT_TEST_CLEAR(state);
 }
 
 void
@@ -97,9 +97,9 @@ sample_old(void * arg, ulong count)
         prof_stop();
     }
 
-    flint_rand_clear(state);
     fmpz_clear(res);
     fmpz_clear(a);
+    FLINT_TEST_CLEAR(state);
 }
 
 int

diff --git a/src/fmpz/profile/p-mul_ui.c b/src/fmpz/profile/p-mul_ui.c
@@ -70,9 +70,9 @@ sample_new(void * arg, ulong count)
         prof_stop();
     }
 
-    flint_rand_clear(state);
     fmpz_clear(res);
     fmpz_clear(a);
+    FLINT_TEST_CLEAR(state);
 }
 
 void
@@ -99,9 +99,9 @@ sample_old(void * arg, ulong count)
         prof_stop();
     }
 
-    flint_rand_clear(state);
     fmpz_clear(res);
     fmpz_clear(a);
+    FLINT_TEST_CLEAR(state);
 }
 
 int

diff --git a/src/fmpz/profile/p-xgcd.c b/src/fmpz/profile/p-xgcd.c
@@ -44,7 +44,7 @@ void sample_xgcd_small(void * arg, ulong count)
     fmpz_clear(b);
     fmpz_clear(nmax);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_xgcd_mixed(void * arg, ulong count)
@@ -79,7 +79,7 @@ void sample_xgcd_mixed(void * arg, ulong count)
     fmpz_clear(b);
     fmpz_clear(nmax);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_xgcd_big(void * arg, ulong count)
@@ -114,7 +114,7 @@ void sample_xgcd_big(void * arg, ulong count)
     fmpz_clear(b);
     fmpz_clear(nmax);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_xgcd_canonical_bezout_small(void * arg, ulong count)
@@ -149,7 +149,7 @@ void sample_xgcd_canonical_bezout_small(void * arg, ulong count)
     fmpz_clear(b);
     fmpz_clear(nmax);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_xgcd_canonical_bezout_mixed(void * arg, ulong count)
@@ -184,7 +184,7 @@ void sample_xgcd_canonical_bezout_mixed(void * arg, ulong count)
     fmpz_clear(b);
     fmpz_clear(nmax);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 void sample_xgcd_canonical_bezout_big(void * arg, ulong count)
@@ -219,7 +219,7 @@ void sample_xgcd_canonical_bezout_big(void * arg, ulong count)
     fmpz_clear(b);
     fmpz_clear(nmax);
 
-    flint_rand_clear(state);
+    FLINT_TEST_CLEAR(state);
 }
 
 int main(void)

diff --git a/src/fmpz_factor/profile/p-factor_pp1.c b/src/fmpz_factor/profile/p-factor_pp1.c
@@ -55,7 +55,7 @@ int main(void)
          flint_printf("Factor not found!\n");
    } while(1);
 
-   flint_rand_clear(state);
+   FLINT_TEST_CLEAR(state);
 
    fmpz_clear(n);
    fmpz_clear(p);