sagemathgh-37484: Support flint 3.1 in sagelib

Drop uses of deprecated API - `fmpq_get_mpz_frac/fmpq_init_set_mpz_frac_readonly`, replace by verbatim code from the removed functions - `arb_version` was only used by the obsolete `arb216` and `arb218` doctest tags, remove it URL: sagemath#37484 Reported by: Antonio Rojas Reviewer(s): Dima Pasechnik, Gonzalo Tornaría, Marc Mezzarobba
enriqueartal · Feb 28, 2024 · 686e933 · 686e933
2 parents 344b06d + 6e904cf
commit 686e933
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 64 deletions.
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=a3fc8c3bf9198d28a8f2d5a08cffdcf519150b77
-md5=32f4f1763765232dc7e7431d5e48e129
-cksum=708121316
+sha1=ebe07f8b9c90595aae4f92d51ad510bc533f3a37
+md5=032461abc5cf4561d30156cafb8afae0
+cksum=3521715274
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-0fb793fa91a0b46de452036b521cbbaeee878340
+c25d6e998d4a3b23a1b13ae9e47d6fec59cea382
diff --git a/src/.relint.yml b/src/.relint.yml
@@ -71,4 +71,4 @@
     magic doctest comments should appear on the "sage:" line, not "....:" lines
   # see optional_regex in src/sage/doctest/parsing.py
   # "indirect doctest" is from src/bin/sage-coverage
-  pattern: '^[ 	]*[.][.][.][.]:.*#.*(arb216|arb218|py2|py3|long time|not implemented|not tested|known bug|optional|indirect doctest)'
+  pattern: '^[ 	]*[.][.][.][.]:.*#.*(py2|py3|long time|not implemented|not tested|known bug|optional|indirect doctest)'
diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py
@@ -58,14 +58,6 @@
 
 auto_optional_tags = set()
 
-try:
-    from sage.libs.arb.arb_version import version as arb_vers
-    arb_tag = 'arb2' + arb_vers().split('.')[1]
-    auto_optional_tags.add(arb_tag)
-except ImportError:
-    pass
-
-
 class DocTestDefaults(SageObject):
     """
     This class is used for doctesting the Sage doctest module.

diff --git a/src/sage/doctest/parsing.py b/src/sage/doctest/parsing.py
@@ -95,7 +95,7 @@ def fake_RIFtol(*args):
 ansi_escape_sequence = re.compile(r"(\x1b[@-Z\\-~]|\x1b\[.*?[@-~]|\x9b.*?[@-~])")
 
 special_optional_regex = (
-    "arb216|arb218|py2|long time|not implemented|not tested|optional|needs|known bug"
+    "py2|long time|not implemented|not tested|optional|needs|known bug"
 )
 tag_with_explanation_regex = r"((?:\w|[.])*)\s*(?:\((?P<cmd_explanation>.*?)\))?"
 optional_regex = re.compile(
@@ -136,8 +136,6 @@ def parse_optional_tags(
     - ``'not tested'``
     - ``'known bug'`` (possible values are ``None``, ``linux`` and ``macos``)
     - ``'py2'``
-    - ``'arb216'``
-    - ``'arb218'``
     - ``'optional - FEATURE...'`` or ``'needs FEATURE...'`` --
       the dictionary will just have the key ``'FEATURE'``
 

diff --git a/src/sage/libs/arb/arb_version.pyx b/src/sage/libs/arb/arb_version.pyx
diff --git a/src/sage/libs/flint/flint_wrap.h b/src/sage/libs/flint/flint_wrap.h
@@ -136,8 +136,6 @@
 #include <flint/hypgeom.h>
 #include <flint/long_extras.h>
 #include <flint/mag.h>
-#include <flint/mpf_mat.h>
-#include <flint/mpf_vec.h>
 #include <flint/mpfr_mat.h>
 #include <flint/mpfr_vec.h>
 #include <flint/mpn_extras.h>

diff --git a/src/sage/libs/flint/fmpq.pxd b/src/sage/libs/flint/fmpq.pxd
@@ -41,14 +41,12 @@ cdef extern from "flint_wrap.h":
     void fmpq_height(fmpz_t height, const fmpq_t x) noexcept
     flint_bitcnt_t fmpq_height_bits(const fmpq_t x) noexcept
     void fmpq_set_fmpz_frac(fmpq_t res, const fmpz_t p, const fmpz_t q) noexcept
-    void fmpq_get_mpz_frac(mpz_t a, mpz_t b, fmpq_t c) noexcept
     void fmpq_set_si(fmpq_t res, slong p, ulong q) noexcept
     void _fmpq_set_si(fmpz_t rnum, fmpz_t rden, slong p, ulong q) noexcept
     void fmpq_set_ui(fmpq_t res, ulong p, ulong q) noexcept
     void _fmpq_set_ui(fmpz_t rnum, fmpz_t rden, ulong p, ulong q) noexcept
     void fmpq_set_mpq(fmpq_t dest, const mpq_t src) noexcept
     int fmpq_set_str(fmpq_t dest, const char * s, int base) noexcept
-    void fmpq_init_set_mpz_frac_readonly(fmpq_t z, const mpz_t p, const mpz_t q) noexcept
     double fmpq_get_d(const fmpq_t f) noexcept
     void fmpq_get_mpq(mpq_t dest, const fmpq_t src) noexcept
     int fmpq_get_mpfr(mpfr_t dest, const fmpq_t src, mpfr_rnd_t rnd) noexcept

diff --git a/src/sage/rings/complex_arb.pyx b/src/sage/rings/complex_arb.pyx
@@ -4792,18 +4792,14 @@ cdef class ComplexBall(RingElement):
 
             sage: n = CBF(1,1)
             sage: m = CBF(-2/3, 3/5)
-            sage: n.elliptic_pi_inc(CBF.pi()/2, m) # arb216
-            [0.8934793755173 +/- ...e-14] + [0.95707868710750 +/- ...e-15]*I
-            sage: n.elliptic_pi_inc(CBF.pi()/2, m) # arb218 - this is a regression, see :trac:28623
+            sage: n.elliptic_pi_inc(CBF.pi()/2, m) # this is a regression, see :trac:28623
             nan + nan*I
             sage: n.elliptic_pi(m)
             [0.8934793755173...] + [0.957078687107...]*I
 
             sage: n = CBF(2, 3/7)
             sage: m = CBF(-1/3, 2/9)
-            sage: n.elliptic_pi_inc(CBF.pi()/2, m) # arb216
-            [0.2969588746419 +/- ...e-14] + [1.3188795332738 +/- ...e-14]*I
-            sage: n.elliptic_pi_inc(CBF.pi()/2, m) # arb218 -  this is a regression, see :trac:28623
+            sage: n.elliptic_pi_inc(CBF.pi()/2, m) # this is a regression, see :trac:28623
             nan + nan*I
             sage: n.elliptic_pi(m)
             [0.296958874641...] + [1.318879533273...]*I

diff --git a/src/sage/rings/real_arb.pyx b/src/sage/rings/real_arb.pyx
@@ -294,11 +294,7 @@ cdef int arb_to_mpfi(mpfi_t target, arb_t source, const long precision) except -
 
     EXAMPLES::
 
-        sage: RIF(RBF(2)**(2**100)) # arb216 # indirect doctest
-        Traceback (most recent call last):
-        ...
-        ArithmeticError: Error converting arb to mpfi. Overflow?
-        sage: RIF(RBF(2)**(2**100)) # arb218 # indirect doctest
+        sage: RIF(RBF(2)**(2**100))
         [5.8756537891115869e1388255822130839282 .. +infinity] # 64-bit
         [2.098... .. +infinity]                               # 32-bit
 
@@ -1729,11 +1725,7 @@ cdef class RealBall(RingElement):
         ::
 
             sage: b = RBF(2)^(2^1000)
-            sage: b.mid() # arb216
-            Traceback (most recent call last):
-            ...
-            RuntimeError: unable to convert to MPFR (exponent out of range?)
-            sage: b.mid() # arb218
+            sage: b.mid()
             +infinity
 
         .. SEEALSO:: :meth:`rad`, :meth:`squash`

diff --git a/src/sage/symbolic/ginac/useries-flint.h b/src/sage/symbolic/ginac/useries-flint.h
@@ -27,9 +27,6 @@
 #include "flint/fmpq_poly.h"
 #include "flint/fmpq.h"
 
-extern "C" void fmpq_get_mpz_frac(mpz_t a, mpz_t b, fmpq_t c);
-extern "C" void fmpq_init_set_mpz_frac_readonly(fmpq_t z, const mpz_t p, const mpz_t q);
-
 #include <stdexcept>
 
 

diff --git a/src/sage/symbolic/ginac/useries.cpp b/src/sage/symbolic/ginac/useries.cpp
@@ -550,14 +550,16 @@ void power::useries(flint_series_t& fp, int order) const
                         mpz_t cnum, cden;
                         mpz_init(cnum);
                         mpz_init(cden);
-                        fmpq_get_mpz_frac(cnum, cden, c);
+                        fmpz_get_mpz(cnum, fmpq_numref(c));
+                        fmpz_get_mpz(cden, fmpq_denref(c));
                         if (not mpz_perfect_square_p(cnum)
                             or not mpz_perfect_square_p(cden))
                                 throw flint_error();
                         mpz_sqrt(cnum, cnum);
                         mpz_sqrt(cden, cden);
                         fmpq_t cc;
-                        fmpq_init_set_mpz_frac_readonly(cc, cnum, cden);
+                        fmpz_init_set_readonly(fmpq_numref(cc), cnum);
+                        fmpz_init_set_readonly(fmpq_denref(cc), cden);
                         mpz_clear(cnum);
                         mpz_clear(cden);