Update import from nmod_vec to nmod and modify paths for arb

Author: GiacomoPope

src/flint/flintlib/acb.pxd

@@ -5,7 +5,7 @@ from flint.flintlib.fmpz cimport fmpz_t, fmpz_struct
 from flint.flintlib.arf cimport arf_t, arf_srcptr
 from flint.flintlib.mag cimport mag_t, mag_srcptr
 
-cdef extern from "acb.h":
+cdef extern from "flint/acb.h":
     ctypedef struct acb_struct:
         arb_struct real
         arb_struct imag

src/flint/flintlib/acb_calc.pxd

@@ -4,7 +4,7 @@ from flint.flintlib.flint cimport slong
 from flint.flintlib.arb cimport arb_t
 from flint.flintlib.arf cimport arf_t
 
-cdef extern from "acb_calc.h":
+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:

src/flint/flintlib/acb_dft.pxd

@@ -1,5 +1,5 @@
 from flint.flintlib.acb cimport acb_ptr, acb_srcptr
 
-cdef extern from "acb_dft.h":
+cdef extern from "flint/acb_dft.h":
     void acb_dft(acb_ptr w, acb_srcptr v, long n, long prec)
     void acb_dft_inverse(acb_ptr w, acb_srcptr v, long n, long prec)

src/flint/flintlib/acb_dirichlet.pxd

@@ -10,7 +10,7 @@ from flint.flintlib.fmpq cimport fmpq_t
 from flint.flintlib.arf cimport arf_t
 from flint.flintlib.arb cimport arb_srcptr
 
-cdef extern from "acb_dirichlet.h":
+cdef extern from "flint/acb_dirichlet.h":
     ctypedef struct acb_dirichlet_roots_struct:
         ulong order
         ulong reduced_order

src/flint/flintlib/acb_elliptic.pxd

@@ -2,7 +2,7 @@ from flint.flintlib.acb cimport acb_t, acb_ptr, acb_srcptr
 from flint.flintlib.acb_poly cimport acb_poly_t
 from flint.flintlib.flint cimport slong
 
-cdef extern from "acb_elliptic.h":
+cdef extern from "flint/acb_elliptic.h":
 # from here on is parsed
     void acb_elliptic_k(acb_t res, const acb_t m, slong prec)
     void acb_elliptic_k_jet(acb_ptr res, const acb_t m, slong len, slong prec)

src/flint/flintlib/acb_hypgeom.pxd

@@ -3,7 +3,7 @@ from flint.flintlib.acb_poly cimport acb_poly_t, acb_poly_struct
 from flint.flintlib.mag cimport mag_t
 from flint.flintlib.flint cimport ulong, slong
 
-cdef extern from "acb_hypgeom.h":
+cdef extern from "flint/acb_hypgeom.h":
 # from here on is parsed
     void acb_hypgeom_rising_ui_forward(acb_t res, const acb_t x, ulong n, slong prec)
     void acb_hypgeom_rising_ui_bs(acb_t res, const acb_t x, ulong n, slong prec)

src/flint/flintlib/acb_mat.pxd

@@ -8,7 +8,7 @@ from flint.flintlib.arb cimport arb_t
 from flint.flintlib.acb cimport  acb_ptr, acb_struct, acb_t, acb_srcptr
 from flint.flintlib.arb_mat cimport arb_mat_t
 
-cdef extern from "acb_mat.h":
+cdef extern from "flint/acb_mat.h":
     ctypedef struct acb_mat_struct:
         acb_ptr entries
         long r

src/flint/flintlib/acb_modular.pxd

@@ -2,7 +2,7 @@ from flint.flintlib.acb cimport acb_t, acb_ptr
 from flint.flintlib.acb_poly cimport acb_poly_t
 from flint.flintlib.fmpz_poly cimport fmpz_poly_t
 
-cdef extern from "acb_modular.h":
+cdef extern from "flint/acb_modular.h":
     void acb_modular_theta(acb_t theta1, acb_t theta2, acb_t theta3, acb_t theta4, const acb_t z, const acb_t tau, long prec)
     void acb_modular_theta_jet(acb_ptr theta1, acb_ptr theta2, acb_ptr theta3, acb_ptr theta4, const acb_t z, const acb_t tau, long len, long prec)
     void acb_modular_theta_series(acb_poly_t theta1, acb_poly_t theta2, acb_poly_t theta3, acb_poly_t theta4, const acb_poly_t z, const acb_t tau, long len, long prec)

src/flint/flintlib/acb_poly.pxd

@@ -7,7 +7,7 @@ from flint.flintlib.mag cimport mag_t
 from flint.flintlib.fmpz cimport fmpz_t
 from flint.flintlib.arb cimport arb_ptr
 
-cdef extern from "acb_poly.h":
+cdef extern from "flint/acb_poly.h":
     ctypedef struct acb_poly_struct:
         acb_ptr coeffs
         long length

src/flint/flintlib/arb.pxd

@@ -4,7 +4,7 @@ from flint.flintlib.fmpq cimport fmpq_t
 from flint.flintlib.arf cimport arf_struct, arf_ptr, arf_t
 from flint.flintlib.mag cimport mag_struct, mag_ptr, mag_t
 
-cdef extern from "arb.h":
+cdef extern from "flint/arb.h":
     ctypedef struct arb_struct:
         arf_struct mid
         mag_struct rad

src/flint/flintlib/arb_fmpz_poly.pxd

@@ -4,7 +4,7 @@ from flint.flintlib.fmpz_poly cimport fmpz_poly_t
 from flint.flintlib.flint cimport ulong, slong
 from flint.flintlib.fmpz cimport fmpz_struct
 
-cdef extern from "arb_fmpz_poly.h":
+cdef extern from "flint/arb_fmpz_poly.h":
 # from here on is parsed
     void _arb_fmpz_poly_evaluate_arb_horner(arb_t res, const fmpz_struct * poly, slong len, const arb_t x, slong prec)
     void arb_fmpz_poly_evaluate_arb_horner(arb_t res, const fmpz_poly_t poly, const arb_t x, slong prec)

src/flint/flintlib/arb_hypgeom.pxd

@@ -5,7 +5,7 @@ from flint.flintlib.flint cimport ulong, slong
 from flint.flintlib.mag cimport mag_t
 from flint.flintlib.fmpq cimport fmpq_t, fmpq_struct
 
-cdef extern from "arb_hypgeom.h":
+cdef extern from "flint/arb_hypgeom.h":
 # from here on is parsed
     void _arb_hypgeom_rising_coeffs_1(ulong * c, ulong k, slong n)
     void _arb_hypgeom_rising_coeffs_2(ulong * c, ulong k, slong n)

src/flint/flintlib/arb_mat.pxd

@@ -7,7 +7,7 @@ from flint.flintlib.fmpz cimport fmpz_t
 from flint.flintlib.arb cimport arb_t, arb_srcptr
 from flint.flintlib.arb_poly cimport arb_poly_t
 
-cdef extern from "arb_mat.h":
+cdef extern from "flint/arb_mat.h":
     ctypedef struct arb_mat_struct:
         arb_ptr entries
         long r

src/flint/flintlib/arb_poly.pxd

@@ -6,7 +6,7 @@ from flint.flintlib.acb cimport acb_t, acb_srcptr
 from flint.flintlib.mag cimport mag_t
 from flint.flintlib.arf cimport arf_t
 
-cdef extern from "arb_poly.h":
+cdef extern from "flint/arb_poly.h":
     ctypedef struct arb_poly_struct:
         arb_ptr coeffs
         long length

src/flint/flintlib/arf.pxd

@@ -3,7 +3,7 @@ from flint.flintlib.flint cimport mp_limb_t, ulong, flint_rand_t, slong
 from flint.flintlib.fmpq cimport fmpq_t
 from flint.flintlib.mag cimport mag_t
 
-cdef extern from "arf.h":
+cdef extern from "flint/arf.h":
     ctypedef struct arf_struct:
         fmpz_struct exp
         long size

src/flint/flintlib/arith.pxd

@@ -4,7 +4,7 @@ from flint.flintlib.fmpz_poly cimport fmpz_poly_t
 from flint.flintlib.fmpq_poly cimport fmpq_poly_t
 from flint.flintlib.fmpq cimport fmpq_t
 from flint.flintlib.fmpz_mat cimport fmpz_mat_t
-from flint.flintlib.nmod_vec cimport nmod_t
+from flint.flintlib.nmod cimport nmod_t
 from flint.flintlib.fmpq cimport fmpq_struct
 
 cdef extern from "flint/arith.h":

src/flint/flintlib/bernoulli.pxd

@@ -2,7 +2,7 @@ from flint.flintlib.flint cimport ulong, slong
 from flint.flintlib.fmpq cimport fmpq_t, fmpq_struct
 from flint.flintlib.fmpz cimport fmpz_t
 
-cdef extern from "bernoulli.h":
+cdef extern from "flint/bernoulli.h":
 # from here on is parsed
     # void bernoulli_rev_init(bernoulli_rev_t iter, ulong n)
     # void bernoulli_rev_next(fmpz_t numer, fmpz_t denom, bernoulli_rev_t iter)

src/flint/flintlib/dirichlet.pxd

@@ -1,7 +1,7 @@
 from flint.flintlib.flint cimport ulong, slong
-from flint.flintlib.nmod_vec cimport nmod_t
+from flint.flintlib.nmod cimport nmod_t
 
-cdef extern from "dirichlet.h":
+cdef extern from "flint/dirichlet.h":
     ctypedef struct dirichlet_group_struct:
         ulong q
         ulong q_even

src/flint/flintlib/mag.pxd

@@ -2,7 +2,7 @@ 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
 
-cdef extern from "mag.h":
+cdef extern from "flint/mag.h":
     ctypedef struct mag_struct:
         fmpz_struct exp
         mp_limb_t man

src/flint/flintlib/nmod_mat.pxd

@@ -1,6 +1,6 @@
 from flint.flintlib.flint cimport mp_limb_t, flint_rand_t, mp_ptr
 from flint.flintlib.flint cimport mp_srcptr, slong, ulong
-from flint.flintlib.nmod_vec cimport nmod_t
+from flint.flintlib.nmod cimport nmod_t
 from flint.flintlib.nmod_poly cimport nmod_poly_t
 from flint.flintlib.fmpz cimport fmpz_t
 

src/flint/flintlib/nmod_poly.pxd

@@ -1,6 +1,6 @@
 from flint.flintlib.flint cimport mp_ptr, mp_limb_t, mp_bitcnt_t, mp_srcptr, slong, flint_bitcnt_t
 from flint.flintlib.flint cimport flint_rand_t, ulong
-from flint.flintlib.nmod_vec cimport nmod_t
+from flint.flintlib.nmod cimport nmod_t
 from flint.flintlib.fmpz cimport fmpz_t
 
 cdef extern from "flint/nmod_poly.h":

src/flint/types/nmod.pxd

@@ -1,6 +1,6 @@
 from flint.flint_base.flint_base cimport flint_scalar
 from flint.flintlib.flint cimport mp_limb_t
-from flint.flintlib.nmod_vec cimport nmod_t
+from flint.flintlib.nmod cimport nmod_t
 
 cdef int any_as_nmod(mp_limb_t * val, obj, nmod_t mod) except -1