bindings: autogenerate partitions and ulong_extras

Author: oscarbenjamin

bin/all_rst_to_pxd.sh

@@ -52,7 +52,7 @@ modules=(
     "fmpz_poly_factor"
     "fmpz_poly"
     "fmpz"
-    #"fmpz_vec"
+    "fmpz_vec"
     #"fq_default_mat"
     #"fq_default_poly_factor"
     #"fq_default_poly"
@@ -78,8 +78,8 @@ modules=(
     #"nmod_poly"
     #"nmod"
     #"nmod_vec"
-    #"partitions"
-    #"ulong_extras"
+    "partitions"
+    "ulong_extras"
 )
 
 for module in ${modules[@]}; do

bin/rst_to_pxd.py

@@ -99,12 +99,13 @@ def undecorate(str):
     ret = str.strip()
     if ' ' in ret:
         ret = ret[:ret.rfind(' ')]
-    ret = re.sub(type_modifers, '', ret)
-    return ret.strip()
+    ret = re.sub(type_modifers, '', ret).strip()
+    return ret
 
 def get_parameter_types(str):
     params = str[str.find("(") + 1 : str.rfind(")")].split(",")
-    params.append(str.split()[0])
+    ret_type = str.split('(')[0].rsplit(' ', 1)[0]
+    params.append(ret_type)
     return [undecorate(s) for s in params if s]
 
 def clean_types(function):

src/flint/flintlib/fmpz_vec.pxd

@@ -1,6 +1,8 @@
-from flint.flintlib.types.flint cimport mp_srcptr, flint_bitcnt_t, flint_rand_t, mp_ptr, slong, fmpz_struct, mp_limb_t, ulong
-from flint.flintlib.fmpz cimport fmpz_t
-from flint.flintlib.nmod cimport nmod_t
+from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, nmod_t, nn_ptr, nn_srcptr, slong, ulong
+from flint.flintlib.types.fmpz cimport fmpz_t
+
+# unknown type FILE
+
 
 cdef extern from "flint/fmpz_vec.h":
     fmpz_struct * _fmpz_vec_init(slong len)
@@ -10,17 +12,17 @@ cdef extern from "flint/fmpz_vec.h":
     slong _fmpz_vec_max_bits(const fmpz_struct * vec, slong len)
     slong _fmpz_vec_max_bits_ref(const fmpz_struct * vec, slong len)
     void _fmpz_vec_sum_max_bits(slong * sumabs, slong * maxabs, const fmpz_struct * vec, slong len)
-    ulong _fmpz_vec_max_limbs(const fmpz_struct * vec, slong len)
+    slong _fmpz_vec_max_limbs(const fmpz_struct * vec, slong len)
     void _fmpz_vec_height(fmpz_t height, const fmpz_struct * vec, slong len)
     slong _fmpz_vec_height_index(const fmpz_struct * vec, slong len)
     # int _fmpz_vec_fread(FILE * file, fmpz_struct ** vec, slong * len)
     int _fmpz_vec_read(fmpz_struct ** vec, slong * len)
     # int _fmpz_vec_fprint(FILE * file, const fmpz_struct * vec, slong len)
     int _fmpz_vec_print(const fmpz_struct * vec, slong len)
-    void _fmpz_vec_get_nmod_vec(mp_ptr res, const fmpz_struct * poly, slong len, nmod_t mod)
-    void _fmpz_vec_set_nmod_vec(fmpz_struct * res, mp_srcptr poly, slong len, nmod_t mod)
-    void _fmpz_vec_get_fft(mp_limb_t ** coeffs_f, const fmpz_struct * coeffs_m, slong l, slong length)
-    void _fmpz_vec_set_fft(fmpz_struct * coeffs_m, slong length, const mp_ptr * coeffs_f, slong limbs, slong sign)
+    void _fmpz_vec_get_nmod_vec(nn_ptr res, const fmpz_struct * poly, slong len, nmod_t mod)
+    void _fmpz_vec_set_nmod_vec(fmpz_struct * res, nn_srcptr poly, slong len, nmod_t mod)
+    void _fmpz_vec_get_fft(ulong ** coeffs_f, const fmpz_struct * coeffs_m, slong l, slong length)
+    void _fmpz_vec_set_fft(fmpz_struct * coeffs_m, slong length, const nn_ptr * coeffs_f, slong limbs, slong sign)
     slong _fmpz_vec_get_d_vec_2exp(double * appv, const fmpz_struct * vec, slong len)
     void _fmpz_vec_set(fmpz_struct * vec1, const fmpz_struct * vec2, slong len2)
     void _fmpz_vec_swap(fmpz_struct * vec1, fmpz_struct * vec2, slong len2)
@@ -40,7 +42,7 @@ cdef extern from "flint/fmpz_vec.h":
     void _fmpz_vec_scalar_mul_2exp(fmpz_struct * vec1, const fmpz_struct * vec2, slong len2, ulong exp)
     void _fmpz_vec_scalar_divexact_fmpz(fmpz_struct * vec1, const fmpz_struct * vec2, slong len2, const fmpz_t x)
     void _fmpz_vec_scalar_divexact_si(fmpz_struct * vec1, const fmpz_struct * vec2, slong len2, slong c)
-    void _fmpz_vec_scalar_divexact_ui(fmpz_struct * vec1, const fmpz_struct * vec2, ulong len2, ulong c)
+    void _fmpz_vec_scalar_divexact_ui(fmpz_struct * vec1, const fmpz_struct * vec2, slong len2, ulong c)
     void _fmpz_vec_scalar_fdiv_q_fmpz(fmpz_struct * vec1, const fmpz_struct * vec2, slong len2, const fmpz_t c)
     void _fmpz_vec_scalar_fdiv_q_si(fmpz_struct * vec1, const fmpz_struct * vec2, slong len2, slong c)
     void _fmpz_vec_scalar_fdiv_q_ui(fmpz_struct * vec1, const fmpz_struct * vec2, slong len2, ulong c)
@@ -59,10 +61,11 @@ cdef extern from "flint/fmpz_vec.h":
     void _fmpz_vec_scalar_submul_si_2exp(fmpz_struct * vec1, const fmpz_struct * vec2, slong len2, slong c, ulong e)
     void _fmpz_vec_sum(fmpz_t res, const fmpz_struct * vec, slong len)
     void _fmpz_vec_prod(fmpz_t res, const fmpz_struct * vec, slong len)
-    void _fmpz_vec_scalar_mod_fmpz(fmpz_struct *res, const fmpz_struct *vec, slong len, const fmpz_t p)
-    void _fmpz_vec_scalar_smod_fmpz(fmpz_struct *res, const fmpz_struct *vec, slong len, const fmpz_t p)
+    void _fmpz_vec_scalar_mod_fmpz(fmpz_struct * res, const fmpz_struct * vec, slong len, const fmpz_t p)
+    void _fmpz_vec_scalar_smod_fmpz(fmpz_struct * res, const fmpz_struct * vec, slong len, const fmpz_t p)
     void _fmpz_vec_content(fmpz_t res, const fmpz_struct * vec, slong len)
     void _fmpz_vec_content_chained(fmpz_t res, const fmpz_struct * vec, slong len, const fmpz_t input)
     void _fmpz_vec_lcm(fmpz_t res, const fmpz_struct * vec, slong len)
+    void _fmpz_vec_dot_general_naive(fmpz_t res, const fmpz_t initial, int subtract, const fmpz_struct * a, const fmpz_struct * b, int reverse, slong len)
+    void _fmpz_vec_dot_general(fmpz_t res, const fmpz_t initial, int subtract, const fmpz_struct * a, const fmpz_struct * b, int reverse, slong len)
     void _fmpz_vec_dot(fmpz_t res, const fmpz_struct * vec1, const fmpz_struct * vec2, slong len2)
-    void _fmpz_vec_dot_ptr(fmpz_t res, const fmpz_struct * vec1, fmpz_struct ** const vec2, slong offset, slong len)

src/flint/flintlib/partitions.pxd

@@ -1,10 +1,11 @@
-from flint.flintlib.types.flint cimport ulong, slong
-from flint.flintlib.fmpz cimport fmpz_t
-from flint.flintlib.arf cimport arf_t
-from flint.flintlib.arb cimport arb_t
+from flint.flintlib.types.arb cimport arb_t
+from flint.flintlib.types.arf cimport arf_t
+from flint.flintlib.types.flint cimport slong, ulong
+from flint.flintlib.types.fmpz cimport fmpz_t
+
+
 
 cdef extern from "flint/partitions.h":
-# from here on is parsed
     void partitions_rademacher_bound(arf_t b, const fmpz_t n, ulong N)
     void partitions_hrr_sum_arb(arb_t x, const fmpz_t n, slong N0, slong N, int use_doubles)
     void partitions_fmpz_fmpz(fmpz_t p, const fmpz_t n, int use_doubles)

src/flint/flintlib/ulong_extras.pxd

@@ -1,11 +1,12 @@
-from flint.flintlib.types.flint cimport ulong, flint_rand_t, slong, mp_limb_t
-from flint.flintlib.fmpz cimport fmpz_t
+from flint.flintlib.types.flint cimport flint_rand_t, slong, ulong
+from flint.flintlib.types.fmpz cimport fmpz_t
+
+# unknown type n_ecm_t
+# unknown type n_factor_t
+# unknown type n_primes_t
 
-cdef extern from "flint/ulong_extras.h":
-#     ulong n_gcd(ulong n, ulong k)
-#     int n_is_prime(ulong n)
 
-# from here on is parsed
+cdef extern from "flint/ulong_extras.h":
     ulong n_randlimb(flint_rand_t state)
     ulong n_randbits(flint_rand_t state, unsigned int bits)
     ulong n_randtest_bits(flint_rand_t state, int bits)
@@ -21,6 +22,7 @@ cdef extern from "flint/ulong_extras.h":
     ulong n_clog_2exp(ulong n, ulong b)
     ulong n_revbin(ulong n, ulong b)
     int n_sizeinbase(ulong n, int base)
+    ulong n_preinvert_limb_prenorm(ulong n)
     ulong n_preinvert_limb(ulong n)
     double n_precompute_inverse(ulong n)
     ulong n_mod_precomp(ulong a, ulong n, double ninv)
@@ -38,25 +40,25 @@ cdef extern from "flint/ulong_extras.h":
     ulong n_gcd(ulong x, ulong y)
     ulong n_gcdinv(ulong * a, ulong x, ulong y)
     ulong n_xgcd(ulong * a, ulong * b, ulong x, ulong y)
-    # int n_jacobi(mp_limb_signed_t x, ulong y)
+    int n_jacobi(slong x, ulong y)
     int n_jacobi_unsigned(ulong x, ulong y)
     ulong n_addmod(ulong a, ulong b, ulong n)
     ulong n_submod(ulong a, ulong b, ulong n)
     ulong n_invmod(ulong x, ulong y)
-    # ulong n_powmod_precomp(ulong a, mp_limb_signed_t exp, ulong n, double npre)
+    ulong n_powmod_precomp(ulong a, slong exp, ulong n, double npre)
     ulong n_powmod_ui_precomp(ulong a, ulong exp, ulong n, double npre)
-    # ulong n_powmod(ulong a, mp_limb_signed_t exp, ulong n)
-    # ulong n_powmod2_preinv(ulong a, mp_limb_signed_t exp, ulong n, ulong ninv)
-    # ulong n_powmod2(ulong a, mp_limb_signed_t exp, ulong n)
+    ulong n_powmod(ulong a, slong exp, ulong n)
+    ulong n_powmod2_preinv(ulong a, slong exp, ulong n, ulong ninv)
+    ulong n_powmod2(ulong a, slong exp, ulong n)
     ulong n_powmod2_ui_preinv(ulong a, ulong exp, ulong n, ulong ninv)
     ulong n_powmod2_fmpz_preinv(ulong a, const fmpz_t exp, ulong n, ulong ninv)
     ulong n_sqrtmod(ulong a, ulong p)
     slong n_sqrtmod_2pow(ulong ** sqrt, ulong a, slong exp)
     slong n_sqrtmod_primepow(ulong ** sqrt, ulong a, ulong p, slong exp)
     # slong n_sqrtmodn(ulong ** sqrt, ulong a, n_factor_t * fac)
-    mp_limb_t n_mulmod_shoup(mp_limb_t w, mp_limb_t t, mp_limb_t w_precomp, mp_limb_t p)
-    mp_limb_t n_mulmod_precomp_shoup(mp_limb_t w, mp_limb_t p)
-    int n_divides(mp_limb_t * q, mp_limb_t n, mp_limb_t p)
+    ulong n_mulmod_shoup(ulong w, ulong t, ulong w_precomp, ulong p)
+    ulong n_mulmod_precomp_shoup(ulong w, ulong p)
+    int n_divides(ulong * q, ulong n, ulong p)
     # void n_primes_init(n_primes_t iter)
     # void n_primes_clear(n_primes_t iter)
     # ulong n_primes_next(n_primes_t iter)
@@ -69,9 +71,9 @@ cdef extern from "flint/ulong_extras.h":
     void n_cleanup_primes()
     ulong n_nextprime(ulong n, int proved)
     ulong n_prime_pi(ulong n)
-    void n_prime_pi_bounds(ulong *lo, ulong *hi, ulong n)
+    void n_prime_pi_bounds(ulong * lo, ulong * hi, ulong n)
     ulong n_nth_prime(ulong n)
-    void n_nth_prime_bounds(ulong *lo, ulong *hi, ulong n)
+    void n_nth_prime_bounds(ulong * lo, ulong * hi, ulong n)
     int n_is_oddprime_small(ulong n)
     int n_is_oddprime_binary(ulong n)
     int n_is_prime_pocklington(ulong n, ulong iterations)
@@ -90,18 +92,19 @@ cdef extern from "flint/ulong_extras.h":
     int n_is_square(ulong x)
     int n_is_perfect_power235(ulong n)
     int n_is_perfect_power(ulong * root, ulong n)
-    ulong n_rootrem(ulong* remainder, ulong n, ulong root)
+    ulong n_rootrem(ulong * remainder, ulong n, ulong root)
     ulong n_cbrt(ulong n)
-    ulong n_cbrt_newton_iteration(ulong n)
     ulong n_cbrt_binary_search(ulong n)
     ulong n_cbrt_chebyshev_approx(ulong n)
-    ulong n_cbrtrem(ulong* remainder, ulong n)
+    ulong n_cbrtrem(ulong * remainder, ulong n)
+    # void n_factor_init(n_factor_t * factors)
+    # ulong n_factor_evaluate(const n_factor_t * factors)
     int n_remove(ulong * n, ulong p)
     int n_remove2_precomp(ulong * n, ulong p, double ppre)
     # void n_factor_insert(n_factor_t * factors, ulong p, ulong exp)
     # ulong n_factor_trial_range(n_factor_t * factors, ulong n, ulong start, ulong num_primes)
     # ulong n_factor_trial(n_factor_t * factors, ulong n, ulong num_primes)
-    ulong n_factor_power235(ulong *exp, ulong n)
+    ulong n_factor_power235(ulong * exp, ulong n)
     ulong n_factor_one_line(ulong n, ulong iters)
     ulong n_factor_lehman(ulong n)
     ulong n_factor_SQUFOF(ulong n, ulong iters)
@@ -110,8 +113,8 @@ cdef extern from "flint/ulong_extras.h":
     # ulong n_factor_partial(n_factor_t * factors, ulong n, ulong limit, int proved)
     ulong n_factor_pp1(ulong n, ulong B1, ulong c)
     ulong n_factor_pp1_wrapper(ulong n)
-    int n_factor_pollard_brent_single(mp_limb_t *factor, mp_limb_t n, mp_limb_t ninv, mp_limb_t ai, mp_limb_t xi, mp_limb_t normbits, mp_limb_t max_iters)
-    int n_factor_pollard_brent(mp_limb_t *factor, flint_rand_t state, mp_limb_t n_in, mp_limb_t max_tries, mp_limb_t max_iters)
+    int n_factor_pollard_brent_single(ulong * factor, ulong n, ulong ninv, ulong ai, ulong xi, ulong normbits, ulong max_iters)
+    int n_factor_pollard_brent(ulong * factor, flint_rand_t state, ulong n_in, ulong max_tries, ulong max_iters)
     int n_moebius_mu(ulong n)
     void n_moebius_mu_vec(int * mu, ulong len)
     int n_is_squarefree(ulong n)
@@ -121,10 +124,10 @@ cdef extern from "flint/ulong_extras.h":
     # ulong n_primitive_root_prime_prefactor(ulong p, n_factor_t * factors)
     ulong n_primitive_root_prime(ulong p)
     ulong n_discrete_log_bsgs(ulong b, ulong a, ulong n)
-    # void n_factor_ecm_double(mp_limb_t *x, mp_limb_t *z, mp_limb_t x0, mp_limb_t z0, mp_limb_t n, n_ecm_t n_ecm_inf)
-    # void n_factor_ecm_add(mp_limb_t *x, mp_limb_t *z, mp_limb_t x1, mp_limb_t z1, mp_limb_t x2, mp_limb_t z2, mp_limb_t x0, mp_limb_t z0, mp_limb_t n, n_ecm_t n_ecm_inf)
-    # void n_factor_ecm_mul_montgomery_ladder(mp_limb_t *x, mp_limb_t *z, mp_limb_t x0, mp_limb_t z0, mp_limb_t k, mp_limb_t n, n_ecm_t n_ecm_inf)
-    # int n_factor_ecm_select_curve(mp_limb_t *f, mp_limb_t sigma, mp_limb_t n, n_ecm_t n_ecm_inf)
-    # int n_factor_ecm_stage_I(mp_limb_t *f, const mp_limb_t *prime_array, mp_limb_t num, mp_limb_t B1, mp_limb_t n, n_ecm_t n_ecm_inf)
-    # int n_factor_ecm_stage_II(mp_limb_t *f, mp_limb_t B1, mp_limb_t B2, mp_limb_t P, mp_limb_t n, n_ecm_t n_ecm_inf)
-    # int n_factor_ecm(mp_limb_t *f, mp_limb_t curves, mp_limb_t B1, mp_limb_t B2, flint_rand_t state, mp_limb_t n)
+    # void n_factor_ecm_double(ulong * x, ulong * z, ulong x0, ulong z0, ulong n, n_ecm_t n_ecm_inf)
+    # void n_factor_ecm_add(ulong * x, ulong * z, ulong x1, ulong z1, ulong x2, ulong z2, ulong x0, ulong z0, ulong n, n_ecm_t n_ecm_inf)
+    # void n_factor_ecm_mul_montgomery_ladder(ulong * x, ulong * z, ulong x0, ulong z0, ulong k, ulong n, n_ecm_t n_ecm_inf)
+    # int n_factor_ecm_select_curve(ulong * f, ulong sigma, ulong n, n_ecm_t n_ecm_inf)
+    # int n_factor_ecm_stage_I(ulong * f, const ulong * prime_array, ulong num, ulong B1, ulong n, n_ecm_t n_ecm_inf)
+    # int n_factor_ecm_stage_II(ulong * f, ulong B1, ulong B2, ulong P, ulong n, n_ecm_t n_ecm_inf)
+    int n_factor_ecm(ulong * f, ulong curves, ulong B1, ulong B2, flint_rand_t state, ulong n)