Skip to content

Commit 7552973

Browse files
oscarbenjaminoscarbenjamin
committed
flintlib: move structs to flint.flinblib.types
1 parent 28b4f1f commit 7552973

File tree

109 files changed

+282
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+282
-275
lines changed

‎src/flint/flint_base/flint_base.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flint.flintlib.flint cimport (
1+
from flint.flintlib.types.flint cimport (
22
FLINT_BITS as _FLINT_BITS,
33
FLINT_VERSION as _FLINT_VERSION,
44
__FLINT_RELEASE as _FLINT_RELEASE,

‎src/flint/flint_base/flint_context.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flint.flintlib.arf_types cimport (
1+
from flint.flintlib.types.arf cimport (
22
arf_rnd_t,
33
)
44

‎src/flint/flint_base/flint_context.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from flint.flintlib.arf_types cimport arf_rnd_t
2-
from flint.flintlib.flint cimport (
1+
from flint.flintlib.types.arf cimport arf_rnd_t
2+
from flint.flintlib.types.flint cimport (
33
flint_cleanup,
44
flint_get_num_threads,
55
flint_set_num_threads

‎src/flint/flintlib/acb.pxd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from flint.flintlib.acb_types cimport acb_ptr, acb_srcptr, acb_t
2-
from flint.flintlib.arb_types cimport arb_ptr, arb_srcptr, arb_t, mag_srcptr, mag_t
3-
from flint.flintlib.arf_types cimport arf_srcptr, arf_t
4-
from flint.flintlib.flint cimport flint_rand_t, fmpz_struct, slong, ulong
1+
from flint.flintlib.types.acb cimport acb_ptr, acb_srcptr, acb_t
2+
from flint.flintlib.types.arb cimport arb_ptr, arb_srcptr, arb_t, mag_srcptr, mag_t
3+
from flint.flintlib.types.arf cimport arf_srcptr, arf_t
4+
from flint.flintlib.types.flint cimport flint_rand_t, fmpz_struct, slong, ulong
55
from flint.flintlib.fmpq cimport fmpq_t
6-
from flint.flintlib.fmpz_types cimport fmpz_t
6+
from flint.flintlib.types.fmpz cimport fmpz_t
77

88
# unknown type FILE
99

‎src/flint/flintlib/acb_calc.pxd

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
from flint.flintlib.acb_types cimport acb_calc_func_t, acb_calc_integrate_opt_t, acb_t
2-
from flint.flintlib.arb_types cimport arb_t, mag_t
3-
from flint.flintlib.arf_types cimport arf_t
4-
from flint.flintlib.flint cimport slong
1+
from flint.flintlib.types.acb cimport acb_t
2+
from flint.flintlib.types.arb cimport arb_t, mag_t
3+
from flint.flintlib.types.arf cimport arf_t
4+
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
56

67

78

‎src/flint/flintlib/acb_dft.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from flint.flintlib.acb_types cimport acb_ptr, acb_srcptr
2-
from flint.flintlib.flint cimport slong
1+
from flint.flintlib.types.acb cimport acb_ptr, acb_srcptr
2+
from flint.flintlib.types.flint cimport slong
33

44
# unknown type acb_dft_bluestein_t
55
# unknown type acb_dft_crt_t

‎src/flint/flintlib/acb_dirichlet.pxd

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
from flint.flintlib.acb_types cimport acb_dirichlet_hurwitz_precomp_t, acb_dirichlet_roots_t, acb_poly_t, acb_ptr, acb_srcptr, acb_t
2-
from flint.flintlib.arb_types cimport arb_ptr, arb_srcptr, arb_t, mag_t
3-
from flint.flintlib.arf_types cimport arf_t
1+
from flint.flintlib.types.acb_dirichlet cimport acb_dirichlet_hurwitz_precomp_t, acb_dirichlet_roots_t
2+
from flint.flintlib.types.acb cimport acb_poly_t, acb_ptr, acb_srcptr, acb_t
3+
from flint.flintlib.types.arb cimport arb_ptr, arb_srcptr, arb_t, mag_t
4+
from flint.flintlib.types.arf cimport arf_t
45
from flint.flintlib.dirichlet cimport dirichlet_char_t, dirichlet_group_t
5-
from flint.flintlib.flint cimport slong, ulong
6+
from flint.flintlib.types.flint cimport slong, ulong
67
from flint.flintlib.fmpq cimport fmpq_t
7-
from flint.flintlib.fmpz_types cimport fmpz_t
8+
from flint.flintlib.types.fmpz cimport fmpz_t
89

910

1011

‎src/flint/flintlib/acb_elliptic.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from flint.flintlib.acb_types cimport acb_poly_t, acb_ptr, acb_srcptr, acb_t
2-
from flint.flintlib.flint cimport slong
1+
from flint.flintlib.types.acb cimport acb_poly_t, acb_ptr, acb_srcptr, acb_t
2+
from flint.flintlib.types.flint cimport slong
33

44

55

‎src/flint/flintlib/acb_hypgeom.pxd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from flint.flintlib.acb_types cimport acb_poly_struct, acb_poly_t, acb_ptr, acb_srcptr, acb_t
2-
from flint.flintlib.arb_types cimport mag_t
3-
from flint.flintlib.flint cimport slong, ulong
1+
from flint.flintlib.types.acb cimport acb_poly_struct, acb_poly_t, acb_ptr, acb_srcptr, acb_t
2+
from flint.flintlib.types.arb cimport mag_t
3+
from flint.flintlib.types.flint cimport slong, ulong
44

55

66

‎src/flint/flintlib/acb_mat.pxd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from flint.flintlib.acb_types cimport acb_mat_t, acb_poly_t, acb_ptr, acb_srcptr, acb_t
2-
from flint.flintlib.arb_types cimport arb_mat_t, arb_t, mag_t
3-
from flint.flintlib.flint cimport flint_rand_t, slong, ulong
1+
from flint.flintlib.types.acb cimport acb_mat_t, acb_poly_t, acb_ptr, acb_srcptr, acb_t
2+
from flint.flintlib.types.arb cimport arb_mat_t, arb_t, mag_t
3+
from flint.flintlib.types.flint cimport flint_rand_t, slong, ulong
44
from flint.flintlib.fmpq_mat cimport fmpq_mat_t
5-
from flint.flintlib.fmpz_types cimport fmpz_mat_t, fmpz_t
5+
from flint.flintlib.types.fmpz cimport fmpz_mat_t, fmpz_t
66

77
# unknown type FILE
88

‎src/flint/flintlib/acb_modular.pxd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from flint.flintlib.acb_types cimport acb_poly_t, acb_ptr, acb_srcptr, acb_t
2-
from flint.flintlib.arf_types cimport arf_t
3-
from flint.flintlib.flint cimport flint_rand_t, slong
4-
from flint.flintlib.fmpz_types cimport fmpz_poly_t
1+
from flint.flintlib.types.acb cimport acb_poly_t, acb_ptr, acb_srcptr, acb_t
2+
from flint.flintlib.types.arf cimport arf_t
3+
from flint.flintlib.types.flint cimport flint_rand_t, slong
4+
from flint.flintlib.types.fmpz cimport fmpz_poly_t
55

66
# unknown type FILE
77
# unknown type psl2z_t

‎src/flint/flintlib/acb_poly.pxd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from flint.flintlib.acb_types cimport acb_poly_t, acb_ptr, acb_srcptr, acb_t
2-
from flint.flintlib.arb_types cimport arb_poly_t, arb_ptr, mag_t
3-
from flint.flintlib.flint cimport flint_rand_t, slong, ulong
1+
from flint.flintlib.types.acb cimport acb_poly_t, acb_ptr, acb_srcptr, acb_t
2+
from flint.flintlib.types.arb cimport arb_poly_t, arb_ptr, mag_t
3+
from flint.flintlib.types.flint cimport flint_rand_t, slong, ulong
44
from flint.flintlib.fmpq_poly cimport fmpq_poly_t
5-
from flint.flintlib.fmpz_types cimport fmpz_poly_t, fmpz_t
5+
from flint.flintlib.types.fmpz cimport fmpz_poly_t, fmpz_t
66

77
# unknown type FILE
88

‎src/flint/flintlib/acb_theta.pxd

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
from flint.flintlib.acb_types cimport acb_mat_t, acb_poly_struct, acb_poly_t, acb_ptr, acb_srcptr, acb_t, acb_theta_eld_t, acb_theta_naive_worker_t, acb_theta_ql_worker_t
2-
from flint.flintlib.arb_types cimport arb_mat_t, arb_ptr, arb_srcptr, arb_t
3-
from flint.flintlib.arf_types cimport arf_t
4-
from flint.flintlib.flint cimport flint_rand_t, slong, ulong
5-
from flint.flintlib.fmpz_types cimport fmpz_mat_struct, fmpz_mat_t
1+
from flint.flintlib.types.acb cimport acb_mat_t, acb_poly_struct, acb_poly_t, acb_ptr, acb_srcptr, acb_t
2+
from flint.flintlib.types.acb_theta cimport acb_theta_eld_t, acb_theta_naive_worker_t, acb_theta_ql_worker_t
3+
from flint.flintlib.types.arb cimport arb_mat_t, arb_ptr, arb_srcptr, arb_t
4+
from flint.flintlib.types.arf cimport arf_t
5+
from flint.flintlib.types.flint cimport flint_rand_t, slong, ulong
6+
from flint.flintlib.types.fmpz cimport fmpz_mat_struct, fmpz_mat_t
67

78

89
# .. macro:: acb_theta_eld_dim(E)

‎src/flint/flintlib/acb_types.pxd

Lines changed: 0 additions & 106 deletions
This file was deleted.

‎src/flint/flintlib/arb.pxd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from flint.flintlib.arb_types cimport arb_ptr, arb_srcptr, arb_t, mag_srcptr, mag_t
2-
from flint.flintlib.arf_types cimport arf_rnd_t, arf_srcptr, arf_t
3-
from flint.flintlib.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, nn_ptr, nn_srcptr, slong, ulong
1+
from flint.flintlib.types.arb cimport arb_ptr, arb_srcptr, arb_t, mag_srcptr, mag_t
2+
from flint.flintlib.types.arf cimport arf_rnd_t, arf_srcptr, arf_t
3+
from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, nn_ptr, nn_srcptr, slong, ulong
44
from flint.flintlib.fmpq cimport fmpq_t
5-
from flint.flintlib.fmpz_types cimport fmpz_t
5+
from flint.flintlib.types.fmpz cimport fmpz_t
66

77
# unknown type FILE
88
# unknown type mpfr_rnd_t

‎src/flint/flintlib/arb_fmpz_poly.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from flint.flintlib.arb cimport arb_t
22
from flint.flintlib.acb cimport acb_t, acb_ptr
33
from flint.flintlib.fmpz_poly cimport fmpz_poly_t
4-
from flint.flintlib.flint cimport ulong, slong
4+
from flint.flintlib.types.flint cimport ulong, slong
55
from flint.flintlib.fmpz cimport fmpz_struct
66

77
cdef extern from "flint/arb_fmpz_poly.h":

‎src/flint/flintlib/arb_hypgeom.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from flint.flintlib.arb cimport arb_t, arb_srcptr, arb_ptr
22
from flint.flintlib.arb_poly cimport arb_poly_t
33
from flint.flintlib.fmpz cimport fmpz_t, fmpz_struct
4-
from flint.flintlib.flint cimport ulong, slong
4+
from flint.flintlib.types.flint cimport ulong, slong
55
from flint.flintlib.mag cimport mag_t
66
from flint.flintlib.fmpq cimport fmpq_t, fmpq_struct
77

‎src/flint/flintlib/arb_mat.pxd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from flint.flintlib.arb_types cimport arb_mat_t, arb_poly_t, arb_ptr, arb_srcptr, arb_t, mag_srcptr, mag_t
2-
from flint.flintlib.flint cimport flint_rand_t, slong, ulong
1+
from flint.flintlib.types.arb cimport arb_mat_t, arb_poly_t, arb_ptr, arb_srcptr, arb_t, mag_srcptr, mag_t
2+
from flint.flintlib.types.flint cimport flint_rand_t, slong, ulong
33
from flint.flintlib.fmpq_mat cimport fmpq_mat_t
4-
from flint.flintlib.fmpz_types cimport fmpz_mat_t, fmpz_t
4+
from flint.flintlib.types.fmpz cimport fmpz_mat_t, fmpz_t
55

66
# unknown type FILE
77

‎src/flint/flintlib/arb_poly.pxd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from flint.flintlib.acb_types cimport acb_srcptr, acb_t
2-
from flint.flintlib.arb_types cimport arb_poly_t, arb_ptr, arb_srcptr, arb_t, mag_t
3-
from flint.flintlib.arf_types cimport arf_t
4-
from flint.flintlib.flint cimport flint_rand_t, slong, ulong
1+
from flint.flintlib.types.acb cimport acb_srcptr, acb_t
2+
from flint.flintlib.types.arb cimport arb_poly_t, arb_ptr, arb_srcptr, arb_t, mag_t
3+
from flint.flintlib.types.arf cimport arf_t
4+
from flint.flintlib.types.flint cimport flint_rand_t, slong, ulong
55
from flint.flintlib.fmpq_poly cimport fmpq_poly_t
6-
from flint.flintlib.fmpz_types cimport fmpz_poly_t
6+
from flint.flintlib.types.fmpz cimport fmpz_poly_t
77

88
# unknown type FILE
99

‎src/flint/flintlib/arf.pxd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from flint.flintlib.arb_types cimport mag_t
2-
from flint.flintlib.arf_types cimport arf_rnd_t, arf_srcptr, arf_t
3-
from flint.flintlib.flint cimport flint_rand_t, nn_ptr, nn_srcptr, slong, ulong
1+
from flint.flintlib.types.arb cimport mag_t
2+
from flint.flintlib.types.arf cimport arf_rnd_t, arf_srcptr, arf_t
3+
from flint.flintlib.types.flint cimport flint_rand_t, nn_ptr, nn_srcptr, slong, ulong
44
from flint.flintlib.fmpq cimport fmpq_t
5-
from flint.flintlib.fmpz_types cimport fmpz_t
5+
from flint.flintlib.types.fmpz cimport fmpz_t
66

77
# unknown type FILE
88
# unknown type mpfr_rnd_t

‎src/flint/flintlib/arith.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flint.flintlib.flint cimport ulong, slong, mp_limb_t
1+
from flint.flintlib.types.flint cimport ulong, slong, mp_limb_t
22
from flint.flintlib.fmpz cimport fmpz_t, fmpz_struct
33
from flint.flintlib.fmpz_poly cimport fmpz_poly_t
44
from flint.flintlib.fmpq_poly cimport fmpq_poly_t

‎src/flint/flintlib/bernoulli.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flint.flintlib.flint cimport ulong, slong
1+
from flint.flintlib.types.flint cimport ulong, slong
22
from flint.flintlib.fmpq cimport fmpq_t, fmpq_struct
33
from flint.flintlib.fmpz cimport fmpz_t
44

‎src/flint/flintlib/dirichlet.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flint.flintlib.flint cimport ulong, slong
1+
from flint.flintlib.types.flint cimport ulong, slong
22
from flint.flintlib.nmod cimport nmod_t
33

44
cdef extern from "flint/dirichlet.h":

‎src/flint/flintlib/fmpq.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flint.flintlib.flint cimport ulong, flint_rand_t, mp_bitcnt_t, slong, flint_bitcnt_t
1+
from flint.flintlib.types.flint cimport ulong, flint_rand_t, mp_bitcnt_t, slong, flint_bitcnt_t
22
from flint.flintlib.fmpz cimport fmpz_struct, fmpz_t
33

44
cdef extern from *:

‎src/flint/flintlib/fmpq_mat.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flint.flintlib.flint cimport flint_rand_t, mp_bitcnt_t,slong,flint_bitcnt_t
1+
from flint.flintlib.types.flint cimport flint_rand_t, mp_bitcnt_t,slong,flint_bitcnt_t
22
from flint.flintlib.fmpz cimport fmpz_struct, fmpz_t
33
from flint.flintlib.fmpq cimport fmpq_struct, fmpq_t
44
from flint.flintlib.fmpz_mat cimport fmpz_mat_t

‎src/flint/flintlib/fmpq_mpoly.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from flint.flintlib.fmpq_poly cimport fmpq_poly_t, fmpq_poly_struct
2-
from flint.flintlib.flint cimport slong, mp_limb_t, ulong, flint_bitcnt_t, fmpz_struct, flint_rand_t
2+
from flint.flintlib.types.flint cimport slong, mp_limb_t, ulong, flint_bitcnt_t, fmpz_struct, flint_rand_t
33
from flint.flintlib.fmpz cimport fmpz_t
44
from flint.flintlib.fmpz_mpoly cimport fmpz_mpoly_ctx_t, fmpz_mpoly_t, fmpz_mpoly_struct
55
from flint.flintlib.fmpq cimport fmpq_struct, fmpq_t

‎src/flint/flintlib/fmpq_mpoly_factor.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from flint.flintlib.fmpq cimport fmpq_t
22
from flint.flintlib.fmpz cimport fmpz_t
33
from flint.flintlib.fmpq_mpoly cimport fmpq_mpoly_ctx_t, fmpq_mpoly_t, fmpq_mpoly_struct
4-
from flint.flintlib.flint cimport slong, fmpz_struct
4+
from flint.flintlib.types.flint cimport slong, fmpz_struct
55

66
cdef extern from "flint/fmpq_mpoly_factor.h":
77
ctypedef struct fmpq_mpoly_factor_struct:

‎src/flint/flintlib/fmpq_poly.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flint.flintlib.flint cimport mp_bitcnt_t, flint_rand_t, ulong, slong, flint_bitcnt_t
1+
from flint.flintlib.types.flint cimport mp_bitcnt_t, flint_rand_t, ulong, slong, flint_bitcnt_t
22
from flint.flintlib.fmpz cimport fmpz_struct, fmpz_t
33
from flint.flintlib.fmpz_poly cimport fmpz_poly_t
44
from flint.flintlib.fmpq cimport fmpq_t, fmpq_struct

‎src/flint/flintlib/fmpq_vec.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flint.flintlib.flint cimport flint_bitcnt_t, fmpz_struct, slong, flint_rand_t
1+
from flint.flintlib.types.flint cimport flint_bitcnt_t, fmpz_struct, slong, flint_rand_t
22
from flint.flintlib.fmpq cimport fmpq_t, fmpq_struct
33
from flint.flintlib.fmpz cimport fmpz_t
44

‎src/flint/flintlib/fmpz.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from flint.flintlib.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, nmod_t, nn_ptr, nn_srcptr, slong, ulong
2-
from flint.flintlib.fmpz_types cimport fmpz_factor_t, fmpz_preinvn_t, fmpz_t
1+
from flint.flintlib.types.flint cimport flint_bitcnt_t, flint_rand_t, fmpz_struct, nmod_t, nn_ptr, nn_srcptr, slong, ulong
2+
from flint.flintlib.types.fmpz cimport fmpz_factor_t, fmpz_preinvn_t, fmpz_t
33

44
# unknown type FILE
55
# unknown type fmpz_comb_t

‎src/flint/flintlib/fmpz_factor.pxd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from flint.flintlib.flint cimport flint_rand_t, nn_ptr, slong, ulong
2-
from flint.flintlib.fmpz_types cimport fmpz_factor_t, fmpz_t
1+
from flint.flintlib.types.flint cimport flint_rand_t, nn_ptr, slong, ulong
2+
from flint.flintlib.types.fmpz cimport fmpz_factor_t, fmpz_t
33

44
# unknown type FILE
55
# unknown type ecm_t

0 commit comments

Comments
 (0)