Trac #29171: Move giacpy_sage into sage source code

As discussed on [https://groups.google.com/forum/#!topic/sage-
devel/uYXGzG_py28 this sage-devel thread], we propose to move the Cython
code that used to be in the optional package `giacpy_sage` into
`sage/libs/giac/`.

URL: https://trac.sagemath.org/29171
Reported by: vdelecroix
Ticket author(s): Vincent Delecroix, Matthias Koeppe, Frederic Han
Reviewer(s): Matthias Koeppe, Frederic Han, Dima Pasechnik

Author: Release Manager

build/pkgs/giac/checksums.ini

@@ -1,5 +1,5 @@
 tarball=giac-VERSION.tar.bz2
-sha1=eadeb7194b1809298a0d94642d94c8dff80bbe3d
-md5=7760e342f5e5b3f5da0f1b9c15546b96
-cksum=1678878999
-upstream_url=https://trac.sagemath.org/raw-attachment/ticket/29521/giac-1.5.0.63-p0.tar.bz2
+sha1=c8b4b40dae98a83adda0142332a482c4fec2d4eb
+md5=504151eb5f483a24c941822d792f0bb3
+cksum=3611162964
+upstream_url=https://trac.sagemath.org/raw-attachment/ticket/29552/giac-VERSION.tar.bz2

build/pkgs/giac/package-version.txt

@@ -1 +1 @@
-1.5.0.63-p0
+1.5.0.87

build/pkgs/giac/spkg-src

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -x
 #
 # Script to prepare a GIAC spkg for Sage.  This script is only for the
 # package maintainer, not for building GIAC during a Sage install.
@@ -14,8 +14,8 @@ fi
 set -e
 
 VERSION="1.5.0"
-VERSIONREV="63"
-PATCHSUFFIX="-p0"
+VERSIONREV="87"
+PATCHSUFFIX=""
 
 # The upstream tarball name is: giac"$SOURCEORIG".tar.gz
 SOURCEORIG=_"$VERSION"-"$VERSIONREV"
@@ -30,7 +30,7 @@ if [ -f "$OUTPUTFILEBASENAME".tar.gz -o -f "$OUTPUTFILEBASENAME".tar.bz2 ] ; the
 fi
 
 # Build a temporary working dir. (preferably, a subdir of SAGE_DISTFILES)
-TARGET=$(mktemp -d -p"$SAGE_DISTFILES" || mktemp -d)
+TARGET=$(mktemp -d -p"$SAGE_DISTFILES" 2>/dev/null || mktemp -d)
 ORIGDIR=`pwd`
 cd "$TARGET"
 

build/pkgs/giacpy_sage/SPKG.rst

@@ -992,11 +992,27 @@ def _latex_(self):
 
         EXAMPLES::
 
-            sage: print(latex(giac('(x^4 - y)/(y^2-3*x)')))
-            "\frac{(x^{4}-y)}{(y^{2}-3\cdot x)}"
-
-        """
-        return self.parent().eval('latex(%s)'%self.name())
+            sage: M = matrix(QQ, [[1, 2], [3, 4]])
+            sage: latex(M)
+            \left(\begin{array}{rr}
+            1 & 2 \\
+            3 & 4
+            \end{array}\right)
+            sage: gM = giac(M)
+            sage: latex(gM)
+            \left...\begin{array}{cc}...1...&...2...\\...3...&...4...\end{array}\right...
+            sage: gf = giac('(x^4 - y)/(y^2-3*x)')
+            sage: latex(gf)          # output changed slightly from 1.5.0-63 to 1.5.0-87
+            \frac{...x^{4}...-...y...}{...y^{2}-3...x...}
+
+        """
+        s = self.parent().eval('latex(%s)'%self.name())
+        if s.startswith('"'):
+            s = s[1:]
+        if s.endswith('"'):
+            s = s[:-1]
+        s = s.strip()
+        return s
 
     def _matrix_(self, R):
         r"""

build/pkgs/giacpy_sage/checksums.ini

@@ -13,3 +13,5 @@
         'mwrank_MordellWeil', 'mwrank_initprimes', 'CremonaModularSymbols'))
 lazy_import('sage.libs.eclib.all', 'get_precision', 'mwrank_get_precision')
 lazy_import('sage.libs.eclib.all', 'set_precision', 'mwrank_set_precision')
+
+lazy_import('sage.libs.giac.giac', 'libgiac')

build/pkgs/giacpy_sage/dependencies

@@ -12,11 +12,11 @@
 
 EXAMPLES::
 
-    sage: from sage.libs.giac import groebner_basis as gb_giac # optional - giacpy_sage
+    sage: from sage.libs.giac import groebner_basis as gb_giac # random
     sage: P = PolynomialRing(QQ, 6, 'x')
     sage: I = sage.rings.ideal.Cyclic(P)
-    sage: B = gb_giac(I.gens()) # optional - giacpy_sage, random
-    sage: B # optional - giacpy_sage
+    sage: B = gb_giac(I.gens()) # random
+    sage: B
     Polynomial Sequence with 45 Polynomials in 6 Variables
 """
 
@@ -32,6 +32,7 @@
 
 from sage.structure.proof.all import polynomial as proof_polynomial
 from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence
+from .giac import giacsettings, libgiac
 
 #  Remarks for doctests:
 #     1) The first time that the c++ library giac is loaded a message appears.
@@ -51,19 +52,14 @@ def __enter__(self):
         """
         EXAMPLES::
 
-           sage: from sage.libs.giac import GiacSettingsDefaultContext  # optional - giacpy_sage
-           sage: from giacpy_sage import giacsettings # optional - giacpy_sage
-           sage: giacsettings.proba_epsilon = 1e-16 # optional - giacpy_sage
-           sage: with GiacSettingsDefaultContext(): giacsettings.proba_epsilon = 1e-12 # optional - giacpy_sage
-           sage: giacsettings.proba_epsilon < 1e-14 # optional - giacpy_sage
+           sage: from sage.libs.giac import GiacSettingsDefaultContext
+           sage: from sage.libs.giac.giac import giacsettings
+           sage: giacsettings.proba_epsilon = 1e-16
+           sage: with GiacSettingsDefaultContext(): giacsettings.proba_epsilon = 1e-12
+           sage: giacsettings.proba_epsilon < 1e-14
            True
 
         """
-        try:
-            from giacpy_sage import giacsettings, libgiac
-        except ImportError:
-            raise ImportError("""One of the optional packages giac or giacpy_sage is missing""")
-
         self.proba_epsilon = giacsettings.proba_epsilon
         self.threads = giacsettings.threads
         # Change the debug level at the end to not have messages at each modification
@@ -73,19 +69,14 @@ def __exit__(self, typ, value, tb):
         """
         EXAMPLES::
 
-           sage: from sage.libs.giac import GiacSettingsDefaultContext  # optional - giacpy_sage
-           sage: from giacpy_sage import giacsettings # optional - giacpy_sage
-           sage: giacsettings.proba_epsilon = 1e-16 # optional - giacpy_sage
-           sage: with GiacSettingsDefaultContext(): giacsettings.proba_epsilon = 1e-30 # optional - giacpy_sage
-           sage: giacsettings.proba_epsilon < 1e-20 # optional - giacpy_sage
+           sage: from sage.libs.giac import GiacSettingsDefaultContext
+           sage: from sage.libs.giac.giac import giacsettings
+           sage: giacsettings.proba_epsilon = 1e-16
+           sage: with GiacSettingsDefaultContext(): giacsettings.proba_epsilon = 1e-30
+           sage: giacsettings.proba_epsilon < 1e-20
            False
 
         """
-        try:
-            from giacpy_sage import giacsettings, libgiac
-        except ImportError:
-            raise ImportError("""One of the optional packages giac or giacpy_sage is missing""")
-
         # Restore the debug level first to not have messages at each modification
         libgiac('debug_infolevel')(self.debuginfolevel)
         # NB: giacsettings.epsilon has a different meaning that giacsettings.proba_epsilon.
@@ -99,20 +90,20 @@ def local_giacsettings(func):
 
     EXAMPLES::
 
-        sage: def testf(a,b):  # optional - giacpy_sage
+        sage: def testf(a,b):
         ....:    giacsettings.proba_epsilon = a/100
         ....:    giacsettings.threads = b+2
         ....:    return (giacsettings.proba_epsilon, giacsettings.threads)
 
-        sage: from giacpy_sage import giacsettings  # optional - giacpy_sage
-        sage: from sage.libs.giac import local_giacsettings  # optional - giacpy_sage
-        sage: gporig, gtorig = (giacsettings.proba_epsilon,giacsettings.threads)  # optional - giacpy_sage
-        sage: gp, gt = local_giacsettings(testf)(giacsettings.proba_epsilon,giacsettings.threads)  # optional - giacpy_sage
-        sage: gporig == giacsettings.proba_epsilon  # optional - giacpy_sage
+        sage: from sage.libs.giac.giac import giacsettings
+        sage: from sage.libs.giac import local_giacsettings
+        sage: gporig, gtorig = (giacsettings.proba_epsilon,giacsettings.threads)
+        sage: gp, gt = local_giacsettings(testf)(giacsettings.proba_epsilon,giacsettings.threads)
+        sage: gporig == giacsettings.proba_epsilon
         True
-        sage: gtorig == giacsettings.threads  # optional - giacpy_sage
+        sage: gtorig == giacsettings.threads
         True
-        sage: gp<gporig, gt-gtorig  # optional - giacpy_sage
+        sage: gp<gporig, gt-gtorig
         (True, 2)
 
     """
@@ -178,50 +169,50 @@ def groebner_basis(gens, proba_epsilon=None, threads=None, prot=False,
 
     EXAMPLES::
 
-        sage: from sage.libs.giac import groebner_basis as gb_giac # optional - giacpy_sage
-        sage: P = PolynomialRing(GF(previous_prime(2**31)), 6, 'x') # optional - giacpy_sage
-        sage: I = sage.rings.ideal.Cyclic(P) # optional - giacpy_sage
-        sage: B=gb_giac(I.gens());B # optional - giacpy_sage
+        sage: from sage.libs.giac import groebner_basis as gb_giac
+        sage: P = PolynomialRing(GF(previous_prime(2**31)), 6, 'x')
+        sage: I = sage.rings.ideal.Cyclic(P)
+        sage: B=gb_giac(I.gens());B
         <BLANKLINE>
         // Groebner basis computation time ...
         Polynomial Sequence with 45 Polynomials in 6 Variables
-        sage: B.is_groebner() # optional - giacpy_sage
+        sage: B.is_groebner()
         True
 
     Elimination ideals can be computed by passing ``elim_variables``::
 
-        sage: P = PolynomialRing(GF(previous_prime(2**31)), 5, 'x')       # optional - giacpy_sage
-        sage: I = sage.rings.ideal.Cyclic(P)                              # optional - giacpy_sage
-        sage: B = gb_giac(I.gens(), elim_variables=[P.gen(0), P.gen(2)])  # optional - giacpy_sage
+        sage: P = PolynomialRing(GF(previous_prime(2**31)), 5, 'x')
+        sage: I = sage.rings.ideal.Cyclic(P)
+        sage: B = gb_giac(I.gens(), elim_variables=[P.gen(0), P.gen(2)])
         <BLANKLINE>
         // Groebner basis computation time ...
-        sage: B.is_groebner()                                             # optional - giacpy_sage
+        sage: B.is_groebner()
         True
-        sage: B.ideal() == I.elimination_ideal([P.gen(0), P.gen(2)])      # optional - giacpy_sage
+        sage: B.ideal() == I.elimination_ideal([P.gen(0), P.gen(2)])
         True
 
     Computations over QQ can benefit from
 
     * a probabilistic lifting::
 
-        sage: P = PolynomialRing(QQ,5, 'x') # optional - giacpy_sage
-        sage: I = ideal([P.random_element(3,7) for j in range(5)]) # optional - giacpy_sage
-        sage: B1 = gb_giac(I.gens(),1e-16) # optional - giacpy_sage, long time (1s)
+        sage: P = PolynomialRing(QQ,5, 'x')
+        sage: I = ideal([P.random_element(3,7) for j in range(5)])
+        sage: B1 = gb_giac(I.gens(),1e-16) # long time (1s)
         ...Running a probabilistic check for the reconstructed Groebner basis.
         If successfull, error probability is less than 1e-16 ...
-        sage: sage.structure.proof.all.polynomial(True) # optional - giacpy_sage
-        sage: B2 = gb_giac(I.gens()) # optional - giacpy_sage, long time (4s)
+        sage: sage.structure.proof.all.polynomial(True)
+        sage: B2 = gb_giac(I.gens()) # long time (4s)
         <BLANKLINE>
         // Groebner basis computation time...
-        sage: B1 == B2 # optional - giacpy_sage, long time
+        sage: B1 == B2 # long time
         True
-        sage: B1.is_groebner() # optional - giacpy_sage, long time (20s)
+        sage: B1.is_groebner() # long time (20s)
         True
 
     * multi threaded operations::
 
-        sage: P = PolynomialRing(QQ, 8, 'x') # optional - giacpy_sage
-        sage: I = sage.rings.ideal.Cyclic(P) # optional - giacpy_sage
+        sage: P = PolynomialRing(QQ, 8, 'x')
+        sage: I = sage.rings.ideal.Cyclic(P)
         sage: time B = gb_giac(I.gens(),1e-6,threads=2) # doctest: +SKIP
         Running a probabilistic check for the reconstructed Groebner basis...
         Time: CPU 168.98 s, Wall: 94.13 s
@@ -230,8 +221,8 @@ def groebner_basis(gens, proba_epsilon=None, threads=None, prot=False,
 
     ::
 
-        sage: I = sage.rings.ideal.Katsura(P) # optional - giacpy_sage
-        sage: gb_giac(I,prot=True)  # optional - giacpy_sage, random, long time (3s)
+        sage: I = sage.rings.ideal.Katsura(P)
+        sage: gb_giac(I,prot=True)  # random, long time (3s)
         9381383 begin computing basis modulo 535718473
         9381501 begin new iteration zmod, number of pairs: 8, base size: 8
         ...end, basis size 74 prime number 1
@@ -253,49 +244,44 @@ def groebner_basis(gens, proba_epsilon=None, threads=None, prot=False,
 
     TESTS::
 
-        sage: from giacpy_sage import libgiac # optional - giacpy_sage
-        sage: libgiac("x2:=22; x4:='whywouldyoudothis'") # optional - giacpy_sage
+        sage: from sage.libs.giac.giac import libgiac
+        sage: libgiac("x2:=22; x4:='whywouldyoudothis'")
         22,whywouldyoudothis
-        sage: gb_giac(I) # optional - giacpy_sage
+        sage: gb_giac(I)
         Traceback (most recent call last):
         ...
         ValueError: Variables names ['x2', 'x4'] conflict in giac. Change them or purge them from in giac with libgiac.purge('x2')
-        sage: libgiac.purge('x2'),libgiac.purge('x4') # optional - giacpy_sage
+        sage: libgiac.purge('x2'),libgiac.purge('x4')
         (22, whywouldyoudothis)
-        sage: gb_giac(I) # optional - giacpy_sage, long time (3s)
+        sage: gb_giac(I) # long time (3s)
         <BLANKLINE>
         // Groebner basis computation time...
         Polynomial Sequence with 74 Polynomials in 8 Variables
 
-        sage: I = ideal(P(0),P(0)) # optional - giacpy_sage
-        sage: I.groebner_basis() == gb_giac(I) # optional - giacpy_sage
+        sage: I = ideal(P(0),P(0))
+        sage: I.groebner_basis() == gb_giac(I)
         True
 
     Test the supported term orderings::
 
         sage: from sage.rings.ideal import Cyclic
         sage: P = PolynomialRing(QQ, 'x', 4, order='lex')
-        sage: B = gb_giac(Cyclic(P))                   # optional - giacpy_sage
+        sage: B = gb_giac(Cyclic(P))
         ...
-        sage: B.is_groebner(), B.ideal() == Cyclic(P)  # optional - giacpy_sage
+        sage: B.is_groebner(), B.ideal() == Cyclic(P)
         (True, True)
         sage: P = P.change_ring(order='deglex')
-        sage: B = gb_giac(Cyclic(P))                   # optional - giacpy_sage
+        sage: B = gb_giac(Cyclic(P))
         ...
-        sage: B.is_groebner(), B.ideal() == Cyclic(P)  # optional - giacpy_sage
+        sage: B.is_groebner(), B.ideal() == Cyclic(P)
         (True, True)
         sage: P = P.change_ring(order='degrevlex(2),degrevlex(2)')
-        sage: B = gb_giac(Cyclic(P))                   # optional - giacpy_sage
+        sage: B = gb_giac(Cyclic(P))
         ...
-        sage: B.is_groebner(), B.ideal() == Cyclic(P)  # optional - giacpy_sage
+        sage: B.is_groebner(), B.ideal() == Cyclic(P)
         (True, True)
 
     """
-    try:
-        from giacpy_sage import libgiac, giacsettings
-    except ImportError:
-        raise ImportError("""One of the optional packages giac or giacpy_sage is missing""")
-
     try:
         iter(gens)
     except TypeError: