diff --git a/src/flint/_flint.pxd b/src/flint/_flint.pxd index 8806fb57..c0218e25 100644 --- a/src/flint/_flint.pxd +++ b/src/flint/_flint.pxd @@ -70,30 +70,6 @@ cdef extern from *: """ slong pylong_as_slong(PyObject *pylong, int *overflow) -from flint.flintlib.nmod_poly cimport nmod_poly_t -from flint.flintlib.nmod_mat cimport nmod_mat_t -from flint.flintlib.fmpz cimport fmpz_t -from flint.flintlib.fmpz_poly cimport fmpz_poly_t, fmpz_poly_struct -from flint.flintlib.fmpz_mat cimport fmpz_mat_struct, fmpz_mat_t -from flint.flintlib.fmpq cimport fmpq_t, fmpq_struct -from flint.flintlib.fmpq_poly cimport fmpq_poly_struct, fmpq_poly_t -from flint.flintlib.fmpq_mat cimport fmpq_mat_t -from flint.flintlib.mag cimport mag_struct, mag_t, mag_ptr, mag_srcptr - -from flint.flintlib.arf cimport arf_struct, arf_t, arf_ptr, arf_srcptr, arf_rnd_t -from flint.flintlib.arb cimport arb_struct, arb_ptr, arb_srcptr, arb_t -from flint.flintlib.arb cimport arb_midref, arb_radref -from flint.flintlib.acb cimport acb_struct, acb_ptr, acb_srcptr, acb_t -from flint.flintlib.acb cimport acb_realref, acb_imagref -from flint.flintlib.arb_poly cimport arb_poly_struct, arb_poly_t -from flint.flintlib.arb_mat cimport arb_mat_struct, arb_mat_t -# from flint.flintlib.acb_poly cimport acb_poly_struct, acb_poly_t -# from flint.flintlib.acb_mat cimport acb_mat_struct, acb_mat_t -# from flint.flintlib.dirichlet cimport dirichlet_group_struct, dirichlet_group_t -# from flint.flintlib.dirichlet cimport dirichlet_char_struct, dirichlet_char_t -# from flint.flintlib.mpoly cimport ordering_t, mpoly_ctx_struct, mpoly_ctx_t - - """ cdef extern from "flint/fmpz_mpoly_factor.h": diff --git a/src/flint/flint_base/flint_context.pxd b/src/flint/flint_base/flint_context.pxd index 2bcfcdb0..89bf34c0 100644 --- a/src/flint/flint_base/flint_context.pxd +++ b/src/flint/flint_base/flint_context.pxd @@ -1,4 +1,4 @@ -from flint._flint cimport ( +from flint.flintlib.arf cimport ( arf_rnd_t, ) diff --git a/src/flint/pyflint.pxd b/src/flint/pyflint.pxd index 53a09575..d34fb964 100644 --- a/src/flint/pyflint.pxd +++ b/src/flint/pyflint.pxd @@ -1,4 +1,4 @@ -from flint._flint cimport * +from flint.flintlib.arf cimport arf_rnd_t from flint.flint_base.flint_base cimport flint_mat from flint.flint_base.flint_base cimport flint_mpoly from flint.flint_base.flint_base cimport flint_series diff --git a/src/flint/types/acb.pxd b/src/flint/types/acb.pxd index e8ba4faf..5c2781f5 100644 --- a/src/flint/types/acb.pxd +++ b/src/flint/types/acb.pxd @@ -1,5 +1,5 @@ from flint.flint_base.flint_base cimport flint_scalar -from flint._flint cimport acb_t +from flint.flintlib.acb cimport acb_t cdef any_as_acb(x) cdef any_as_acb_or_notimplemented(x) diff --git a/src/flint/types/arb.pxd b/src/flint/types/arb.pxd index ec18a499..fbe1447e 100644 --- a/src/flint/types/arb.pxd +++ b/src/flint/types/arb.pxd @@ -1,6 +1,6 @@ from flint.flint_base.flint_base cimport flint_scalar -from flint._flint cimport arb_t +from flint.flintlib.arb cimport arb_t cdef any_as_arb_or_notimplemented(x) cdef int arb_set_python(arb_t x, obj, bint allow_conversion) except -1 diff --git a/src/flint/types/arb_mat.pxd b/src/flint/types/arb_mat.pxd index 6446a85f..b7c578c7 100644 --- a/src/flint/types/arb_mat.pxd +++ b/src/flint/types/arb_mat.pxd @@ -1,5 +1,5 @@ from flint.flint_base.flint_base cimport flint_mat -from flint._flint cimport arb_mat_t +from flint.flintlib.arb_mat cimport arb_mat_t cdef class arb_mat(flint_mat): cdef arb_mat_t val diff --git a/src/flint/types/arb_poly.pxd b/src/flint/types/arb_poly.pxd index 072b5ac6..536e39dc 100644 --- a/src/flint/types/arb_poly.pxd +++ b/src/flint/types/arb_poly.pxd @@ -1,5 +1,5 @@ from flint.flint_base.flint_base cimport flint_poly -from flint._flint cimport arb_poly_t +from flint.flintlib.arb_poly cimport arb_poly_t cdef arb_poly_set_list(arb_poly_t poly, list val, long prec) diff --git a/src/flint/types/arb_series.pxd b/src/flint/types/arb_series.pxd index 2506550d..efbd35ad 100644 --- a/src/flint/types/arb_series.pxd +++ b/src/flint/types/arb_series.pxd @@ -1,6 +1,6 @@ from flint.flint_base.flint_base cimport flint_series -from flint._flint cimport arb_poly_t +from flint.flintlib.arb_poly cimport arb_poly_t cdef class arb_series(flint_series): cdef arb_poly_t val diff --git a/src/flint/types/arf.pxd b/src/flint/types/arf.pxd index 4ef65d9c..1784585b 100644 --- a/src/flint/types/arf.pxd +++ b/src/flint/types/arf.pxd @@ -1,4 +1,4 @@ -from flint._flint cimport arf_t +from flint.flintlib.arf cimport arf_t cdef class arf: cdef arf_t val diff --git a/src/flint/types/fmpq.pxd b/src/flint/types/fmpq.pxd index 92e899ff..3ef00f3c 100644 --- a/src/flint/types/fmpq.pxd +++ b/src/flint/types/fmpq.pxd @@ -1,6 +1,6 @@ from flint.flint_base.flint_base cimport flint_scalar -from flint._flint cimport fmpq_t +from flint.flintlib.fmpq cimport fmpq_t cdef any_as_fmpq(obj) cdef class fmpq(flint_scalar): diff --git a/src/flint/types/fmpq_mat.pxd b/src/flint/types/fmpq_mat.pxd index 6713516d..702002f8 100644 --- a/src/flint/types/fmpq_mat.pxd +++ b/src/flint/types/fmpq_mat.pxd @@ -1,6 +1,6 @@ from flint.flint_base.flint_base cimport flint_mat -from flint._flint cimport fmpq_mat_t +from flint.flintlib.fmpq_mat cimport fmpq_mat_t from flint.types.fmpz cimport fmpz from flint.types.fmpq cimport fmpq from flint.types.fmpz_mat cimport fmpz_mat diff --git a/src/flint/types/fmpq_poly.pxd b/src/flint/types/fmpq_poly.pxd index a83a45d9..2353cded 100644 --- a/src/flint/types/fmpq_poly.pxd +++ b/src/flint/types/fmpq_poly.pxd @@ -1,5 +1,5 @@ from flint.flint_base.flint_base cimport flint_poly -from flint._flint cimport fmpq_poly_t +from flint.flintlib.fmpq_poly cimport fmpq_poly_t cdef fmpq_poly_set_list(fmpq_poly_t poly, list val) cdef any_as_fmpq_poly(obj) diff --git a/src/flint/types/fmpq_series.pxd b/src/flint/types/fmpq_series.pxd index 7aa92929..968791b8 100644 --- a/src/flint/types/fmpq_series.pxd +++ b/src/flint/types/fmpq_series.pxd @@ -1,5 +1,5 @@ from flint.flint_base.flint_base cimport flint_series -from flint._flint cimport fmpq_poly_t +from flint.flintlib.fmpq_poly cimport fmpq_poly_t cdef class fmpq_series(flint_series): cdef fmpq_poly_t val diff --git a/src/flint/types/fmpz.pxd b/src/flint/types/fmpz.pxd index bf800df9..d23f5f71 100644 --- a/src/flint/types/fmpz.pxd +++ b/src/flint/types/fmpz.pxd @@ -3,9 +3,9 @@ from cpython.long cimport PyLong_Check from flint.flint_base.flint_base cimport flint_scalar from flint.utils.conversion cimport chars_from_str -from flint._flint cimport fmpz_t, slong, pylong_as_slong +from flint._flint cimport slong, pylong_as_slong from flint._flint cimport PyObject -from flint.flintlib.fmpz cimport fmpz_set_str, fmpz_set_si +from flint.flintlib.fmpz cimport fmpz_t, fmpz_set_str, fmpz_set_si from cpython.version cimport PY_MAJOR_VERSION diff --git a/src/flint/types/fmpz_mat.pxd b/src/flint/types/fmpz_mat.pxd index b4554858..ae482653 100644 --- a/src/flint/types/fmpz_mat.pxd +++ b/src/flint/types/fmpz_mat.pxd @@ -1,5 +1,5 @@ from flint.flint_base.flint_base cimport flint_mat -from flint._flint cimport fmpz_mat_t +from flint.flintlib.fmpz_mat cimport fmpz_mat_t from flint.types.fmpz cimport fmpz cdef any_as_fmpz_mat(obj) diff --git a/src/flint/types/fmpz_poly.pxd b/src/flint/types/fmpz_poly.pxd index a58e39d4..61bc109d 100644 --- a/src/flint/types/fmpz_poly.pxd +++ b/src/flint/types/fmpz_poly.pxd @@ -1,7 +1,7 @@ from flint.flint_base.flint_base cimport flint_poly -from flint._flint cimport fmpz_poly_t +from flint.flintlib.fmpz_poly cimport fmpz_poly_t cdef fmpz_poly_set_list(fmpz_poly_t poly, list val) diff --git a/src/flint/types/fmpz_series.pxd b/src/flint/types/fmpz_series.pxd index 7a5df67d..3c476a28 100644 --- a/src/flint/types/fmpz_series.pxd +++ b/src/flint/types/fmpz_series.pxd @@ -1,6 +1,6 @@ from flint.flint_base.flint_base cimport flint_series -from flint._flint cimport fmpz_poly_t +from flint.flintlib.fmpz_poly cimport fmpz_poly_t cdef class fmpz_series(flint_series): cdef fmpz_poly_t val diff --git a/src/flint/types/nmod_mat.pxd b/src/flint/types/nmod_mat.pxd index d7c0e1c1..7a31e15b 100644 --- a/src/flint/types/nmod_mat.pxd +++ b/src/flint/types/nmod_mat.pxd @@ -1,6 +1,6 @@ from flint.flint_base.flint_base cimport flint_mat -from flint._flint cimport nmod_mat_t +from flint.flintlib.nmod_mat cimport nmod_mat_t from flint._flint cimport mp_limb_t cdef class nmod_mat: diff --git a/src/flint/types/nmod_poly.pxd b/src/flint/types/nmod_poly.pxd index 1bf91747..ab33f64c 100644 --- a/src/flint/types/nmod_poly.pxd +++ b/src/flint/types/nmod_poly.pxd @@ -1,6 +1,6 @@ from flint.flint_base.flint_base cimport flint_poly -from flint._flint cimport nmod_poly_t +from flint.flintlib.nmod_poly cimport nmod_poly_t from flint._flint cimport mp_limb_t cdef class nmod_poly(flint_poly):