Skip to content

Commit 74e6d5a

Browse files
oscarbenjaminoscarbenjamin
committed
regenerate .pxd files
1 parent 7552973 commit 74e6d5a

19 files changed

+67
-76
lines changed

‎bin/all_rst_to_pxd.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
#!/usr/bin/env bash
22

3-
FLINT_DOC_DIR=$1
4-
53
set -e
64

5+
if [ $# -eq 0 ]
6+
then
7+
echo "Usage: bin/all_rst_to_pxd.sh /path/to/flint/doc/source"
8+
exit 1
9+
fi
10+
11+
FLINT_DOC_DIR=$1
12+
713
modules=(
814
"acb_calc"
915
"acb_dft"

‎bin/rst_to_pxd.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,13 @@ def fill_import_dict(pyflintlibdir):
8585
for t in get_cython_struct_types(pxd):
8686
import_dict[t] = f.name.split('.')[0]
8787

88+
with os.scandir(pyflintlibdir + '/types') as entry:
89+
for f in entry:
90+
if fnmatch.fnmatch(f.name, "*.pxd"):
91+
with open(f.path) as pxd:
92+
for t in get_cython_struct_types(pxd):
93+
import_dict[t] = 'types.' + f.name.split('.')[0]
94+
8895
def undecorate(str):
8996
"""
9097
remove variable name, const, ``*``, etc. to just get types

‎src/flint/flintlib/acb.pxd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
from flint.flintlib.fmpq cimport fmpq_t
12
from flint.flintlib.types.acb cimport acb_ptr, acb_srcptr, acb_t
23
from flint.flintlib.types.arb cimport arb_ptr, arb_srcptr, arb_t, mag_srcptr, mag_t
34
from flint.flintlib.types.arf cimport arf_srcptr, arf_t
45
from flint.flintlib.types.flint cimport flint_rand_t, fmpz_struct, slong, ulong
5-
from flint.flintlib.fmpq cimport fmpq_t
66
from flint.flintlib.types.fmpz cimport fmpz_t
77

88
# unknown type FILE

‎src/flint/flintlib/acb_calc.pxd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from flint.flintlib.types.acb cimport acb_t
2+
from flint.flintlib.types.acb_calc cimport acb_calc_func_t, acb_calc_integrate_opt_t
23
from flint.flintlib.types.arb cimport arb_t, mag_t
34
from flint.flintlib.types.arf cimport arf_t
45
from flint.flintlib.types.flint cimport slong
5-
from flint.flintlib.types.acb_calc cimport acb_calc_func_t, acb_calc_integrate_opt_t, acb_t
66

77

88

‎src/flint/flintlib/acb_dirichlet.pxd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
from flint.flintlib.types.acb_dirichlet cimport acb_dirichlet_hurwitz_precomp_t, acb_dirichlet_roots_t
1+
from flint.flintlib.dirichlet cimport dirichlet_char_t, dirichlet_group_t
2+
from flint.flintlib.fmpq cimport fmpq_t
23
from flint.flintlib.types.acb cimport acb_poly_t, acb_ptr, acb_srcptr, acb_t
4+
from flint.flintlib.types.acb_dirichlet cimport acb_dirichlet_hurwitz_precomp_t, acb_dirichlet_roots_t
35
from flint.flintlib.types.arb cimport arb_ptr, arb_srcptr, arb_t, mag_t
46
from flint.flintlib.types.arf cimport arf_t
5-
from flint.flintlib.dirichlet cimport dirichlet_char_t, dirichlet_group_t
67
from flint.flintlib.types.flint cimport slong, ulong
7-
from flint.flintlib.fmpq cimport fmpq_t
88
from flint.flintlib.types.fmpz cimport fmpz_t
99

1010

‎src/flint/flintlib/acb_mat.pxd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
from flint.flintlib.fmpq_mat cimport fmpq_mat_t
12
from flint.flintlib.types.acb cimport acb_mat_t, acb_poly_t, acb_ptr, acb_srcptr, acb_t
23
from flint.flintlib.types.arb cimport arb_mat_t, arb_t, mag_t
34
from flint.flintlib.types.flint cimport flint_rand_t, slong, ulong
4-
from flint.flintlib.fmpq_mat cimport fmpq_mat_t
55
from flint.flintlib.types.fmpz cimport fmpz_mat_t, fmpz_t
66

77
# unknown type FILE

‎src/flint/flintlib/acb_poly.pxd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
from flint.flintlib.fmpq_poly cimport fmpq_poly_t
12
from flint.flintlib.types.acb cimport acb_poly_t, acb_ptr, acb_srcptr, acb_t
23
from flint.flintlib.types.arb cimport arb_poly_t, arb_ptr, mag_t
34
from flint.flintlib.types.flint cimport flint_rand_t, slong, ulong
4-
from flint.flintlib.fmpq_poly cimport fmpq_poly_t
55
from flint.flintlib.types.fmpz cimport fmpz_poly_t, fmpz_t
66

77
# unknown type FILE

‎src/flint/flintlib/arb.pxd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
from flint.flintlib.fmpq cimport fmpq_t
12
from flint.flintlib.types.arb cimport arb_ptr, arb_srcptr, arb_t, mag_srcptr, mag_t
23
from flint.flintlib.types.arf cimport arf_rnd_t, arf_srcptr, arf_t
34
from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, nn_ptr, nn_srcptr, slong, ulong
4-
from flint.flintlib.fmpq cimport fmpq_t
55
from flint.flintlib.types.fmpz cimport fmpz_t
66

77
# unknown type FILE

‎src/flint/flintlib/arb_fmpz_poly.pxd‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from flint.flintlib.arb cimport arb_t
2-
from flint.flintlib.acb cimport acb_t, acb_ptr
3-
from flint.flintlib.fmpz_poly cimport fmpz_poly_t
4-
from flint.flintlib.types.flint cimport ulong, slong
5-
from flint.flintlib.fmpz cimport fmpz_struct
1+
from flint.flintlib.types.acb cimport acb_ptr, acb_t
2+
from flint.flintlib.types.arb cimport arb_t
3+
from flint.flintlib.types.flint cimport fmpz_struct, slong, ulong
4+
from flint.flintlib.types.fmpz cimport fmpz_poly_t
5+
6+
67

78
cdef extern from "flint/arb_fmpz_poly.h":
8-
# from here on is parsed
99
void _arb_fmpz_poly_evaluate_arb_horner(arb_t res, const fmpz_struct * poly, slong len, const arb_t x, slong prec)
1010
void arb_fmpz_poly_evaluate_arb_horner(arb_t res, const fmpz_poly_t poly, const arb_t x, slong prec)
1111
void _arb_fmpz_poly_evaluate_arb_rectangular(arb_t res, const fmpz_struct * poly, slong len, const arb_t x, slong prec)
@@ -21,5 +21,4 @@ cdef extern from "flint/arb_fmpz_poly.h":
2121
ulong arb_fmpz_poly_deflation(const fmpz_poly_t poly)
2222
void arb_fmpz_poly_deflate(fmpz_poly_t res, const fmpz_poly_t poly, ulong deflation)
2323
void arb_fmpz_poly_complex_roots(acb_ptr roots, const fmpz_poly_t poly, int flags, slong prec)
24-
void arb_fmpz_poly_cos_minpoly(fmpz_poly_t res, ulong n)
2524
void arb_fmpz_poly_gauss_period_minpoly(fmpz_poly_t res, ulong q, ulong n)

‎src/flint/flintlib/arb_hypgeom.pxd‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
from flint.flintlib.arb cimport arb_t, arb_srcptr, arb_ptr
2-
from flint.flintlib.arb_poly cimport arb_poly_t
3-
from flint.flintlib.fmpz cimport fmpz_t, fmpz_struct
4-
from flint.flintlib.types.flint cimport ulong, slong
5-
from flint.flintlib.mag cimport mag_t
6-
from flint.flintlib.fmpq cimport fmpq_t, fmpq_struct
1+
from flint.flintlib.fmpq cimport fmpq_struct, fmpq_t
2+
from flint.flintlib.types.arb cimport arb_poly_t, arb_ptr, arb_srcptr, arb_t, mag_t
3+
from flint.flintlib.types.flint cimport fmpz_struct, slong, ulong
4+
from flint.flintlib.types.fmpz cimport fmpz_t
5+
6+
77

88
cdef extern from "flint/arb_hypgeom.h":
9-
# from here on is parsed
109
void _arb_hypgeom_rising_coeffs_1(ulong * c, ulong k, slong n)
1110
void _arb_hypgeom_rising_coeffs_2(ulong * c, ulong k, slong n)
1211
void _arb_hypgeom_rising_coeffs_fmpz(fmpz_struct * c, ulong k, slong n)
@@ -37,9 +36,9 @@ cdef extern from "flint/arb_hypgeom.h":
3736
void arb_hypgeom_1f1(arb_t res, const arb_t a, const arb_t b, const arb_t z, int regularized, slong prec)
3837
void arb_hypgeom_1f1_integration(arb_t res, const arb_t a, const arb_t b, const arb_t z, int regularized, slong prec)
3938
void arb_hypgeom_u(arb_t res, const arb_t a, const arb_t b, const arb_t z, slong prec)
40-
void arb_hypgeom_u_integration(arb_t res, const arb_t a, const arb_t b, const arb_t z, int regularized, slong prec)
39+
void arb_hypgeom_u_integration(arb_t res, const arb_t a, const arb_t b, const arb_t z, slong prec)
4140
void arb_hypgeom_2f1(arb_t res, const arb_t a, const arb_t b, const arb_t c, const arb_t z, int regularized, slong prec)
42-
void arb_hypgeom_2f1_integration(arb_t res, const arb_t a, const arb_t b, const arb_t z, int regularized, slong prec)
41+
void arb_hypgeom_2f1_integration(arb_t res, const arb_t a, const arb_t b, const arb_t c, const arb_t z, int regularized, slong prec)
4342
void arb_hypgeom_erf(arb_t res, const arb_t z, slong prec)
4443
void _arb_hypgeom_erf_series(arb_ptr res, arb_srcptr z, slong zlen, slong len, slong prec)
4544
void arb_hypgeom_erf_series(arb_poly_t res, const arb_poly_t z, slong len, slong prec)
@@ -126,7 +125,7 @@ cdef extern from "flint/arb_hypgeom.h":
126125
void arb_hypgeom_legendre_p_ui_zero(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong K, slong prec)
127126
void arb_hypgeom_legendre_p_ui_one(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong K, slong prec)
128127
void arb_hypgeom_legendre_p_ui_asymp(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong K, slong prec)
129-
void arb_hypgeom_legendre_p_rec(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong prec)
128+
void arb_hypgeom_legendre_p_ui_rec(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong prec)
130129
void arb_hypgeom_legendre_p_ui(arb_t res, arb_t res_prime, ulong n, const arb_t x, slong prec)
131130
void arb_hypgeom_legendre_p_ui_root(arb_t res, arb_t weight, ulong n, ulong k, slong prec)
132131
void arb_hypgeom_dilog(arb_t res, const arb_t z, slong prec)

0 commit comments

Comments
 (0)