bindings: auto-generate acb_calc and mag

Author: oscarbenjamin

bin/all_rst_to_pxd.sh

@@ -4,23 +4,79 @@ FLINT_DOC_DIR=$1
 
 set -e
 
-modules="\
-    fmpz\
-    fmpz_factor\
-    fmpz_poly\
-    fmpz_poly_factor\
-    fmpz_mat\
-    fmpz_lll\
-    arf\
-    arb\
-    arb_poly\
-    arb_mat\
-    acb\
-    acb_poly\
-    acb_mat\
-    "
+modules=(
+    "acb_calc"
+    #"acb_dft"
+    #"acb_dirichlet"
+    #"acb_elliptic"
+    #"acb_hypgeom"
+    "acb_mat"
+    #"acb_modular"
+    "acb_poly"
+    "acb"
+    #"acb_theta"
+    #"arb_fmpz_poly"
+    #"arb_hypgeom"
+    "arb_mat"
+    "arb_poly"
+    "arb"
+    "arf"
+    #"arith"
+    #"bernoulli"
+    #"dirichlet"
+    #"fmpq_mat"
+    #"fmpq_mpoly_factor"
+    #"fmpq_mpoly"
+    #"fmpq_poly"
+    #"fmpq"
+    #"fmpq_vec"
+    "fmpz_factor"
+    "fmpz_lll"
+    "fmpz_mat"
+    #"fmpz_mod_mat"
+    #"fmpz_mod_mpoly_factor"
+    #"fmpz_mod_mpoly"
+    #"fmpz_mod_poly_factor"
+    #"fmpz_mod_poly"
+    #"fmpz_mod"
+    #"fmpz_mod_vec"
+    #"fmpz_mpoly_factor"
+    #"fmpz_mpoly"
+    #"fmpz_mpoly_q"
+    "fmpz_poly_factor"
+    "fmpz_poly"
+    "fmpz"
+    #"fmpz_vec"
+    #"fq_default_mat"
+    #"fq_default_poly_factor"
+    #"fq_default_poly"
+    #"fq_default"
+    #"fq_mat"
+    #"fq_nmod_mat"
+    #"fq_nmod_poly_factor"
+    #"fq_nmod_poly"
+    #"fq_nmod"
+    #"fq_poly_factor"
+    #"fq_poly"
+    #"fq"
+    #"fq_zech_mat"
+    #"fq_zech_poly_factor"
+    #"fq_zech_poly"
+    #"fq_zech"
+    "mag"
+    #"mpoly"
+    #"nmod_mat"
+    #"nmod_mpoly_factor"
+    #"nmod_mpoly"
+    #"nmod_poly_factor"
+    #"nmod_poly"
+    #"nmod"
+    #"nmod_vec"
+    #"partitions"
+    #"ulong_extras"
+)
 
-for module in $modules; do
+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

@@ -62,8 +62,14 @@ def get_cython_struct_types(file):
         l = line.strip()
         if l[:8] == "ctypedef":
             if l[-1] == ']':
+                # ctypedef foo foo_t[0]
                 l = l[:l.rfind('[')]
+            elif '(' in l:
+                # ctypedef int (*foo_func)(...)
+                l = l[l.index('('):].lstrip('(*')
+                l = l[:l.index(')')]
             else:
+                # ctypedef foo:
                 l = l.strip(':')
             ret.append(l.split()[-1])
     return ret

src/flint/flintlib/acb_calc.pxd

@@ -1,25 +1,13 @@
-from flint.flintlib.acb cimport acb_t, acb_ptr
-from flint.flintlib.mag cimport mag_t
+from flint.flintlib.acb_types cimport acb_calc_func_t, acb_calc_integrate_opt_t, acb_t
+from flint.flintlib.arb_types cimport arb_t, mag_t
+from flint.flintlib.arf_types cimport arf_t
 from flint.flintlib.flint cimport slong
-from flint.flintlib.arb cimport arb_t
-from flint.flintlib.arf cimport arf_t
 
-cdef extern from "flint/acb_calc.h":
-    ctypedef int (*acb_calc_func_t)(acb_ptr out, const acb_t inp, void * param, long order, long prec)
-
-    ctypedef struct acb_calc_integrate_opt_struct:
-        long deg_limit
-        long eval_limit
-        long depth_limit
-        int use_heap
-        int verbose
 
-    ctypedef acb_calc_integrate_opt_struct acb_calc_integrate_opt_t[1]
 
-# from /Users/davideinstein/projects/arb/doc/source/acb_calc.rst
+cdef extern from "flint/acb_calc.h":
     int acb_calc_integrate(acb_t res, acb_calc_func_t func, void * param, const acb_t a, const acb_t b, slong rel_goal, const mag_t abs_tol, const acb_calc_integrate_opt_t options, slong prec)
     void acb_calc_integrate_opt_init(acb_calc_integrate_opt_t options)
     int acb_calc_integrate_gl_auto_deg(acb_t res, slong * num_eval, acb_calc_func_t func, void * param, const acb_t a, const acb_t b, const mag_t tol, slong deg_limit, int flags, slong prec)
     void acb_calc_cauchy_bound(arb_t bound, acb_calc_func_t func, void * param, const acb_t x, const arb_t radius, slong maxdepth, slong prec)
     int acb_calc_integrate_taylor(acb_t res, acb_calc_func_t func, void * param, const acb_t a, const acb_t b, const arf_t inner_radius, const arf_t outer_radius, slong accuracy_goal, slong prec)
-

src/flint/flintlib/acb_types.pxd

@@ -37,3 +37,15 @@ cdef extern from "flint/acb_mat.h":
 
 cdef extern from "flint/acb_poly.h":
     acb_ptr acb_poly_get_coeff_ptr(arb_poly_t poly, slong n)
+
+cdef extern from "flint/acb_calc.h":
+    ctypedef int (*acb_calc_func_t)(acb_ptr out, const acb_t inp, void * param, slong order, slong prec)
+
+    ctypedef struct acb_calc_integrate_opt_struct:
+        slong deg_limit
+        slong eval_limit
+        slong depth_limit
+        int use_heap
+        int verbose
+
+    ctypedef acb_calc_integrate_opt_struct acb_calc_integrate_opt_t[1]

src/flint/flintlib/mag.pxd

@@ -1,11 +1,12 @@
-from flint.flintlib.flint cimport ulong, mp_limb_t, slong, flint_rand_t
-from flint.flintlib.fmpz cimport fmpz_struct, fmpz_t
-from flint.flintlib.fmpq cimport fmpq_struct, fmpq_t
-from flint.flintlib.arb_types cimport mag_t, mag_ptr
+from flint.flintlib.arb_types cimport mag_ptr, mag_t
+from flint.flintlib.flint cimport flint_rand_t, slong, ulong
+from flint.flintlib.fmpq cimport fmpq_t
+from flint.flintlib.fmpz_types cimport fmpz_t
+
+# unknown type FILE
 
-cdef extern from "flint/mag.h":
 
-# from here on is parsed
+cdef extern from "flint/mag.h":
     void mag_init(mag_t x)
     void mag_clear(mag_t x)
     void mag_swap(mag_t x, mag_t y)
@@ -22,7 +23,6 @@ cdef extern from "flint/mag.h":
     void mag_init_set(mag_t res, const mag_t x)
     void mag_set(mag_t res, const mag_t x)
     void mag_set_d(mag_t res, double x)
-    # void mag_set_fmpr(mag_t res, const fmpr_t x)
     void mag_set_ui(mag_t res, ulong x)
     void mag_set_fmpz(mag_t res, const fmpz_t x)
     void mag_set_d_lower(mag_t res, double x)
@@ -35,7 +35,6 @@ cdef extern from "flint/mag.h":
     void mag_set_fmpz_2exp_fmpz_lower(mag_t res, const fmpz_t x, const fmpz_t y)
     double mag_get_d(const mag_t x)
     double mag_get_d_log2_approx(const mag_t x)
-    # void mag_get_fmpr(fmpr_t res, const mag_t x)
     void mag_get_fmpq(fmpq_t res, const mag_t x)
     void mag_get_fmpz(fmpz_t res, const mag_t x)
     void mag_get_fmpz_lower(fmpz_t res, const mag_t x)
@@ -45,8 +44,11 @@ cdef extern from "flint/mag.h":
     void mag_min(mag_t res, const mag_t x, const mag_t y)
     void mag_max(mag_t res, const mag_t x, const mag_t y)
     void mag_print(const mag_t x)
+    # void mag_fprint(FILE * file, const mag_t x)
     char * mag_dump_str(const mag_t x)
     int mag_load_str(mag_t x, const char * str)
+    # int mag_dump_file(FILE * stream, const mag_t x)
+    # int mag_load_file(mag_t x, FILE * stream)
     void mag_randtest(mag_t res, flint_rand_t state, slong expbits)
     void mag_randtest_special(mag_t res, flint_rand_t state, slong expbits)
     void mag_add(mag_t res, const mag_t x, const mag_t y)