Release Manager · Release Manager · commit ca1b5e6ea0dc · 2024-05-02T00:34:24.000+02:00
gh-37041: update FriCAS to 1.3.10, allow building with sbcl A routine update, with our patches becoming obsolete. We also allow building FriCAS with sbcl: We create a dummy package sbcl, and set up building FriCAS so that SBCL >= 2.4.1 is the preferred compiler (if found). This allows one to circumvent the ECL troubles on arm macOS - install SBCL, done. URL: #37041 Reported by: Dima Pasechnik Reviewer(s): Martin Rubey
diff --git a/build/bin/sage-build-env-config.in b/build/bin/sage-build-env-config.in
@@ -60,6 +60,8 @@ export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
 
 export SAGE_HAVE_LIBJPEG="@SAGE_HAVE_LIBJPEG@"
 
+export SAGE_FRICAS_LISP="@SAGE_FRICAS_LISP@"
+
 export CONFIGURED_SAGE_EDITABLE="@SAGE_EDITABLE@"
 export CONFIGURED_SAGE_WHEELS="@SAGE_WHEELS@"
 
diff --git a/build/pkgs/fricas/checksums.ini b/build/pkgs/fricas/checksums.ini
@@ -1,5 +1,5 @@
 tarball=fricas-VERSION-full.tar.bz2
-sha1=6f2c1ae5eb71daab871d1814b26f596363c8e925
-md5=504b431c39e498527e6f9c739c973488
-cksum=2469663675
+sha1=2f1e1bbbad7e04a7114ffbd93eeedadc5db32272
+md5=d2ecd6f8c45cfc41c407b7d5f6eaae07
+cksum=1256005675
 upstream_url=https://github.com/fricas/fricas/releases/download/VERSION/fricas-VERSION-full.tar.bz2
diff --git a/build/pkgs/fricas/package-version.txt b/build/pkgs/fricas/package-version.txt
@@ -1 +1 @@
-1.3.8.p1
+1.3.10
diff --git a/build/pkgs/fricas/patches/extdecls.patch b/build/pkgs/fricas/patches/extdecls.patch
diff --git a/build/pkgs/fricas/patches/macos_lisp.patch b/build/pkgs/fricas/patches/macos_lisp.patch
diff --git a/build/pkgs/fricas/spkg-install.in b/build/pkgs/fricas/spkg-install.in
@@ -3,6 +3,6 @@ cd src
 # Use newer version of config.guess and config.sub (see Issue #23847)
 cp "$SAGE_ROOT"/config/config.* config
 
-sdh_configure --with-lisp=ecl --enable-case-insensitive-file-system-check=no
+sdh_configure --with-lisp="$SAGE_FRICAS_LISP" --enable-case-insensitive-file-system-check=no
 sdh_make
 sdh_make_install -j1
diff --git a/build/pkgs/sbcl/SPKG.rst b/build/pkgs/sbcl/SPKG.rst
@@ -0,0 +1,24 @@
+sbcl: a lisp compiler and runtime system
+=====================================================================
+
+Description
+-----------
+
+Steel Bank Common Lisp (SBCL) is a high performance Common Lisp compiler. It is
+open source / free software, with a permissive license (see https://www.sbcl.org/history.html).
+In addition to the compiler and runtime system for ANSI Common Lisp, it provides an interactive
+environment including a debugger, a statistical profiler, a code coverage tool,
+and many other extensions.
+
+(taken from https://www.sbcl.org)
+
+License
+-------
+
+- a mix of BSD-style and public domain
+
+
+Upstream Contact
+----------------
+
+-  https://www.sbcl.org
diff --git a/build/pkgs/sbcl/distros/alpine.txt b/build/pkgs/sbcl/distros/alpine.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/arch.txt b/build/pkgs/sbcl/distros/arch.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/conda.txt b/build/pkgs/sbcl/distros/conda.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/cygwin.txt b/build/pkgs/sbcl/distros/cygwin.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/debian.txt b/build/pkgs/sbcl/distros/debian.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/fedora.txt b/build/pkgs/sbcl/distros/fedora.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/freebsd.txt b/build/pkgs/sbcl/distros/freebsd.txt
@@ -0,0 +1 @@
+lang/sbcl
diff --git a/build/pkgs/sbcl/distros/gentoo.txt b/build/pkgs/sbcl/distros/gentoo.txt
@@ -0,0 +1 @@
+dev-lisp/sbcl
diff --git a/build/pkgs/sbcl/distros/homebrew.txt b/build/pkgs/sbcl/distros/homebrew.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/macports.txt b/build/pkgs/sbcl/distros/macports.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/nix.txt b/build/pkgs/sbcl/distros/nix.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/openbsd.txt b/build/pkgs/sbcl/distros/openbsd.txt
@@ -0,0 +1 @@
+lang/sbcl
diff --git a/build/pkgs/sbcl/distros/opensuse.txt b/build/pkgs/sbcl/distros/opensuse.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/repology.txt b/build/pkgs/sbcl/distros/repology.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/distros/void.txt b/build/pkgs/sbcl/distros/void.txt
@@ -0,0 +1 @@
+sbcl
diff --git a/build/pkgs/sbcl/math b/build/pkgs/sbcl/math
diff --git a/build/pkgs/sbcl/spkg-configure.m4 b/build/pkgs/sbcl/spkg-configure.m4
@@ -0,0 +1,20 @@
+SAGE_SPKG_CONFIGURE([sbcl], [dnl
+  m4_pushdef([SAGE_SBCL_MINVER], ["1.4.16"])
+   AC_CACHE_CHECK([for sbcl >= SAGE_SBCL_MINVER], [ac_cv_path_SBCL], [
+       AC_PATH_PROGS_FEATURE_CHECK([SBCL], [sbcl], [
+            sbcl_version=`$ac_path_SBCL --version 2>&1 \
+                | $SED -n -e 's/SBCL *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
+            AS_IF([test -n "$sbcl_version"], [
+                AX_COMPARE_VERSION([$sbcl_version], [ge], [SAGE_SBCL_MINVER], [
+                    ac_cv_path_SBCL="$ac_path_SBCL"
+                    ac_path_SBCL_found=:
+                ])
+            ])
+        ])
+    ])
+  AS_IF([test -z "$ac_cv_path_SBCL" ], [
+        sage_spkg_install_sbcl=yes
+        AC_SUBST(SAGE_FRICAS_LISP, ecl)], [
+        AC_SUBST(SAGE_FRICAS_LISP, "sbcl --dynamic-space-size 4Gb")])
+  m4_popdef([SAGE_SBCL_MINVER])
+])
diff --git a/build/pkgs/sbcl/type b/build/pkgs/sbcl/type
@@ -0,0 +1 @@
+optional
diff --git a/src/sage/interfaces/fricas.py b/src/sage/interfaces/fricas.py
@@ -647,7 +647,8 @@ def _convert_prod(x, y):
         def explicitly_not_implemented(*args):
             raise NotImplementedError("the translation of the FriCAS Expression '%s' to sage is not yet implemented" % args)
 
-        register_symbol(lambda *args: explicitly_not_implemented("rootOfADE"), {'fricas': 'rootOfADE'}, 2)
+        register_symbol(lambda *args: explicitly_not_implemented("rootOfADE"), {'fricas': 'rootOfADE'}, 2) # to be removed once we fully on FriCAS 1.3.10+
+        register_symbol(lambda *args: explicitly_not_implemented("FEseries"), {'fricas': 'FEseries'}, 2)
         register_symbol(lambda *args: explicitly_not_implemented("rootOfRec"), {'fricas': 'rootOfRec'}, 2)
 
     def set(self, var, value):
@@ -1184,7 +1185,7 @@ def _latex_(self):
             \frac{{{\log \left( {{e+1}} \right)} \  {\sin \left( {{y+x}} \right)}}}{{{e} ^{z}}}
 
             sage: latex(fricas("matrix([[1,2],[3,4]])"))
-            \left[ \begin{array}{cc} 1 & 2 \\ 3 & 4\end{array} \right]
+            \left[ \begin{array}{cc} 1 & 2 \\ 3 & 4...\end{array}...\right]
 
             sage: latex(fricas("integrate(sin(x+1/x),x)"))
             \int ^{\displaystyle x} {{\sin \left( {{\frac{{{{ \%...} ^{2}}+1}}{ \%...}}} \right)} \  {d \%...}}
@@ -1836,7 +1837,7 @@ def _sage_(self):
             sage: fricas(x+3).sage()
             x + 3
             sage: fricas(x+3).domainOf()
-            Polynomial(Integer())
+            Polynomial(Integer...)
 
             sage: fricas(matrix([[2,3],[4,x+5]])).diagonal().sage()
             (2, x + 5)
@@ -1904,7 +1905,7 @@ def _sage_(self):
             sage: s.sage()
             Traceback (most recent call last):
             ...
-            NotImplementedError: the translation of the FriCAS Expression 'rootOfADE' to sage is not yet implemented
+            NotImplementedError: the translation of the FriCAS Expression 'FEseries' to sage is not yet implemented
 
             sage: s = fricas("series(sqrt(1+x), x=0)"); s
                   1     1  2    1  3    5   4    7   5    21   6    33   7    429   8
@@ -2050,7 +2051,7 @@ def _sage_(self):
             # (which might not be Expression Integer) and recurse
             return FriCASElement._sage_expression(P.get_InputForm(self._name))
 
-        if head == "Expression" or head == "Pi":
+        if head == "Expression" or head == "Pi" or head == "PiDomain":
             # we treat Expression Integer and Expression Complex
             # Integer just the same
             return FriCASElement._sage_expression(P.get_InputForm(self._name))
diff --git a/src/sage/symbolic/expression_conversions.py b/src/sage/symbolic/expression_conversions.py
@@ -695,32 +695,32 @@ def pyobject(self, ex, obj):
         EXAMPLES::
 
             sage: 2._fricas_().domainOf()                                       # optional - fricas
-            PositiveInteger()
+            PositiveInteger...
 
             sage: (-1/2)._fricas_().domainOf()                                  # optional - fricas
-            Fraction(Integer())
+            Fraction(Integer...)
 
             sage: SR(2)._fricas_().domainOf()                                   # optional - fricas
-            Expression(Integer())
+            Expression(Integer...)
 
             sage: (sqrt(2))._fricas_().domainOf()                               # optional - fricas
-            Expression(Integer())
+            Expression(Integer...)
 
             sage: pi._fricas_().domainOf()                                      # optional - fricas
-            Pi()
+            Pi...
 
             sage: asin(pi)._fricas_()                                           # optional - fricas
             asin(%pi)
 
             sage: I._fricas_().domainOf()                                   # optional - fricas
-            Complex(Integer())
+            Complex(Integer...)
 
             sage: SR(I)._fricas_().domainOf()                                   # optional - fricas
-            Expression(Complex(Integer()))
+            Expression(Complex(Integer...))
 
             sage: ex = (I+sqrt(2)+2)
             sage: ex._fricas_().domainOf()                                      # optional - fricas
-            Expression(Complex(Integer()))
+            Expression(Complex(Integer...))
 
             sage: ex._fricas_()^2                                               # optional - fricas
                        +-+
@@ -759,7 +759,7 @@ def symbol(self, ex):
             Variable(x)
 
             sage: (x^2)._fricas_().domainOf()                                   # optional - fricas
-            Expression(Integer())
+            Expression(Integer...)
 
             sage: (2*x)._fricas_().integrate(x)                                 # optional - fricas
              2
