bindings: generate fmpz.pxd automatically

Author: oscarbenjamin

bin/all_rst_to_pxd.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+FLINT_DOC_DIR=$1
+
+set -e
+
+modules="fmpz"
+
+for module in $modules; do
+    echo "Processing $module"
+    bin/rst_to_pxd.py flint/$module --flint-doc-dir=$FLINT_DOC_DIR > src/flint/flintlib/$module.pxd
+done

bin/rst_to_pxd.py

@@ -40,11 +40,15 @@
 #  recognize a function definition in rst
 is_func = re.compile(r"\.\.( )+(c:)?function( )*::")
 # rename types to avoid python -- c name collisions
-rename_types = [(re.compile(r"\bfmpz\b"),"fmpz_struct"),(re.compile(r"\bfmpq\b"), "fmpq_struct")]
+rename_types = [
+    (re.compile(r"\bfmpz\b"),"fmpz_struct"),
+    (re.compile(r"\bfmpq\b"), "fmpq_struct"),
+    (re.compile(r"\bin\b"), "in_"),
+]
 # comment out functions which use these types
 comment_types = re.compile(r"(\bFILE\b)|(\bmpz_t\b)|(\bmpq_t\b)")
 comment_set = set(["FILE", "mpz_t", "mpq_t"])
-c_types = set(["char", "short", "long", "int", "float", "double"])
+c_types = set(["void", "char", "short", "long", "int", "float", "double"])
 type_modifers = re.compile(r"\*|(\bconst\b)|(\bunsigned\b)|(\bsigned\b)")
 import_dict = {}
 
@@ -79,13 +83,15 @@ def undecorate(str):
     remove variable name, const, ``*``, etc. to just get types
     """
     ret = str.strip()
-    ret = ret[:ret.rfind(' ')]
+    if ' ' in ret:
+        ret = ret[:ret.rfind(' ')]
     ret = re.sub(type_modifers, '', ret)
     return ret.strip()
 
 def get_parameter_types(str):
     params = str[str.find("(") + 1 : str.rfind(")")].split(",")
-    return [undecorate(s) for s in params]
+    params.append(str.split()[0])
+    return [undecorate(s) for s in params if s]
 
 def clean_types(function):
     ret = function.strip()
@@ -98,8 +104,15 @@ def get_functions(file):
     Get a list of functions from an rst file
     """
     ret = []
+    macros = []
     in_list = False
     for line in file:
+        # Keep track of the macros
+        # We want to give them types in cython...
+        if line.startswith('.. macro'):
+            macros.append(line.strip())
+            continue
+
         m = is_func.match(line)
         if m:
             ret.append( clean_types(line[m.end():]))
@@ -110,7 +123,7 @@ def get_functions(file):
                     in_list = False
                 else:
                     ret.append(clean_types(line))
-    return ret
+    return ret, macros
 
 def get_all_types(function_list):
     ret = set()
@@ -119,6 +132,11 @@ def get_all_types(function_list):
             ret.add(t)
     return ret
 
+
+def has_types(line, types):
+    return any(t in types for t in get_parameter_types(line))
+
+
 def gen_imports(function_list):
     """
     Generate import statements for known functions.
@@ -132,10 +150,12 @@ def gen_imports(function_list):
             imports[import_dict[t]].append(t)
         else:
             ret.add(t)
-    for k,v in imports.items():
-        types = ", ".join(v)
+    for k,v in sorted(imports.items()):
+        types = ", ".join(sorted(v))
         print("from flint.flintlib." + k + " cimport " + types)
-    return ret
+    return sorted(ret)
+
+
 
 def generate_pxd_file(h_name, opts):
     fill_import_dict(opts.flint_lib_dir)
@@ -146,14 +166,18 @@ def generate_pxd_file(h_name, opts):
         docdir = opts.flint_doc_dir
         name = name[6:]
     with open(os.path.join(docdir, name + ".rst")) as f:
-        l = get_functions(f)
-        s = gen_imports(l)
+        l, macros = get_functions(f)
+        unknown_types = gen_imports(l)
+        print()
+        for t in unknown_types:
+            print("# unknown type " + t)
         print()
-        print ("\n# unimported types ", s - comment_set)
+        for m in macros:
+            print("# " + m)
         print()
         print(r'cdef extern from "' + h_name +r'.h":')
         for f in l:
-            if comment_types.search(f):
+            if has_types(f, unknown_types):
                 print("    # " + f)
             else:
                 print("    " + f)

src/flint/flintlib/flint.pxd

@@ -36,6 +36,9 @@ cdef extern from "flint/fmpz.h":
 
 ctypedef slong fmpz_struct
 
+cdef extern from "flint/fmpz.h":
+    int COEFF_IS_MPZ(fmpz_struct x)
+
 cdef extern from *:
     """
     /*
@@ -83,25 +86,3 @@ cdef extern from *:
     #endif
     """
     slong pylong_as_slong(PyObject *pylong, int *overflow)
-
-
-"""
-cdef extern from "flint/fmpz_mpoly_factor.h":
-
-    ctypedef struct fmpz_mpoly_factor_struct:
-        fmpz_t content
-        fmpz_mpoly_struct * poly
-        fmpz_struct * exp
-        slong length
-        slong alloc
-
-    ctypedef fmpz_mpoly_factor_struct fmpz_mpoly_factor_t[1]
-
-
-    void fmpz_mpoly_factor_init(fmpz_mpoly_factor_t fac, const fmpz_mpoly_ctx_t ctx)
-
-    void fmpz_mpoly_factor_clear(fmpz_mpoly_factor_t fac, const fmpz_mpoly_ctx_t ctx)
-
-    int fmpz_mpoly_factor(fmpz_mpoly_factor_t fac, const fmpz_mpoly_t A, int full, const fmpz_mpoly_ctx_t ctx)
-"""
-

src/flint/flintlib/fmpz.pxd

@@ -1,80 +1,95 @@
-from flint.flintlib.flint cimport fmpz_struct, ulong, mp_limb_t, mp_ptr
-from flint.flintlib.flint cimport mp_size_t, mp_bitcnt_t, slong, flint_rand_t, flint_bitcnt_t
+from flint.flintlib.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, nmod_t, slong, ulong
+from flint.flintlib.fmpz_factor cimport fmpz_factor_t
+from flint.flintlib.fmpz_types cimport fmpz_preinvn_t, fmpz_t
 
-cdef extern from "flint/fmpz.h":
-    ctypedef fmpz_struct fmpz_t[1]
+# unknown type FILE
+# unknown type fmpz_comb_t
+# unknown type fmpz_comb_temp_t
+# unknown type fmpz_multi_CRT_t
+# unknown type mpf_t
+# unknown type mpfr_rnd_t
+# unknown type mpfr_t
+# unknown type mpz_ptr
+# unknown type mpz_t
+# unknown type nn_ptr
+# unknown type nn_srcptr
+# unknown type size_t
 
-    ctypedef struct fmpz_preinvn_struct:
-        mp_ptr dinv
-        slong n
-        flint_bitcnt_t norm
-    ctypedef fmpz_preinvn_struct fmpz_preinvn_t[1]
+# .. macro:: COEFF_MAX
+# .. macro:: COEFF_MIN
+# .. macro:: COEFF_IS_MPZ(f)
+# .. macro:: MPZ_MIN_ALLOC
 
-# from here on is parsed
-    # fmpz_struct PTR_TO_COEFF(__mpz_struct * ptr)
-    # __mpz_struct * COEFF_TO_PTR(fmpz_struct f)
-    int COEFF_IS_MPZ(fmpz_struct f)
-    # __mpz_struct * _fmpz_new_mpz(void)
+cdef extern from "flint/fmpz.h":
+    # fmpz_struct PTR_TO_COEFF(mpz_ptr ptr)
+    # mpz_ptr COEFF_TO_PTR(fmpz_struct f)
+    # mpz_ptr _fmpz_new_mpz(void)
     void _fmpz_clear_mpz(fmpz_struct f)
     void _fmpz_cleanup_mpz_content()
     void _fmpz_cleanup()
-    # __mpz_struct * _fmpz_promote(fmpz_t f)
-    # __mpz_struct * _fmpz_promote_val(fmpz_t f)
+    # mpz_ptr _fmpz_promote(fmpz_t f)
+    # mpz_ptr _fmpz_promote_val(fmpz_t f)
     void _fmpz_demote(fmpz_t f)
     void _fmpz_demote_val(fmpz_t f)
+    int _fmpz_is_canonical(const fmpz_t f)
     void fmpz_init(fmpz_t f)
     void fmpz_init2(fmpz_t f, ulong limbs)
     void fmpz_clear(fmpz_t f)
     void fmpz_init_set(fmpz_t f, const fmpz_t g)
     void fmpz_init_set_ui(fmpz_t f, ulong g)
     void fmpz_init_set_si(fmpz_t f, slong g)
+    void fmpz_randbits_unsigned(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
     void fmpz_randbits(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
-    void fmpz_randtest(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
     void fmpz_randtest_unsigned(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
+    void fmpz_randtest(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
     void fmpz_randtest_not_zero(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits)
     void fmpz_randm(fmpz_t f, flint_rand_t state, const fmpz_t m)
     void fmpz_randtest_mod(fmpz_t f, flint_rand_t state, const fmpz_t m)
     void fmpz_randtest_mod_signed(fmpz_t f, flint_rand_t state, const fmpz_t m)
     void fmpz_randprime(fmpz_t f, flint_rand_t state, flint_bitcnt_t bits, int proved)
     slong fmpz_get_si(const fmpz_t f)
     ulong fmpz_get_ui(const fmpz_t f)
-    void fmpz_get_uiui(mp_limb_t * hi, mp_limb_t * low, const fmpz_t f)
-    # moved to nmod.pxd
-    # mp_limb_t fmpz_get_nmod(const fmpz_t f, nmod_t mod)
+    void fmpz_get_uiui(ulong * hi, ulong * low, const fmpz_t f)
+    ulong fmpz_get_nmod(const fmpz_t f, nmod_t mod)
     double fmpz_get_d(const fmpz_t f)
     # void fmpz_set_mpf(fmpz_t f, const mpf_t x)
     # void fmpz_get_mpf(mpf_t x, const fmpz_t f)
     # void fmpz_get_mpfr(mpfr_t x, const fmpz_t f, mpfr_rnd_t rnd)
     double fmpz_get_d_2exp(slong * exp, const fmpz_t f)
     # void fmpz_get_mpz(mpz_t x, const fmpz_t f)
-    # int fmpz_get_mpn(mp_ptr *n, fmpz_t n_in)
+    # int fmpz_get_mpn(nn_ptr * n, fmpz_t n_in)
     char * fmpz_get_str(char * str, int b, const fmpz_t f)
     void fmpz_set_si(fmpz_t f, slong val)
     void fmpz_set_ui(fmpz_t f, ulong val)
     void fmpz_set_d(fmpz_t f, double c)
     void fmpz_set_d_2exp(fmpz_t f, double d, slong exp)
     void fmpz_neg_ui(fmpz_t f, ulong val)
-    void fmpz_set_uiui(fmpz_t f, mp_limb_t hi, mp_limb_t lo)
-    void fmpz_neg_uiui(fmpz_t f, mp_limb_t hi, mp_limb_t lo)
+    void fmpz_set_uiui(fmpz_t f, ulong hi, ulong lo)
+    void fmpz_neg_uiui(fmpz_t f, ulong hi, ulong lo)
     void fmpz_set_signed_uiui(fmpz_t f, ulong hi, ulong lo)
     void fmpz_set_signed_uiuiui(fmpz_t f, ulong hi, ulong mid, ulong lo)
     void fmpz_set_ui_array(fmpz_t out, const ulong * in_, slong n)
     void fmpz_set_signed_ui_array(fmpz_t out, const ulong * in_, slong n)
     void fmpz_get_ui_array(ulong * out, slong n, const fmpz_t in_)
     void fmpz_get_signed_ui_array(ulong * out, slong n, const fmpz_t in_)
+    # void fmpz_set_mpn_large(fmpz_t z, nn_srcptr src, slong n, int negative)
     void fmpz_get_signed_uiui(ulong * hi, ulong * lo, const fmpz_t in_)
     # void fmpz_set_mpz(fmpz_t f, const mpz_t x)
     int fmpz_set_str(fmpz_t f, const char * str, int b)
-    void fmpz_set_ui_smod(fmpz_t f, mp_limb_t x, mp_limb_t m)
+    void fmpz_set_ui_smod(fmpz_t f, ulong x, ulong m)
     # void flint_mpz_init_set_readonly(mpz_t z, const fmpz_t f)
     # void flint_mpz_clear_readonly(mpz_t z)
     # void fmpz_init_set_readonly(fmpz_t f, const mpz_t z)
     void fmpz_clear_readonly(fmpz_t f)
     int fmpz_read(fmpz_t f)
-    int fmpz_print(fmpz_t x)
-    size_t fmpz_sizeinbase(const fmpz_t f, int b)
+    # int fmpz_fread(FILE * file, fmpz_t f)
+    # size_t fmpz_inp_raw(fmpz_t x, FILE * fin)
+    # int fmpz_fprint(FILE * fs, const fmpz_t x)
+    int fmpz_print(const fmpz_t x)
+    # size_t fmpz_out_raw(FILE * fout, const fmpz_t x )
+    # size_t fmpz_sizeinbase(const fmpz_t f, int b)
     flint_bitcnt_t fmpz_bits(const fmpz_t f)
-    mp_size_t fmpz_size(const fmpz_t f)
+    slong fmpz_size(const fmpz_t f)
     int fmpz_sgn(const fmpz_t f)
     flint_bitcnt_t fmpz_val2(const fmpz_t f)
     void fmpz_swap(fmpz_t f, fmpz_t g)
@@ -85,8 +100,8 @@ cdef extern from "flint/fmpz.h":
     int fmpz_fits_si(const fmpz_t f)
     void fmpz_setbit(fmpz_t f, ulong i)
     int fmpz_tstbit(const fmpz_t f, ulong i)
-    mp_limb_t fmpz_abs_lbound_ui_2exp(slong * exp, const fmpz_t x, int bits)
-    mp_limb_t fmpz_abs_ubound_ui_2exp(slong * exp, const fmpz_t x, int bits)
+    ulong fmpz_abs_lbound_ui_2exp(slong * exp, const fmpz_t x, int bits)
+    ulong fmpz_abs_ubound_ui_2exp(slong * exp, const fmpz_t x, int bits)
     int fmpz_cmp(const fmpz_t f, const fmpz_t g)
     int fmpz_cmp_ui(const fmpz_t f, ulong g)
     int fmpz_cmp_si(const fmpz_t f, slong g)
@@ -155,10 +170,11 @@ cdef extern from "flint/fmpz.h":
     void fmpz_mod(fmpz_t f, const fmpz_t g, const fmpz_t h)
     ulong fmpz_mod_ui(fmpz_t f, const fmpz_t g, ulong h)
     void fmpz_smod(fmpz_t f, const fmpz_t g, const fmpz_t h)
-    # void fmpz_preinvn_init(fmpz_preinvn_t inv, const fmpz_t f)
-    # void fmpz_preinvn_clear(fmpz_preinvn_t inv)
-    # void fmpz_fdiv_qr_preinvn(fmpz_t f, fmpz_t s, const fmpz_t g, const fmpz_t h, const fmpz_preinvn_t hinv)
+    void fmpz_preinvn_init(fmpz_preinvn_t inv, const fmpz_t f)
+    void fmpz_preinvn_clear(fmpz_preinvn_t inv)
+    void fmpz_fdiv_qr_preinvn(fmpz_t f, fmpz_t s, const fmpz_t g, const fmpz_t h, const fmpz_preinvn_t hinv)
     void fmpz_pow_ui(fmpz_t f, const fmpz_t g, ulong x)
+    void fmpz_ui_pow_ui(fmpz_t f, ulong g, ulong x)
     int fmpz_pow_fmpz(fmpz_t f, const fmpz_t g, const fmpz_t x)
     void fmpz_powm_ui(fmpz_t f, const fmpz_t g, ulong e, const fmpz_t m)
     void fmpz_powm(fmpz_t f, const fmpz_t g, const fmpz_t e, const fmpz_t m)
@@ -196,43 +212,38 @@ cdef extern from "flint/fmpz.h":
     int fmpz_jacobi(const fmpz_t a, const fmpz_t n)
     int fmpz_kronecker(const fmpz_t a, const fmpz_t n)
     void fmpz_divides_mod_list(fmpz_t xstart, fmpz_t xstride, fmpz_t xlength, const fmpz_t a, const fmpz_t b, const fmpz_t n)
-    int fmpz_bit_pack(mp_limb_t * arr, flint_bitcnt_t shift, flint_bitcnt_t bits, fmpz_t coeff, int negate, int borrow)
-    int fmpz_bit_unpack(fmpz_t coeff, mp_limb_t * arr, flint_bitcnt_t shift, flint_bitcnt_t bits, int negate, int borrow)
-    void fmpz_bit_unpack_unsigned(fmpz_t coeff, const mp_limb_t * arr, flint_bitcnt_t shift, flint_bitcnt_t bits)
+    int fmpz_bit_pack(ulong * arr, flint_bitcnt_t shift, flint_bitcnt_t bits, const fmpz_t coeff, int negate, int borrow)
+    int fmpz_bit_unpack(fmpz_t coeff, ulong * arr, flint_bitcnt_t shift, flint_bitcnt_t bits, int negate, int borrow)
+    void fmpz_bit_unpack_unsigned(fmpz_t coeff, const ulong * arr, flint_bitcnt_t shift, flint_bitcnt_t bits)
     void fmpz_complement(fmpz_t r, const fmpz_t f)
     void fmpz_clrbit(fmpz_t f, ulong i)
     void fmpz_combit(fmpz_t f, ulong i)
     void fmpz_and(fmpz_t r, const fmpz_t a, const fmpz_t b)
     void fmpz_or(fmpz_t r, const fmpz_t a, const fmpz_t b)
     void fmpz_xor(fmpz_t r, const fmpz_t a, const fmpz_t b)
-    int fmpz_popcnt(const fmpz_t a)
-    void fmpz_CRT_ui(fmpz_t out, fmpz_t r1, fmpz_t m1, ulong r2, ulong m2, int sign)
-    void fmpz_CRT(fmpz_t out, const fmpz_t r1, const fmpz_t m1, fmpz_t r2, fmpz_t m2, int sign)
-    # void fmpz_multi_mod_ui(mp_limb_t * out, const fmpz_t in_, const fmpz_comb_t comb, fmpz_comb_temp_t temp)
-    # void fmpz_multi_CRT_ui(fmpz_t output, mp_srcptr residues, const fmpz_comb_t comb, fmpz_comb_temp_t ctemp, int sign)
-    # void fmpz_comb_init(fmpz_comb_t comb, mp_srcptr primes, slong num_primes)
+    ulong fmpz_popcnt(const fmpz_t a)
+    void fmpz_CRT_ui(fmpz_t out, const fmpz_t r1, const fmpz_t m1, ulong r2, ulong m2, int sign)
+    void fmpz_CRT(fmpz_t out, const fmpz_t r1, const fmpz_t m1, const fmpz_t r2, const fmpz_t m2, int sign)
+    # void fmpz_multi_mod_ui(ulong * out, const fmpz_t in_, const fmpz_comb_t comb, fmpz_comb_temp_t temp)
+    # void fmpz_multi_CRT_ui(fmpz_t output, nn_srcptr residues, const fmpz_comb_t comb, fmpz_comb_temp_t ctemp, int sign)
+    # void fmpz_comb_init(fmpz_comb_t comb, nn_srcptr primes, slong num_primes)
     # void fmpz_comb_temp_init(fmpz_comb_temp_t temp, const fmpz_comb_t comb)
     # void fmpz_comb_clear(fmpz_comb_t comb)
     # void fmpz_comb_temp_clear(fmpz_comb_temp_t temp)
-    # void fmpz_multi_crt_init(fmpz_multi_crt_t CRT)
-    # int fmpz_multi_crt_precompute(fmpz_multi_crt_t CRT, const fmpz_struct * moduli, slong len)
-    # int fmpz_multi_crt_precompute_p(fmpz_multi_crt_t CRT, const fmpz_struct * const * moduli, slong len)
-    # void fmpz_multi_crt_precomp(fmpz_t output, const fmpz_multi_crt_t P, const fmpz_struct * inputs)
-    # void fmpz_multi_crt_precomp_p(fmpz_t output, const fmpz_multi_crt_t P, const fmpz_struct * const * inputs)
-    int fmpz_multi_crt(fmpz_t output, const fmpz_struct * moduli, const fmpz_struct * values, slong len)
-    # void fmpz_multi_crt_clear(fmpz_multi_crt_t P)
-    # slong _nmod_poly_crt_local_size(const nmod_poly_crt_t CRT)
-    # void _fmpz_multi_crt_run(fmpz_struct * outputs, const fmpz_multi_crt_t CRT, const fmpz_struct * inputs)
-    # void _fmpz_multi_crt_run_p(fmpz_struct * outputs, const fmpz_multi_crt_t CRT, const fmpz_struct * const * inputs)
+    # void fmpz_multi_CRT_init(fmpz_multi_CRT_t CRT)
+    # int fmpz_multi_CRT_precompute(fmpz_multi_CRT_t CRT, const fmpz_struct * moduli, slong len)
+    # void fmpz_multi_CRT_precomp(fmpz_t output, const fmpz_multi_CRT_t P, const fmpz_struct * inputs, int sign)
+    int fmpz_multi_CRT(fmpz_t output, const fmpz_struct * moduli, const fmpz_struct * values, slong len, int sign)
+    # void fmpz_multi_CRT_clear(fmpz_multi_CRT_t P)
     int fmpz_is_strong_probabprime(const fmpz_t n, const fmpz_t a)
     int fmpz_is_probabprime_lucas(const fmpz_t n)
     int fmpz_is_probabprime_BPSW(const fmpz_t n)
     int fmpz_is_probabprime(const fmpz_t p)
     int fmpz_is_prime_pseudosquare(const fmpz_t n)
-    # int fmpz_is_prime_pocklington(fmpz_t F, fmpz_t R, const fmpz_t n, mp_ptr pm1, slong num_pm1)
-    # void _fmpz_nm1_trial_factors(const fmpz_t n, mp_ptr pm1, slong * num_pm1, ulong limit)
-    # int fmpz_is_prime_morrison(fmpz_t F, fmpz_t R, const fmpz_t n, mp_ptr pp1, slong num_pp1)
-    # void _fmpz_np1_trial_factors(const fmpz_t n, mp_ptr pp1, slong * num_pp1, ulong limit)
+    # int fmpz_is_prime_pocklington(fmpz_t F, fmpz_t R, const fmpz_t n, nn_ptr pm1, slong num_pm1)
+    # void _fmpz_nm1_trial_factors(const fmpz_t n, nn_ptr pm1, slong * num_pm1, ulong limit)
+    # int fmpz_is_prime_morrison(fmpz_t F, fmpz_t R, const fmpz_t n, nn_ptr pp1, slong num_pp1)
+    # void _fmpz_np1_trial_factors(const fmpz_t n, nn_ptr pp1, slong * num_pp1, ulong limit)
     int fmpz_is_prime(const fmpz_t n)
     void fmpz_lucas_chain(fmpz_t Vm, fmpz_t Vm1, const fmpz_t A, const fmpz_t m, const fmpz_t n)
     void fmpz_lucas_chain_full(fmpz_t Vm, fmpz_t Vm1, const fmpz_t A, const fmpz_t B, const fmpz_t m, const fmpz_t n)
@@ -243,11 +254,9 @@ cdef extern from "flint/fmpz.h":
     int fmpz_divisor_in_residue_class_lenstra(fmpz_t fac, const fmpz_t n, const fmpz_t r, const fmpz_t s)
     void fmpz_nextprime(fmpz_t res, const fmpz_t n, int proved)
     void fmpz_primorial(fmpz_t res, ulong n)
-    # void fmpz_factor_euler_phi(fmpz_t res, const fmpz_factor_t fac)
+    void fmpz_factor_euler_phi(fmpz_t res, const fmpz_factor_t fac)
     void fmpz_euler_phi(fmpz_t res, const fmpz_t n)
-    # int fmpz_factor_moebius_mu(const fmpz_factor_t fac)
+    int fmpz_factor_moebius_mu(const fmpz_factor_t fac)
     int fmpz_moebius_mu(const fmpz_t n)
-    # void fmpz_factor_divisor_sigma(fmpz_t res, ulong k, const fmpz_factor_t fac)
+    void fmpz_factor_divisor_sigma(fmpz_t res, ulong k, const fmpz_factor_t fac)
     void fmpz_divisor_sigma(fmpz_t res, ulong k, const fmpz_t n)
-
-

src/flint/flintlib/fmpz_factor.pxd

@@ -1,5 +1,5 @@
 from flint.flintlib.flint cimport fmpz_struct, ulong, mp_limb_t, slong, flint_rand_t
-from flint.flintlib.fmpz cimport fmpz_t
+from flint.flintlib.fmpz_types cimport fmpz_t
 
 cdef extern from "flint/fmpz_factor.h":
     ctypedef struct fmpz_factor_struct: