Merge remote-tracking branch 'origin/master' into fmpz_mod_mpoly_and_nmod_mpoly

Author: Jake-Moss

README.md

@@ -133,11 +133,16 @@ CHANGELOG
 
 Next release:
 
+- [gh-161](https://github.com/flintlib/python-flint/pull/161)
+  Add `acb.lerch_phi` to compute the Lerch transcendent.
 - [gh-132](https://github.com/flintlib/python-flint/pull/132)
   Add `fmpz_mpoly` and `fmpq_mpoly` types for multivariate polynomials with
   integer or rational coefficients.
 - [gh-160](https://github.com/flintlib/python-flint/pull/160)
   Add `bits` to `arb` and `acb`, add `log_base` to `arb`.
+- [gh-149](https://github.com/flintlib/python-flint/pull/149)
+  Bump Flint version to 3.1.3-p1 (Flint 3.0.0 - 3.1.3-p1 is supported but the
+  wheels are built with 3.1.3-p1).
 - [gh-148](https://github.com/flintlib/python-flint/pull/148)
   Remove debug symbols to make smaller Linux binaries.
 - [gh-144](https://github.com/flintlib/python-flint/pull/144)
@@ -150,9 +155,6 @@ Next release:
   Add `erfinv` and `erfcinv` for `arb`.
 - [gh-129](https://github.com/flintlib/python-flint/pull/129)
   Use meson-python instead of setuptools as the build backend.
-- [gh-125](https://github.com/flintlib/python-flint/pull/125)
-  Bump Flint version to 3.1.2 (Flint 3.0.0 - 3.1.2 is supported but the wheels
-  are built with 3.1.2).
 
 0.6.0
 

bin/build_dependencies_unix.sh

@@ -257,6 +257,7 @@ else
   tar xf mpfr-$MPFRVER.tar.gz
   cd mpfr-$MPFRVER
     ./configure --prefix=$PREFIX\
+      --host=$HOST_ARG\
       --with-gmp=$PREFIX\
       --enable-shared=yes\
       --enable-static=no
@@ -281,7 +282,13 @@ curl -O -L https://github.com/flintlib/flint/releases/download/v$FLINTVER/flint-
 tar xf flint-$FLINTVER.tar.gz
 cd flint-$FLINTVER
   ./bootstrap.sh
+  # --host=$HOST_ARG\ # host is ignored
+  # --enable-arch works on 3.1.3p1, not available  on HEAD
   ./configure --prefix=$PREFIX\
+    --enable-arch=${HOST_ARG%%-*}\
+    --disable-assembly\
+    --disable-avx2\
+    --disable-avx512\
     $FLINTARB_WITHGMP\
     --with-mpfr=$PREFIX\
     --disable-static\

doc/source/conf.py

@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.0a3'
+version = '0.7.0a4'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.0a3'
+release = '0.7.0a4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "mesonpy"
 [project]
 name = "python-flint"
 description = "Bindings for FLINT and Arb"
-version = "0.7.0a3"
+version = "0.7.0a4"
 urls = {Homepage = "https://github.com/flintlib/python-flint"}
 authors = [
     {name = "Fredrik Johansson", email = "fredrik.johansson@gmail.com"},

src/flint/__init__.py

@@ -45,4 +45,4 @@
     Ordering,
 )
 
-__version__ = '0.7.0a3'
+__version__ = '0.7.0a4'

src/flint/test/test_all.py

@@ -32,7 +32,7 @@ def raises(f, exception):
 
 def test_pyflint():
 
-    assert flint.__version__ == "0.7.0a3"
+    assert flint.__version__ == "0.7.0a4"
 
     ctx = flint.ctx
     assert str(ctx) == repr(ctx) == _default_ctx_string
@@ -1604,7 +1604,7 @@ def test_pickling():
 
 def test_fmpz_mod():
     from flint import fmpz_mod_ctx, fmpz, fmpz_mod
-    
+
     p_sml = 163
     p_med = 2**127 - 1
     p_big = 2**255 - 19
@@ -1754,7 +1754,7 @@ def test_fmpz_mod():
         assert raises(lambda: F_test(test_x) * "AAA", TypeError)
         assert raises(lambda: F_test(test_x) * F_other(test_x), ValueError)
 
-        # Exponentiation 
+        # Exponentiation
 
         assert F_test(0)**0 == pow(0, 0, test_mod)
         assert F_test(0)**1 == pow(0, 1, test_mod)
@@ -1804,7 +1804,7 @@ def test_fmpz_mod():
 
         assert fmpz(test_y) / F_test(test_x) == (test_y * pow(test_x, -1, test_mod)) % test_mod
         assert test_y / F_test(test_x) == (test_y * pow(test_x, -1, test_mod)) % test_mod
-            
+
 def test_fmpz_mod_dlog():
     from flint import fmpz, fmpz_mod_ctx
 
@@ -1826,7 +1826,7 @@ def test_fmpz_mod_dlog():
     F = fmpz_mod_ctx(163)
     g = F(2)
     a = g**123
-    
+
     assert 123 == g.discrete_log(a)
 
     a_int = pow(2, 123, 163)
@@ -1877,7 +1877,7 @@ def test_fmpz_mod_poly():
     assert repr(R3) == "fmpz_mod_poly_ctx(13)"
 
     assert R1.modulus() == 11
-    
+
     assert R1.is_prime()
     assert R1.zero() == 0
     assert R1.one() == 1
@@ -1946,7 +1946,7 @@ def test_fmpz_mod_poly():
     assert str(f) == "8*x^3 + 7*x^2 + 6*x + 7"
 
     # TODO: currently repr does pretty printing
-    # just like str, we should address this. Mainly, 
+    # just like str, we should address this. Mainly,
     # the issue is we want nice `repr` behaviour in
     # interactive shells, which currently is why this
     # choice has been made
@@ -1992,7 +1992,7 @@ def test_fmpz_mod_poly():
     F_sml = fmpz_mod_ctx(p_sml)
     F_med = fmpz_mod_ctx(p_med)
     F_big = fmpz_mod_ctx(p_big)
-    
+
     R_sml = fmpz_mod_poly_ctx(F_sml)
     R_med = fmpz_mod_poly_ctx(F_med)
     R_big = fmpz_mod_poly_ctx(F_big)
@@ -2003,14 +2003,14 @@ def test_fmpz_mod_poly():
     f_bad = R_cmp([2,2,2,2,2])
 
     for (F_test, R_test) in [(F_sml, R_sml), (F_med, R_med), (F_big, R_big)]:
-        
+
         f = R_test([-1,-2])
         g = R_test([-3,-4])
 
         # pos, neg
         assert f is +f
         assert -f == R_test([1,2])
-        
+
         # add
         assert raises(lambda: f + f_cmp, ValueError)
         assert raises(lambda: f + "AAA", TypeError)
@@ -2063,7 +2063,7 @@ def test_fmpz_mod_poly():
         assert raises(lambda: f / "AAA", TypeError)
         assert raises(lambda: f / 0, ZeroDivisionError)
         assert raises(lambda: f_cmp / 2, ZeroDivisionError)
-    
+
         assert (f + f) / 2  ==  f
         assert (f + f) / fmpz(2)  ==  f
         assert (f + f) / F_test(2)  ==  f
@@ -2077,7 +2077,7 @@ def test_fmpz_mod_poly():
         assert (f + f) // 2  ==  f
         assert (f + f) // fmpz(2)  ==  f
         assert (f + f) // F_test(2)  ==  f
-        assert 2 // R_test(2) == 1        
+        assert 2 // R_test(2) == 1
         assert (f + 1) // f == 1
 
         # pow
@@ -2171,7 +2171,7 @@ def test_fmpz_mod_poly():
         f1 = R_test([-3, 1])
         f2 = R_test([-5, 1])
         assert f1.resultant(f2) == (3 - 5)
-        assert raises(lambda: f.resultant("AAA"), TypeError)        
+        assert raises(lambda: f.resultant("AAA"), TypeError)
 
         # sqrt
         f1 = R_test.random_element(irreducible=True)
@@ -2428,14 +2428,14 @@ def _all_polys():
         (flint.fmpz_poly, flint.fmpz, False),
         (flint.fmpq_poly, flint.fmpq, True),
         (lambda *a: flint.nmod_poly(*a, 17), lambda x: flint.nmod(x, 17), True),
-        (lambda *a: flint.fmpz_mod_poly(*a, flint.fmpz_mod_poly_ctx(163)), 
-         lambda x: flint.fmpz_mod(x, flint.fmpz_mod_ctx(163)), 
+        (lambda *a: flint.fmpz_mod_poly(*a, flint.fmpz_mod_poly_ctx(163)),
+         lambda x: flint.fmpz_mod(x, flint.fmpz_mod_ctx(163)),
          True),
-        (lambda *a: flint.fmpz_mod_poly(*a, flint.fmpz_mod_poly_ctx(2**127 - 1)), 
-         lambda x: flint.fmpz_mod(x, flint.fmpz_mod_ctx(2**127 - 1)), 
+        (lambda *a: flint.fmpz_mod_poly(*a, flint.fmpz_mod_poly_ctx(2**127 - 1)),
+         lambda x: flint.fmpz_mod(x, flint.fmpz_mod_ctx(2**127 - 1)),
          True),
-        (lambda *a: flint.fmpz_mod_poly(*a, flint.fmpz_mod_poly_ctx(2**255 - 19)), 
-         lambda x: flint.fmpz_mod(x, flint.fmpz_mod_ctx(2**255 - 19)), 
+        (lambda *a: flint.fmpz_mod_poly(*a, flint.fmpz_mod_poly_ctx(2**255 - 19)),
+         lambda x: flint.fmpz_mod(x, flint.fmpz_mod_ctx(2**255 - 19)),
          True),
     ]
 
@@ -2467,6 +2467,28 @@ def test_polys():
         assert (P([1]) == P([2])) is False
         assert (P([1]) != P([2])) is True
 
+        assert (P([1]) == 1) is True
+        assert (P([1]) != 1) is False
+        assert (P([1]) == 2) is False
+        assert (P([1]) != 2) is True
+
+        assert (1 == P([1])) is True
+        assert (1 != P([1])) is False
+        assert (2 == P([1])) is False
+        assert (2 != P([1])) is True
+
+        s1, s2 = S(1), S(2)
+
+        assert (P([s1]) == s1) is True
+        assert (P([s1]) != s1) is False
+        assert (P([s1]) == s2) is False
+        assert (P([s1]) != s2) is True
+
+        assert (s1 == P([s1])) is True
+        assert (s1 != P([s1])) is False
+        assert (s1 == P([s2])) is False
+        assert (s1 != P([s2])) is True
+
         assert (P([1]) == None) is False
         assert (P([1]) != None) is True
         assert (None == P([1])) is False
@@ -2500,12 +2522,17 @@ def setbad(obj, i, val):
         assert raises(lambda: setbad(p, -1, 1), ValueError)
 
         for v in [], [1], [1, 2]:
-            if P == flint.fmpz_poly:
+            p = P(v)
+            if type(p) == flint.fmpz_poly:
                 assert P(v).repr() == f'fmpz_poly({v!r})'
-            elif P == flint.fmpq_poly:
+            elif type(p) == flint.fmpq_poly:
                 assert P(v).repr() == f'fmpq_poly({v!r})'
-            elif P == flint.nmod_poly:
+            elif type(p) == flint.nmod_poly:
                 assert P(v).repr() == f'nmod_poly({v!r}, 17)'
+            elif type(p) == flint.fmpz_mod_poly:
+                pass # fmpz_mod_poly does not have .repr() ...
+            else:
+                assert False
 
         assert repr(P([])) == '0'
         assert repr(P([1])) == '1'
@@ -2521,6 +2548,12 @@ def setbad(obj, i, val):
         assert bool(P([])) is False
         assert bool(P([1])) is True
 
+        assert P([]).is_zero() is True
+        assert P([1]).is_zero() is False
+
+        assert P([]).is_one() is False
+        assert P([1]).is_one() is True
+
         assert +P([1, 2, 3]) == P([1, 2, 3])
         assert -P([1, 2, 3]) == P([-1, -2, -3])
 
@@ -2600,7 +2633,7 @@ def setbad(obj, i, val):
         assert P([1, 1]) ** 2 == P([1, 2, 1])
         assert raises(lambda: P([1, 1]) ** -1, ValueError)
         assert raises(lambda: P([1, 1]) ** None, TypeError)
-        
+
         # # XXX: Not sure what this should do in general:
         assert raises(lambda: pow(P([1, 1]), 2, 3), NotImplementedError)
 
@@ -2852,6 +2885,12 @@ def quick_poly():
         assert bool(P(ctx=ctx)) is False
         assert bool(P(1, ctx=ctx)) is True
 
+        assert P(ctx=ctx).is_zero() is True
+        assert P(1, ctx=ctx).is_zero() is False
+
+        assert P(ctx=ctx).is_one() is False
+        assert P(1, ctx=ctx).is_one() is True
+
         assert +quick_poly() \
             == quick_poly()
 

src/flint/types/acb.pyx

@@ -733,6 +733,21 @@ cdef class acb(flint_scalar):
             acb_hurwitz_zeta((<acb>u).val, (<acb>s).val, (<acb>a).val, getprec())
             return u
 
+    def lerch_phi(z, s, a):
+        """
+        Lerch transcendent `\Phi(z,s,a)`.
+
+            >>> from flint import showgood
+            >>> showgood(lambda: acb(1,2).lerch_phi(3, 4), dps=25)
+            0.006872751459699249251487346 + 0.01112535314686351879432212j
+        """
+        s = any_as_acb(s)
+        a = any_as_acb(a)
+        u = acb.__new__(acb)
+        acb_dirichlet_lerch_phi((<acb>u).val, (<acb>z).val, (<acb>s).val, (<acb>a).val, getprec())
+        return u
+
+
     def dirichlet_l(s, chi):
         cdef dirichlet_char cchar
         if isinstance(chi, dirichlet_char):

src/flint/types/acb_mat.pyx

@@ -150,7 +150,7 @@ cdef class acb_mat(flint_mat):
         else:
             raise ValueError("acb_mat: expected 1-3 arguments")
 
-    def __nonzero__(self):
+    def __bool__(self):
         raise NotImplementedError
 
     cpdef long nrows(s):

src/flint/types/arb_mat.pyx

@@ -148,7 +148,7 @@ cdef class arb_mat(flint_mat):
         else:
             raise ValueError("arb_mat: expected 1-3 arguments")
 
-    def __nonzero__(self):
+    def __bool__(self):
         raise NotImplementedError
 
     cpdef long nrows(s):

src/flint/types/fmpq.pyx

@@ -186,7 +186,7 @@ cdef class fmpq(flint_scalar):
     def __trunc__(self):
         return self.trunc()
 
-    def __nonzero__(self):
+    def __bool__(self):
         return not fmpq_is_zero(self.val)
 
     def __round__(self, ndigits=None):