From 1a50a80cc00d28f61ac57f0d0d5d3a1897b6c5b0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 8 Sep 2023 15:15:50 -0700 Subject: [PATCH] Replace relative cimports --- src/sage/libs/arb/arith.pyx | 8 +- src/sage/libs/arb/bernoulli.pxd | 2 +- src/sage/libs/coxeter3/coxeter.pxd | 2 +- src/sage/libs/coxeter3/coxeter.pyx | 2 +- src/sage/libs/eclib/homspace.pxd | 2 +- src/sage/libs/eclib/homspace.pyx | 4 +- src/sage/libs/eclib/mat.pxd | 6 +- src/sage/libs/eclib/mat.pyx | 2 +- src/sage/libs/eclib/newforms.pxd | 2 +- src/sage/libs/eclib/newforms.pyx | 2 +- src/sage/libs/flint/arith.pyx | 4 +- src/sage/libs/flint/ntl_interface.pxd | 2 +- src/sage/libs/gap/element.pxd | 2 +- src/sage/libs/gap/element.pyx | 4 +- src/sage/libs/gap/libgap.pyx | 6 +- src/sage/libs/gap/util.pxd | 2 +- src/sage/libs/gap/util.pyx | 4 +- src/sage/libs/glpk/error.pyx | 2 +- src/sage/libs/gmp/all.pxd | 10 +- src/sage/libs/gmp/binop.pxd | 6 +- src/sage/libs/gmp/mpf.pxd | 2 +- src/sage/libs/gmp/mpn.pxd | 2 +- src/sage/libs/gmp/mpq.pxd | 2 +- src/sage/libs/gmp/mpz.pxd | 2 +- src/sage/libs/gmp/pylong.pyx | 2 +- src/sage/libs/gmp/random.pxd | 2 +- src/sage/libs/gsl/airy.pxd | 2 +- src/sage/libs/gsl/all.pxd | 122 +++++++++--------- src/sage/libs/gsl/bessel.pxd | 2 +- src/sage/libs/gsl/blas.pxd | 2 +- src/sage/libs/gsl/block.pxd | 2 +- src/sage/libs/gsl/chebyshev.pxd | 2 +- src/sage/libs/gsl/clausen.pxd | 2 +- src/sage/libs/gsl/combination.pxd | 2 +- src/sage/libs/gsl/complex.pxd | 2 +- src/sage/libs/gsl/coulomb.pxd | 2 +- src/sage/libs/gsl/coupling.pxd | 2 +- src/sage/libs/gsl/dawson.pxd | 2 +- src/sage/libs/gsl/debye.pxd | 2 +- src/sage/libs/gsl/dilog.pxd | 2 +- src/sage/libs/gsl/eigen.pxd | 2 +- src/sage/libs/gsl/elementary.pxd | 2 +- src/sage/libs/gsl/ellint.pxd | 2 +- src/sage/libs/gsl/erf.pxd | 2 +- src/sage/libs/gsl/exp.pxd | 2 +- src/sage/libs/gsl/expint.pxd | 2 +- src/sage/libs/gsl/fermi_dirac.pxd | 2 +- src/sage/libs/gsl/fft.pxd | 2 +- src/sage/libs/gsl/gamma.pxd | 2 +- src/sage/libs/gsl/gegenbauer.pxd | 2 +- src/sage/libs/gsl/histogram.pxd | 2 +- src/sage/libs/gsl/hyperg.pxd | 2 +- src/sage/libs/gsl/integration.pxd | 2 +- src/sage/libs/gsl/laguerre.pxd | 2 +- src/sage/libs/gsl/lambert.pxd | 2 +- src/sage/libs/gsl/legendre.pxd | 2 +- src/sage/libs/gsl/linalg.pxd | 2 +- src/sage/libs/gsl/log.pxd | 2 +- src/sage/libs/gsl/math.pxd | 2 +- src/sage/libs/gsl/matrix.pxd | 2 +- src/sage/libs/gsl/matrix_complex.pxd | 2 +- src/sage/libs/gsl/min.pxd | 2 +- src/sage/libs/gsl/monte.pxd | 2 +- src/sage/libs/gsl/ntuple.pxd | 2 +- src/sage/libs/gsl/permutation.pxd | 2 +- src/sage/libs/gsl/poly.pxd | 2 +- src/sage/libs/gsl/pow_int.pxd | 2 +- src/sage/libs/gsl/psi.pxd | 2 +- src/sage/libs/gsl/random.pxd | 2 +- src/sage/libs/gsl/rng.pxd | 2 +- src/sage/libs/gsl/roots.pxd | 2 +- src/sage/libs/gsl/sort.pxd | 2 +- src/sage/libs/gsl/synchrotron.pxd | 2 +- src/sage/libs/gsl/transport.pxd | 2 +- src/sage/libs/gsl/trig.pxd | 2 +- src/sage/libs/gsl/types.pxd | 2 +- src/sage/libs/gsl/vector.pxd | 2 +- src/sage/libs/gsl/vector_complex.pxd | 2 +- src/sage/libs/gsl/wavelet.pxd | 2 +- src/sage/libs/gsl/zeta.pxd | 2 +- src/sage/libs/linbox/conversion.pxd | 4 +- src/sage/libs/linbox/fflas.pxd | 4 +- src/sage/libs/linbox/linbox.pxd | 2 +- .../libs/linbox/linbox_flint_interface.pyx | 2 +- src/sage/libs/mpmath/ext_libmp.pyx | 2 +- src/sage/libs/mpmath/ext_main.pxd | 2 +- src/sage/libs/mpmath/ext_main.pyx | 2 +- src/sage/libs/pari/convert_flint.pyx | 2 +- src/sage/libs/pari/convert_sage.pyx | 2 +- 89 files changed, 166 insertions(+), 170 deletions(-) diff --git a/src/sage/libs/arb/arith.pyx b/src/sage/libs/arb/arith.pyx index 3b32fe7e8ed..69281d916ce 100644 --- a/src/sage/libs/arb/arith.pyx +++ b/src/sage/libs/arb/arith.pyx @@ -12,10 +12,10 @@ Arithmetic functions using the arb library # http://www.gnu.org/licenses/ #***************************************************************************** -from ..flint.types cimport ulong -from ..flint.fmpq cimport fmpq_t, fmpq_init, fmpq_clear, fmpq_get_mpq -from .bernoulli cimport bernoulli_fmpq_ui -from .acb_modular cimport acb_modular_hilbert_class_poly +from sage.libs.flint.types cimport ulong +from sage.libs.flint.fmpq cimport fmpq_t, fmpq_init, fmpq_clear, fmpq_get_mpq +from sage.libs.arb.bernoulli cimport bernoulli_fmpq_ui +from sage.libs.arb.acb_modular cimport acb_modular_hilbert_class_poly from sage.rings.rational cimport Rational from sage.rings.polynomial.polynomial_integer_dense_flint cimport Polynomial_integer_dense_flint from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing diff --git a/src/sage/libs/arb/bernoulli.pxd b/src/sage/libs/arb/bernoulli.pxd index 375b2b9bbcf..f859ebfb8d7 100644 --- a/src/sage/libs/arb/bernoulli.pxd +++ b/src/sage/libs/arb/bernoulli.pxd @@ -1,7 +1,7 @@ # distutils: libraries = gmp flint ARB_LIBRARY # distutils: depends = bernoulli.h -from ..flint.types cimport fmpq_t, ulong +from sage.libs.flint.types cimport fmpq_t, ulong # bernoulli.h cdef extern from "arb_wrap.h": diff --git a/src/sage/libs/coxeter3/coxeter.pxd b/src/sage/libs/coxeter3/coxeter.pxd index c30ca1925b8..e8a89458e78 100644 --- a/src/sage/libs/coxeter3/coxeter.pxd +++ b/src/sage/libs/coxeter3/coxeter.pxd @@ -8,7 +8,7 @@ #***************************************************************************** from sage.structure.sage_object cimport SageObject -from .decl cimport * +from sage.libs.coxeter3.decl cimport * cdef class String: cdef c_String x diff --git a/src/sage/libs/coxeter3/coxeter.pyx b/src/sage/libs/coxeter3/coxeter.pyx index 1b21b010481..83cd1dccaee 100644 --- a/src/sage/libs/coxeter3/coxeter.pyx +++ b/src/sage/libs/coxeter3/coxeter.pyx @@ -17,7 +17,7 @@ Low level part of the interface to Fokko Ducloux's Coxeter 3 library # https://www.gnu.org/licenses/ # **************************************************************************** -from .decl cimport * +from sage.libs.coxeter3.decl cimport * from cpython.object cimport Py_LT, Py_LE, Py_EQ, Py_NE, Py_GT, Py_GE from sage.cpython.string cimport str_to_bytes, bytes_to_str diff --git a/src/sage/libs/eclib/homspace.pxd b/src/sage/libs/eclib/homspace.pxd index bf315f40ca9..d3600547f1e 100644 --- a/src/sage/libs/eclib/homspace.pxd +++ b/src/sage/libs/eclib/homspace.pxd @@ -1,4 +1,4 @@ -from ..eclib cimport homspace +from sage.libs.eclib cimport homspace cdef class ModularSymbols: cdef homspace* H diff --git a/src/sage/libs/eclib/homspace.pyx b/src/sage/libs/eclib/homspace.pyx index dc52b144328..735de8787e2 100644 --- a/src/sage/libs/eclib/homspace.pyx +++ b/src/sage/libs/eclib/homspace.pyx @@ -4,8 +4,8 @@ from cysignals.signals cimport sig_on, sig_off from cython.operator cimport dereference as deref from cython.operator cimport preincrement as inc -from ..eclib cimport svec, mat, smat -from .mat cimport MatrixFactory +from sage.libs.eclib cimport svec, mat, smat +from sage.libs.eclib.mat cimport MatrixFactory from sage.matrix.matrix_space import MatrixSpace from sage.rings.integer_ring import ZZ diff --git a/src/sage/libs/eclib/mat.pxd b/src/sage/libs/eclib/mat.pxd index 0bba3eb62d5..de8d9e81ad3 100644 --- a/src/sage/libs/eclib/mat.pxd +++ b/src/sage/libs/eclib/mat.pxd @@ -1,11 +1,7 @@ -from ..eclib cimport mat +from sage.libs.eclib cimport mat cdef class Matrix: cdef mat* M cdef class MatrixFactory: cdef new_matrix(self, mat M) noexcept - - - - diff --git a/src/sage/libs/eclib/mat.pyx b/src/sage/libs/eclib/mat.pyx index 24c5ce55fb2..b83cd76b5a5 100644 --- a/src/sage/libs/eclib/mat.pyx +++ b/src/sage/libs/eclib/mat.pyx @@ -2,7 +2,7 @@ Cremona matrices """ -from ..eclib cimport scalar, addscalar +from sage.libs.eclib cimport scalar, addscalar from sage.matrix.matrix_space import MatrixSpace from sage.rings.integer_ring import ZZ diff --git a/src/sage/libs/eclib/newforms.pxd b/src/sage/libs/eclib/newforms.pxd index 9cd1b23a034..7f78a4f9f63 100644 --- a/src/sage/libs/eclib/newforms.pxd +++ b/src/sage/libs/eclib/newforms.pxd @@ -1,4 +1,4 @@ -from ..eclib cimport newforms +from sage.libs.eclib cimport newforms cdef class ECModularSymbol: cdef newforms* nfs diff --git a/src/sage/libs/eclib/newforms.pyx b/src/sage/libs/eclib/newforms.pyx index 2d35716c4db..210c1d9e2c0 100644 --- a/src/sage/libs/eclib/newforms.pyx +++ b/src/sage/libs/eclib/newforms.pyx @@ -13,7 +13,7 @@ Modular symbols using eclib newforms from cysignals.signals cimport sig_on, sig_off -from ..eclib cimport * +from sage.libs.eclib cimport * from sage.libs.gmp.mpq cimport mpq_numref from sage.libs.ntl.convert cimport mpz_to_ZZ from sage.rings.rational_field import QQ diff --git a/src/sage/libs/flint/arith.pyx b/src/sage/libs/flint/arith.pyx index f24446b4ae4..fefe5f07efd 100644 --- a/src/sage/libs/flint/arith.pyx +++ b/src/sage/libs/flint/arith.pyx @@ -15,8 +15,8 @@ FLINT Arithmetic Functions from cysignals.signals cimport sig_on, sig_off -from .fmpz cimport * -from .fmpq cimport * +from sage.libs.flint.fmpz cimport * +from sage.libs.flint.fmpq cimport * from sage.rings.integer cimport Integer diff --git a/src/sage/libs/flint/ntl_interface.pxd b/src/sage/libs/flint/ntl_interface.pxd index d3ba446d8d3..d6112383330 100644 --- a/src/sage/libs/flint/ntl_interface.pxd +++ b/src/sage/libs/flint/ntl_interface.pxd @@ -2,7 +2,7 @@ # distutils: libraries = flint # distutils: depends = flint/NTL-interface.h -from .types cimport fmpz_t, fmpz_poly_t +from sage.libs.flint.types cimport fmpz_t, fmpz_poly_t from sage.libs.ntl.ZZ cimport ZZ_c from sage.libs.ntl.ZZX cimport ZZX_c diff --git a/src/sage/libs/gap/element.pxd b/src/sage/libs/gap/element.pxd index 7882414df20..329001e72f5 100644 --- a/src/sage/libs/gap/element.pxd +++ b/src/sage/libs/gap/element.pxd @@ -8,7 +8,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .gap_includes cimport Obj, UInt +from sage.libs.gap.gap_includes cimport Obj, UInt from sage.structure.sage_object cimport SageObject from sage.structure.element cimport Element, ModuleElement, RingElement diff --git a/src/sage/libs/gap/element.pyx b/src/sage/libs/gap/element.pyx index a5f0dfcd24c..d698fc6bce7 100644 --- a/src/sage/libs/gap/element.pyx +++ b/src/sage/libs/gap/element.pyx @@ -18,9 +18,9 @@ elements. For general information about GAP, you should read the from cpython.object cimport Py_EQ, Py_NE, Py_LE, Py_GE, Py_LT, Py_GT from cysignals.signals cimport sig_on, sig_off -from .gap_includes cimport * +from sage.libs.gap.gap_includes cimport * from .libgap import libgap -from .util cimport * +from sage.libs.gap.util cimport * from .util import GAPError from sage.cpython.string cimport str_to_bytes, char_to_str from sage.rings.integer_ring import ZZ diff --git a/src/sage/libs/gap/libgap.pyx b/src/sage/libs/gap/libgap.pyx index 33a17cff528..3803f32b191 100644 --- a/src/sage/libs/gap/libgap.pyx +++ b/src/sage/libs/gap/libgap.pyx @@ -213,9 +213,9 @@ AUTHORS: from pathlib import Path -from .gap_includes cimport * -from .util cimport * -from .element cimport * +from sage.libs.gap.gap_includes cimport * +from sage.libs.gap.util cimport * +from sage.libs.gap.element cimport * from sage.cpython.string cimport str_to_bytes from sage.structure.parent cimport Parent diff --git a/src/sage/libs/gap/util.pxd b/src/sage/libs/gap/util.pxd index e7b499a7b5a..8b4a7aadce7 100644 --- a/src/sage/libs/gap/util.pxd +++ b/src/sage/libs/gap/util.pxd @@ -8,7 +8,7 @@ # http://www.gnu.org/licenses/ #***************************************************************************** -from .gap_includes cimport Obj +from sage.libs.gap.gap_includes cimport Obj ############################################################################ ### Hooking into the GAP memory management ################################# diff --git a/src/sage/libs/gap/util.pyx b/src/sage/libs/gap/util.pyx index f4f18589e14..177e30fa06a 100644 --- a/src/sage/libs/gap/util.pyx +++ b/src/sage/libs/gap/util.pyx @@ -24,8 +24,8 @@ import os import warnings import sage.env -from .gap_includes cimport * -from .element cimport * +from sage.libs.gap.gap_includes cimport * +from sage.libs.gap.element cimport * from sage.cpython.string import FS_ENCODING from sage.cpython.string cimport str_to_bytes, char_to_str from sage.interfaces.gap_workspace import prepare_workspace_dir diff --git a/src/sage/libs/glpk/error.pyx b/src/sage/libs/glpk/error.pyx index 1d265f3ef65..da5595a7709 100644 --- a/src/sage/libs/glpk/error.pyx +++ b/src/sage/libs/glpk/error.pyx @@ -14,7 +14,7 @@ Error handler for the GLPK library from cysignals.signals cimport sig_error -from .env cimport * +from sage.libs.glpk.env cimport * from cpython.exc cimport PyErr_SetObject from sage.cpython.string cimport char_to_str from sage.numerical.mip import MIPSolverException diff --git a/src/sage/libs/gmp/all.pxd b/src/sage/libs/gmp/all.pxd index c9b26912094..cf1f3fa6417 100644 --- a/src/sage/libs/gmp/all.pxd +++ b/src/sage/libs/gmp/all.pxd @@ -1,5 +1,5 @@ -from .types cimport * -from .random cimport * -from .mpz cimport * -from .mpq cimport * -from .pylong cimport * +from sage.libs.gmp.types cimport * +from sage.libs.gmp.random cimport * +from sage.libs.gmp.mpz cimport * +from sage.libs.gmp.mpq cimport * +from sage.libs.gmp.pylong cimport * diff --git a/src/sage/libs/gmp/binop.pxd b/src/sage/libs/gmp/binop.pxd index 983e6de5214..6b56c24a1b5 100644 --- a/src/sage/libs/gmp/binop.pxd +++ b/src/sage/libs/gmp/binop.pxd @@ -2,9 +2,9 @@ r""" Fast binary operations for basic types """ -from .types cimport mpz_t, mpq_t -from .mpz cimport mpz_set, mpz_add, mpz_mul -from .mpq cimport mpq_canonicalize, mpq_numref, mpq_denref, mpq_add +from sage.libs.gmp.types cimport mpz_t, mpq_t +from sage.libs.gmp.mpz cimport mpz_set, mpz_add, mpz_mul +from sage.libs.gmp.mpq cimport mpq_canonicalize, mpq_numref, mpq_denref, mpq_add cdef inline void mpq_add_z(mpq_t res, mpq_t op1, mpz_t op2) noexcept: mpz_mul(mpq_numref(res), mpq_denref(op1), op2) diff --git a/src/sage/libs/gmp/mpf.pxd b/src/sage/libs/gmp/mpf.pxd index 7095c51073a..b63d84009c0 100644 --- a/src/sage/libs/gmp/mpf.pxd +++ b/src/sage/libs/gmp/mpf.pxd @@ -1,6 +1,6 @@ # distutils: libraries = gmp -from .types cimport * +from sage.libs.gmp.types cimport * cdef extern from "gmp.h": diff --git a/src/sage/libs/gmp/mpn.pxd b/src/sage/libs/gmp/mpn.pxd index 6bc40ff0150..890c5b63da7 100644 --- a/src/sage/libs/gmp/mpn.pxd +++ b/src/sage/libs/gmp/mpn.pxd @@ -1,6 +1,6 @@ # distutils: libraries = gmp -from .types cimport * +from sage.libs.gmp.types cimport * cdef extern from "gmp.h": diff --git a/src/sage/libs/gmp/mpq.pxd b/src/sage/libs/gmp/mpq.pxd index 6b7d9929620..d865630aee0 100644 --- a/src/sage/libs/gmp/mpq.pxd +++ b/src/sage/libs/gmp/mpq.pxd @@ -1,6 +1,6 @@ # distutils: libraries = gmp -from .types cimport * +from sage.libs.gmp.types cimport * cdef extern from "gmp.h": diff --git a/src/sage/libs/gmp/mpz.pxd b/src/sage/libs/gmp/mpz.pxd index 91e35963300..71d1e5e3069 100644 --- a/src/sage/libs/gmp/mpz.pxd +++ b/src/sage/libs/gmp/mpz.pxd @@ -1,6 +1,6 @@ # distutils: libraries = gmp -from .types cimport * +from sage.libs.gmp.types cimport * from libc.stdio cimport FILE from libc.stdint cimport intmax_t, uintmax_t diff --git a/src/sage/libs/gmp/pylong.pyx b/src/sage/libs/gmp/pylong.pyx index 833d44c9bc9..406f2703c1f 100644 --- a/src/sage/libs/gmp/pylong.pyx +++ b/src/sage/libs/gmp/pylong.pyx @@ -30,7 +30,7 @@ from cpython.long cimport PyLong_FromLong from cpython.longintrepr cimport _PyLong_New, py_long, digit, PyLong_SHIFT from sage.cpython.pycore_long cimport (ob_digit, _PyLong_IsNegative, _PyLong_DigitCount, _PyLong_SetSignAndDigitCount) -from .mpz cimport * +from sage.libs.gmp.mpz cimport * cdef extern from *: """ diff --git a/src/sage/libs/gmp/random.pxd b/src/sage/libs/gmp/random.pxd index 6c1a529dbd4..a50657454ca 100644 --- a/src/sage/libs/gmp/random.pxd +++ b/src/sage/libs/gmp/random.pxd @@ -1,6 +1,6 @@ # distutils: libraries = gmp -from .types cimport * +from sage.libs.gmp.types cimport * cdef extern from "gmp.h": diff --git a/src/sage/libs/gsl/airy.pxd b/src/sage/libs/gsl/airy.pxd index f9983ef0d79..7e996d5af81 100644 --- a/src/sage/libs/gsl/airy.pxd +++ b/src/sage/libs/gsl/airy.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_airy.h": diff --git a/src/sage/libs/gsl/all.pxd b/src/sage/libs/gsl/all.pxd index 34e93ea2535..099399d9f3f 100644 --- a/src/sage/libs/gsl/all.pxd +++ b/src/sage/libs/gsl/all.pxd @@ -1,65 +1,65 @@ -from .types cimport * +from sage.libs.gsl.types cimport * -from .math cimport * -from .complex cimport * -from .poly cimport * -from .airy cimport * -from .bessel cimport * -from .clausen cimport * -from .coulomb cimport * -from .coupling cimport * -from .dawson cimport * -from .debye cimport * -from .dilog cimport * -from .elementary cimport * -from .ellint cimport * -from .elljac cimport * -from .erf cimport * -from .exp cimport * -from .expint cimport * -from .fermi_dirac cimport * -from .gamma cimport * -from .gegenbauer cimport * -from .hyperg cimport * -from .laguerre cimport * -from .lambert cimport * -from .legendre cimport * -from .log cimport * -from .pow_int cimport * -from .psi cimport * -from .synchrotron cimport * -from .transport cimport * -from .trig cimport * -from .wavelet cimport * -from .zeta cimport * +from sage.libs.gsl.math cimport * +from sage.libs.gsl.complex cimport * +from sage.libs.gsl.poly cimport * +from sage.libs.gsl.airy cimport * +from sage.libs.gsl.bessel cimport * +from sage.libs.gsl.clausen cimport * +from sage.libs.gsl.coulomb cimport * +from sage.libs.gsl.coupling cimport * +from sage.libs.gsl.dawson cimport * +from sage.libs.gsl.debye cimport * +from sage.libs.gsl.dilog cimport * +from sage.libs.gsl.elementary cimport * +from sage.libs.gsl.ellint cimport * +from sage.libs.gsl.elljac cimport * +from sage.libs.gsl.erf cimport * +from sage.libs.gsl.exp cimport * +from sage.libs.gsl.expint cimport * +from sage.libs.gsl.fermi_dirac cimport * +from sage.libs.gsl.gamma cimport * +from sage.libs.gsl.gegenbauer cimport * +from sage.libs.gsl.hyperg cimport * +from sage.libs.gsl.laguerre cimport * +from sage.libs.gsl.lambert cimport * +from sage.libs.gsl.legendre cimport * +from sage.libs.gsl.log cimport * +from sage.libs.gsl.pow_int cimport * +from sage.libs.gsl.psi cimport * +from sage.libs.gsl.synchrotron cimport * +from sage.libs.gsl.transport cimport * +from sage.libs.gsl.trig cimport * +from sage.libs.gsl.wavelet cimport * +from sage.libs.gsl.zeta cimport * -from .block cimport * -from .vector cimport * -from .vector_complex cimport * -from .matrix cimport * -from .matrix_complex cimport * +from sage.libs.gsl.block cimport * +from sage.libs.gsl.vector cimport * +from sage.libs.gsl.vector_complex cimport * +from sage.libs.gsl.matrix cimport * +from sage.libs.gsl.matrix_complex cimport * -from .permutation cimport * -from .combination cimport * -from .sort cimport * +from sage.libs.gsl.permutation cimport * +from sage.libs.gsl.combination cimport * +from sage.libs.gsl.sort cimport * -from .blas cimport * -from .linalg cimport * -from .eigen cimport * -from .fft cimport * -from .integration cimport * -from .rng cimport * -from .qrng cimport * -from .random cimport * -from .statistics cimport * -from .histogram cimport * -from .ntuple cimport * -from .monte cimport * -from .odeiv cimport * -from .interp cimport * -from .chebyshev cimport * -from .sum cimport * -from .roots cimport * -from .min cimport * -from .fit cimport * -from .errno cimport * +from sage.libs.gsl.blas cimport * +from sage.libs.gsl.linalg cimport * +from sage.libs.gsl.eigen cimport * +from sage.libs.gsl.fft cimport * +from sage.libs.gsl.integration cimport * +from sage.libs.gsl.rng cimport * +from sage.libs.gsl.qrng cimport * +from sage.libs.gsl.random cimport * +from sage.libs.gsl.statistics cimport * +from sage.libs.gsl.histogram cimport * +from sage.libs.gsl.ntuple cimport * +from sage.libs.gsl.monte cimport * +from sage.libs.gsl.odeiv cimport * +from sage.libs.gsl.interp cimport * +from sage.libs.gsl.chebyshev cimport * +from sage.libs.gsl.sum cimport * +from sage.libs.gsl.roots cimport * +from sage.libs.gsl.min cimport * +from sage.libs.gsl.fit cimport * +from sage.libs.gsl.errno cimport * diff --git a/src/sage/libs/gsl/bessel.pxd b/src/sage/libs/gsl/bessel.pxd index e03a0e4866e..8a0a521aa3d 100644 --- a/src/sage/libs/gsl/bessel.pxd +++ b/src/sage/libs/gsl/bessel.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_bessel.h": diff --git a/src/sage/libs/gsl/blas.pxd b/src/sage/libs/gsl/blas.pxd index 509e9639594..7b195751993 100644 --- a/src/sage/libs/gsl/blas.pxd +++ b/src/sage/libs/gsl/blas.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_blas.h": diff --git a/src/sage/libs/gsl/block.pxd b/src/sage/libs/gsl/block.pxd index 76f928736a6..69ee5251dda 100644 --- a/src/sage/libs/gsl/block.pxd +++ b/src/sage/libs/gsl/block.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_block_double.h": diff --git a/src/sage/libs/gsl/chebyshev.pxd b/src/sage/libs/gsl/chebyshev.pxd index c713974b125..06d2da41732 100644 --- a/src/sage/libs/gsl/chebyshev.pxd +++ b/src/sage/libs/gsl/chebyshev.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_chebyshev.h": diff --git a/src/sage/libs/gsl/clausen.pxd b/src/sage/libs/gsl/clausen.pxd index bb34bc5000f..2f92518e171 100644 --- a/src/sage/libs/gsl/clausen.pxd +++ b/src/sage/libs/gsl/clausen.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_clausen.h": diff --git a/src/sage/libs/gsl/combination.pxd b/src/sage/libs/gsl/combination.pxd index a3a2851452d..6072fb2417a 100644 --- a/src/sage/libs/gsl/combination.pxd +++ b/src/sage/libs/gsl/combination.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_combination.h": diff --git a/src/sage/libs/gsl/complex.pxd b/src/sage/libs/gsl/complex.pxd index b6e0a16fbb1..87fd3957b62 100644 --- a/src/sage/libs/gsl/complex.pxd +++ b/src/sage/libs/gsl/complex.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_complex.h": double GSL_REAL(gsl_complex z) diff --git a/src/sage/libs/gsl/coulomb.pxd b/src/sage/libs/gsl/coulomb.pxd index 39fb4bdc54f..7941dff093d 100644 --- a/src/sage/libs/gsl/coulomb.pxd +++ b/src/sage/libs/gsl/coulomb.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_coulomb.h": diff --git a/src/sage/libs/gsl/coupling.pxd b/src/sage/libs/gsl/coupling.pxd index 72052d9db7f..cd5f4d301a6 100644 --- a/src/sage/libs/gsl/coupling.pxd +++ b/src/sage/libs/gsl/coupling.pxd @@ -2,7 +2,7 @@ # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR # distutils: extra_compile_args = -DGSL_DISABLE_DEPRECATED -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_coupling.h": diff --git a/src/sage/libs/gsl/dawson.pxd b/src/sage/libs/gsl/dawson.pxd index 8988a68df7f..9eccc6c4485 100644 --- a/src/sage/libs/gsl/dawson.pxd +++ b/src/sage/libs/gsl/dawson.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_dawson.h": diff --git a/src/sage/libs/gsl/debye.pxd b/src/sage/libs/gsl/debye.pxd index c6e5c86d2ab..ca6d5722e56 100644 --- a/src/sage/libs/gsl/debye.pxd +++ b/src/sage/libs/gsl/debye.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_debye.h": diff --git a/src/sage/libs/gsl/dilog.pxd b/src/sage/libs/gsl/dilog.pxd index 79adc6c28e9..30f633dd5d2 100644 --- a/src/sage/libs/gsl/dilog.pxd +++ b/src/sage/libs/gsl/dilog.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_dilog.h": diff --git a/src/sage/libs/gsl/eigen.pxd b/src/sage/libs/gsl/eigen.pxd index 0ad97189a56..a0568b1f464 100644 --- a/src/sage/libs/gsl/eigen.pxd +++ b/src/sage/libs/gsl/eigen.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_eigen.h": diff --git a/src/sage/libs/gsl/elementary.pxd b/src/sage/libs/gsl/elementary.pxd index f3a026c201f..66e3d39b1e9 100644 --- a/src/sage/libs/gsl/elementary.pxd +++ b/src/sage/libs/gsl/elementary.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_elementary.h": diff --git a/src/sage/libs/gsl/ellint.pxd b/src/sage/libs/gsl/ellint.pxd index d1156a3b285..2c6cdfb9662 100644 --- a/src/sage/libs/gsl/ellint.pxd +++ b/src/sage/libs/gsl/ellint.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_ellint.h": diff --git a/src/sage/libs/gsl/erf.pxd b/src/sage/libs/gsl/erf.pxd index 50cce929848..3035944ae47 100644 --- a/src/sage/libs/gsl/erf.pxd +++ b/src/sage/libs/gsl/erf.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_erf.h": diff --git a/src/sage/libs/gsl/exp.pxd b/src/sage/libs/gsl/exp.pxd index 61d253236f6..875f5564053 100644 --- a/src/sage/libs/gsl/exp.pxd +++ b/src/sage/libs/gsl/exp.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_exp.h": diff --git a/src/sage/libs/gsl/expint.pxd b/src/sage/libs/gsl/expint.pxd index f4155af974c..66e2e7b2091 100644 --- a/src/sage/libs/gsl/expint.pxd +++ b/src/sage/libs/gsl/expint.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_expint.h": diff --git a/src/sage/libs/gsl/fermi_dirac.pxd b/src/sage/libs/gsl/fermi_dirac.pxd index cf23826b800..367fe60f293 100644 --- a/src/sage/libs/gsl/fermi_dirac.pxd +++ b/src/sage/libs/gsl/fermi_dirac.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_fermi_dirac.h": diff --git a/src/sage/libs/gsl/fft.pxd b/src/sage/libs/gsl/fft.pxd index d45e866f82c..8d0bbff58c1 100644 --- a/src/sage/libs/gsl/fft.pxd +++ b/src/sage/libs/gsl/fft.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_fft.h": cdef enum gsl_fft_direction: diff --git a/src/sage/libs/gsl/gamma.pxd b/src/sage/libs/gsl/gamma.pxd index 43f297a08ad..59bcced37be 100644 --- a/src/sage/libs/gsl/gamma.pxd +++ b/src/sage/libs/gsl/gamma.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_gamma.h": diff --git a/src/sage/libs/gsl/gegenbauer.pxd b/src/sage/libs/gsl/gegenbauer.pxd index 4990ea7cd1c..8b3c802a9b9 100644 --- a/src/sage/libs/gsl/gegenbauer.pxd +++ b/src/sage/libs/gsl/gegenbauer.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_gegenbauer.h": diff --git a/src/sage/libs/gsl/histogram.pxd b/src/sage/libs/gsl/histogram.pxd index 794f60a9f89..6e83a5e48a8 100644 --- a/src/sage/libs/gsl/histogram.pxd +++ b/src/sage/libs/gsl/histogram.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_histogram.h": gsl_histogram * gsl_histogram_alloc (size_t n) diff --git a/src/sage/libs/gsl/hyperg.pxd b/src/sage/libs/gsl/hyperg.pxd index e1279e8bb28..3e85ebfb0e4 100644 --- a/src/sage/libs/gsl/hyperg.pxd +++ b/src/sage/libs/gsl/hyperg.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_hyperg.h": diff --git a/src/sage/libs/gsl/integration.pxd b/src/sage/libs/gsl/integration.pxd index 24b3e7d3e9f..0a584a90ecd 100644 --- a/src/sage/libs/gsl/integration.pxd +++ b/src/sage/libs/gsl/integration.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_integration.h": diff --git a/src/sage/libs/gsl/laguerre.pxd b/src/sage/libs/gsl/laguerre.pxd index f40b5907201..14a2bcbee83 100644 --- a/src/sage/libs/gsl/laguerre.pxd +++ b/src/sage/libs/gsl/laguerre.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_laguerre.h": diff --git a/src/sage/libs/gsl/lambert.pxd b/src/sage/libs/gsl/lambert.pxd index 03a511880db..e30e41f0bd9 100644 --- a/src/sage/libs/gsl/lambert.pxd +++ b/src/sage/libs/gsl/lambert.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_lambert.h": diff --git a/src/sage/libs/gsl/legendre.pxd b/src/sage/libs/gsl/legendre.pxd index 982c3a5aee7..f9a69910bc2 100644 --- a/src/sage/libs/gsl/legendre.pxd +++ b/src/sage/libs/gsl/legendre.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_legendre.h": diff --git a/src/sage/libs/gsl/linalg.pxd b/src/sage/libs/gsl/linalg.pxd index 6441b3a3bf8..389ec2e7997 100644 --- a/src/sage/libs/gsl/linalg.pxd +++ b/src/sage/libs/gsl/linalg.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_linalg.h": diff --git a/src/sage/libs/gsl/log.pxd b/src/sage/libs/gsl/log.pxd index 2077b7d2296..35798b2b150 100644 --- a/src/sage/libs/gsl/log.pxd +++ b/src/sage/libs/gsl/log.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_log.h": diff --git a/src/sage/libs/gsl/math.pxd b/src/sage/libs/gsl/math.pxd index 11087d78ca9..0f0a27a58e1 100644 --- a/src/sage/libs/gsl/math.pxd +++ b/src/sage/libs/gsl/math.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_math.h": bint gsl_isnan(double x) diff --git a/src/sage/libs/gsl/matrix.pxd b/src/sage/libs/gsl/matrix.pxd index bf6df93b29b..e1e2009b609 100644 --- a/src/sage/libs/gsl/matrix.pxd +++ b/src/sage/libs/gsl/matrix.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_matrix_double.h": # Allocation diff --git a/src/sage/libs/gsl/matrix_complex.pxd b/src/sage/libs/gsl/matrix_complex.pxd index 5a2366479a5..6cbc983a45e 100644 --- a/src/sage/libs/gsl/matrix_complex.pxd +++ b/src/sage/libs/gsl/matrix_complex.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_matrix_complex_double.h": # Allocation diff --git a/src/sage/libs/gsl/min.pxd b/src/sage/libs/gsl/min.pxd index 0843984a476..25a9770eba0 100644 --- a/src/sage/libs/gsl/min.pxd +++ b/src/sage/libs/gsl/min.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_min.h": diff --git a/src/sage/libs/gsl/monte.pxd b/src/sage/libs/gsl/monte.pxd index 05879875c20..92142abdbcc 100644 --- a/src/sage/libs/gsl/monte.pxd +++ b/src/sage/libs/gsl/monte.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_monte.h": ctypedef struct gsl_monte_function: diff --git a/src/sage/libs/gsl/ntuple.pxd b/src/sage/libs/gsl/ntuple.pxd index 13827e8903f..c47ab38d289 100644 --- a/src/sage/libs/gsl/ntuple.pxd +++ b/src/sage/libs/gsl/ntuple.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_ntuple.h": ctypedef struct gsl_ntuple diff --git a/src/sage/libs/gsl/permutation.pxd b/src/sage/libs/gsl/permutation.pxd index 5bf7cd6ba68..49b10e0611d 100644 --- a/src/sage/libs/gsl/permutation.pxd +++ b/src/sage/libs/gsl/permutation.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_permutation.h": # Allocation diff --git a/src/sage/libs/gsl/poly.pxd b/src/sage/libs/gsl/poly.pxd index 997ecd24eca..ae172cbf07f 100644 --- a/src/sage/libs/gsl/poly.pxd +++ b/src/sage/libs/gsl/poly.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_poly.h": diff --git a/src/sage/libs/gsl/pow_int.pxd b/src/sage/libs/gsl/pow_int.pxd index 0056cc9d402..af5de0263b8 100644 --- a/src/sage/libs/gsl/pow_int.pxd +++ b/src/sage/libs/gsl/pow_int.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_pow_int.h": diff --git a/src/sage/libs/gsl/psi.pxd b/src/sage/libs/gsl/psi.pxd index 4740ebd62a5..fd33ccd636c 100644 --- a/src/sage/libs/gsl/psi.pxd +++ b/src/sage/libs/gsl/psi.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_psi.h": diff --git a/src/sage/libs/gsl/random.pxd b/src/sage/libs/gsl/random.pxd index 80ac3c2016f..21f531265bc 100644 --- a/src/sage/libs/gsl/random.pxd +++ b/src/sage/libs/gsl/random.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_randist.h": unsigned int gsl_ran_bernoulli ( gsl_rng * r, double p) diff --git a/src/sage/libs/gsl/rng.pxd b/src/sage/libs/gsl/rng.pxd index 88ccf7d7a78..b1ab233715e 100644 --- a/src/sage/libs/gsl/rng.pxd +++ b/src/sage/libs/gsl/rng.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_rng.h": cdef gsl_rng_type *gsl_rng_borosh13 diff --git a/src/sage/libs/gsl/roots.pxd b/src/sage/libs/gsl/roots.pxd index 841f94dbc82..2bf1ccf9403 100644 --- a/src/sage/libs/gsl/roots.pxd +++ b/src/sage/libs/gsl/roots.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_roots.h": diff --git a/src/sage/libs/gsl/sort.pxd b/src/sage/libs/gsl/sort.pxd index 892e7a22304..68493a8a1a8 100644 --- a/src/sage/libs/gsl/sort.pxd +++ b/src/sage/libs/gsl/sort.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_heapsort.h": diff --git a/src/sage/libs/gsl/synchrotron.pxd b/src/sage/libs/gsl/synchrotron.pxd index 28581337097..a02c9964fc2 100644 --- a/src/sage/libs/gsl/synchrotron.pxd +++ b/src/sage/libs/gsl/synchrotron.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_synchrotron.h": diff --git a/src/sage/libs/gsl/transport.pxd b/src/sage/libs/gsl/transport.pxd index 389da93e607..6700511a9c9 100644 --- a/src/sage/libs/gsl/transport.pxd +++ b/src/sage/libs/gsl/transport.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_transport.h": diff --git a/src/sage/libs/gsl/trig.pxd b/src/sage/libs/gsl/trig.pxd index 71ae2be0199..c9da72206af 100644 --- a/src/sage/libs/gsl/trig.pxd +++ b/src/sage/libs/gsl/trig.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_trig.h": diff --git a/src/sage/libs/gsl/types.pxd b/src/sage/libs/gsl/types.pxd index 217738be893..7076e2f8861 100644 --- a/src/sage/libs/gsl/types.pxd +++ b/src/sage/libs/gsl/types.pxd @@ -4,7 +4,7 @@ from libc.stdio cimport FILE cdef enum: GSL_SUCCESS -from .blas_types cimport * +from sage.libs.gsl.blas_types cimport * cdef extern from "gsl/gsl_mode.h": ctypedef unsigned int gsl_mode_t diff --git a/src/sage/libs/gsl/vector.pxd b/src/sage/libs/gsl/vector.pxd index fdbdc7c10e5..30960a2d1ef 100644 --- a/src/sage/libs/gsl/vector.pxd +++ b/src/sage/libs/gsl/vector.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_vector.h": # Allocation diff --git a/src/sage/libs/gsl/vector_complex.pxd b/src/sage/libs/gsl/vector_complex.pxd index f712c493962..a784c32880a 100644 --- a/src/sage/libs/gsl/vector_complex.pxd +++ b/src/sage/libs/gsl/vector_complex.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_vector_complex_double.h": # Allocation diff --git a/src/sage/libs/gsl/wavelet.pxd b/src/sage/libs/gsl/wavelet.pxd index 43fcfd50c07..c74052e8bfc 100644 --- a/src/sage/libs/gsl/wavelet.pxd +++ b/src/sage/libs/gsl/wavelet.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_wavelet.h": diff --git a/src/sage/libs/gsl/zeta.pxd b/src/sage/libs/gsl/zeta.pxd index 58143b1d3ee..9b6edbd74b9 100644 --- a/src/sage/libs/gsl/zeta.pxd +++ b/src/sage/libs/gsl/zeta.pxd @@ -1,7 +1,7 @@ # distutils: libraries = GSL_LIBRARIES # distutils: library_dirs = GSL_LIBDIR # distutils: include_dirs = GSL_INCDIR -from .types cimport * +from sage.libs.gsl.types cimport * cdef extern from "gsl/gsl_sf_zeta.h": diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd index f140a0fc321..a4cdd09711d 100644 --- a/src/sage/libs/linbox/conversion.pxd +++ b/src/sage/libs/linbox/conversion.pxd @@ -29,8 +29,8 @@ from libcpp.vector cimport vector as cppvector from sage.libs.gmp.mpz cimport mpz_set -from .givaro cimport Modular_uint64, ZRing, Integer -from .linbox cimport SparseMatrix_Modular_uint64, SparseMatrix_integer, DenseVector_integer +from sage.libs.linbox.givaro cimport Modular_uint64, ZRing, Integer +from sage.libs.linbox.linbox cimport SparseMatrix_Modular_uint64, SparseMatrix_integer, DenseVector_integer from sage.matrix.matrix_modn_sparse cimport Matrix_modn_sparse from sage.matrix.matrix_integer_sparse cimport Matrix_integer_sparse diff --git a/src/sage/libs/linbox/fflas.pxd b/src/sage/libs/linbox/fflas.pxd index f7ca98c614c..d5b077cf045 100644 --- a/src/sage/libs/linbox/fflas.pxd +++ b/src/sage/libs/linbox/fflas.pxd @@ -13,8 +13,8 @@ # distutils: extra_link_args = FFLASFFPACK_LIBEXTRA # distutils: language = c++ -from .givaro cimport Modular_double, Modular_float, Dense, Sparse -from .givaro cimport givvector, Poly1Dom +from sage.libs.linbox.givaro cimport Modular_double, Modular_float, Dense, Sparse +from sage.libs.linbox.givaro cimport givvector, Poly1Dom from libcpp.vector cimport vector from libcpp cimport bool ctypedef Poly1Dom[Modular_double, Dense] PolynomialRing_Modular_double diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd index bfeda4b6042..6792e260a34 100644 --- a/src/sage/libs/linbox/linbox.pxd +++ b/src/sage/libs/linbox/linbox.pxd @@ -8,7 +8,7 @@ from libc.stdint cimport uint32_t, uint64_t from libcpp.vector cimport vector as cppvector -from .givaro cimport * +from sage.libs.linbox.givaro cimport * cdef extern from "linbox/matrix/dense-matrix.h": ## template ::Dense > diff --git a/src/sage/libs/linbox/linbox_flint_interface.pyx b/src/sage/libs/linbox/linbox_flint_interface.pyx index dabd375c2b8..1979ac0f0a4 100644 --- a/src/sage/libs/linbox/linbox_flint_interface.pyx +++ b/src/sage/libs/linbox/linbox_flint_interface.pyx @@ -40,7 +40,7 @@ from sage.libs.flint.fmpz_poly cimport fmpz_poly_set_coeff_mpz, fmpz_poly_fit_le cimport sage.libs.linbox.givaro as givaro cimport sage.libs.linbox.linbox as linbox -from .linbox cimport PolynomialRing_integer +from sage.libs.linbox.linbox cimport PolynomialRing_integer cdef void fmpz_mat_get_linbox(linbox.DenseMatrix_integer& A, fmpz_mat_t m) noexcept: diff --git a/src/sage/libs/mpmath/ext_libmp.pyx b/src/sage/libs/mpmath/ext_libmp.pyx index 5dccf596a91..b0899439fd5 100644 --- a/src/sage/libs/mpmath/ext_libmp.pyx +++ b/src/sage/libs/mpmath/ext_libmp.pyx @@ -1,7 +1,7 @@ """ Faster versions of some key functions in mpmath.libmp """ -from .ext_impl cimport * +from sage.libs.mpmath.ext_impl cimport * from sage.libs.gmp.all cimport * # the next line is used by mpmath diff --git a/src/sage/libs/mpmath/ext_main.pxd b/src/sage/libs/mpmath/ext_main.pxd index d810e75f544..8a3bf740b0e 100644 --- a/src/sage/libs/mpmath/ext_main.pxd +++ b/src/sage/libs/mpmath/ext_main.pxd @@ -1 +1 @@ -from .ext_impl cimport * +from sage.libs.mpmath.ext_impl cimport * diff --git a/src/sage/libs/mpmath/ext_main.pyx b/src/sage/libs/mpmath/ext_main.pyx index a00c5ee4831..4b717bb3860 100644 --- a/src/sage/libs/mpmath/ext_main.pyx +++ b/src/sage/libs/mpmath/ext_main.pyx @@ -38,7 +38,7 @@ DEF S_INF = 3 DEF S_NINF = 4 DEF S_NAN = 5 -from .ext_impl cimport * +from sage.libs.mpmath.ext_impl cimport * import mpmath.rational as rationallib import mpmath.libmp as libmp diff --git a/src/sage/libs/pari/convert_flint.pyx b/src/sage/libs/pari/convert_flint.pyx index 340e72c13bb..c8e1ddb00cf 100644 --- a/src/sage/libs/pari/convert_flint.pyx +++ b/src/sage/libs/pari/convert_flint.pyx @@ -28,7 +28,7 @@ from sage.libs.flint.fmpq_mat cimport fmpq_mat_nrows, fmpq_mat_ncols, fmpq_mat_e from cypari2.paridecl cimport * from cypari2.stack cimport new_gen -from .convert_gmp cimport _new_GEN_from_mpz_t +from sage.libs.pari.convert_gmp cimport _new_GEN_from_mpz_t cdef inline GEN _new_GEN_from_fmpz_t(fmpz_t value) noexcept: diff --git a/src/sage/libs/pari/convert_sage.pyx b/src/sage/libs/pari/convert_sage.pyx index 500ed520312..7ee32b27b28 100644 --- a/src/sage/libs/pari/convert_sage.pyx +++ b/src/sage/libs/pari/convert_sage.pyx @@ -22,7 +22,7 @@ from cypari2.types cimport (GEN, typ, t_INT, t_FRAC, t_REAL, t_COMPLEX, lg, precp) from cypari2.paridecl cimport * from cypari2.stack cimport new_gen -from .convert_gmp cimport INT_to_mpz, new_gen_from_mpz_t, new_gen_from_mpq_t, INTFRAC_to_mpq +from sage.libs.pari.convert_gmp cimport INT_to_mpz, new_gen_from_mpz_t, new_gen_from_mpq_t, INTFRAC_to_mpq from sage.ext.stdsage cimport PY_NEW from sage.libs.gmp.mpz cimport mpz_fits_slong_p, mpz_sgn, mpz_get_ui, mpz_set, mpz_set_si, mpz_set_ui