Merge pull request #1192 from mathics/realdigits-optimize

More descriptive and general in prep for profiling

Author: rocky

mathics/builtin/arithmetic.py

@@ -10,6 +10,7 @@
 from mathics.version import __version__  # noqa used in loading to check consistency.
 import sympy
 import mpmath
+from functools import lru_cache
 
 from mathics.builtin.base import (
     Builtin,
@@ -34,12 +35,29 @@
     SymbolNull,
     SymbolTrue,
     from_python,
+    from_mpmath,
 )
 from mathics.core.numbers import min_prec, dps, SpecialValueError
 
 from mathics.builtin.lists import _IterationFunction
 from mathics.core.convert import from_sympy, SympyExpression
 
+@lru_cache(maxsize=1024)
+def call_mpmath(mpmath_function, mpmath_args):
+    try:
+        return mpmath_function(*mpmath_args)
+    except ValueError as exc:
+        text = str(exc)
+        if text == "gamma function pole":
+            return Symbol("ComplexInfinity")
+        else:
+            raise
+    except ZeroDivisionError:
+        return
+    except SpecialValueError as exc:
+        return Symbol(exc.name)
+
+
 class _MPMathFunction(SympyFunction):
 
     attributes = ("Listable", "NumericFunction")
@@ -48,6 +66,7 @@ class _MPMathFunction(SympyFunction):
 
     nargs = 1
 
+    @lru_cache(maxsize=1024)
     def get_mpmath_function(self, args):
         if self.mpmath_name is None or len(args) != self.nargs:
             return None
@@ -57,7 +76,7 @@ def apply(self, z, evaluation):
         "%(name)s[z__]"
 
         args = z.numerify(evaluation).get_sequence()
-        mpmath_function = self.get_mpmath_function(args)
+        mpmath_function = self.get_mpmath_function(tuple(args))
         result = None
 
         # if no arguments are inexact attempt to use sympy
@@ -82,7 +101,7 @@ def apply(self, z, evaluation):
             if None in float_args:
                 return
 
-            result = self.call_mpmath(mpmath_function, float_args)
+            result = call_mpmath(mpmath_function, tuple(float_args))
             if isinstance(result, (mpmath.mpc, mpmath.mpf)):
                 if mpmath.isinf(result) and isinstance(result, mpmath.mpc):
                     result = Symbol("ComplexInfinity")
@@ -93,7 +112,7 @@ def apply(self, z, evaluation):
                 elif mpmath.isnan(result):
                     result = Symbol("Indeterminate")
                 else:
-                    result = Number.from_mpmath(result)
+                    result = from_mpmath(result)
         else:
             prec = min_prec(*args)
             d = dps(prec)
@@ -104,9 +123,9 @@ def apply(self, z, evaluation):
                 mpmath_args = [x.to_mpmath() for x in args]
                 if None in mpmath_args:
                     return
-                result = self.call_mpmath(mpmath_function, mpmath_args)
+                result = call_mpmath(mpmath_function, tuple(mpmath_args))
                 if isinstance(result, (mpmath.mpc, mpmath.mpf)):
-                    result = Number.from_mpmath(result, d)
+                    result = from_mpmath(result, d)
         return result
 
     def call_mpmath(self, mpmath_function, mpmath_args):
@@ -338,12 +357,12 @@ def append_last():
                 if is_machine_precision:
                     numbers = [item.to_mpmath() for item in numbers]
                     number = mpmath.fsum(numbers)
-                    number = Number.from_mpmath(number)
+                    number = from_mpmath(number)
                 else:
                     with mpmath.workprec(prec):
                         numbers = [item.to_mpmath() for item in numbers]
                         number = mpmath.fsum(numbers)
-                        number = Number.from_mpmath(number, dps(prec))
+                        number = from_mpmath(number, dps(prec))
             else:
                 number = from_sympy(sum(item.to_sympy() for item in numbers))
         else:
@@ -670,12 +689,12 @@ def apply(self, items, evaluation):
                 if is_machine_precision:
                     numbers = [item.to_mpmath() for item in numbers]
                     number = mpmath.fprod(numbers)
-                    number = Number.from_mpmath(number)
+                    number = from_mpmath(number)
                 else:
                     with mpmath.workprec(prec):
                         numbers = [item.to_mpmath() for item in numbers]
                         number = mpmath.fprod(numbers)
-                        number = Number.from_mpmath(number, dps(prec))
+                        number = from_mpmath(number, dps(prec))
             else:
                 number = sympy.Mul(*[item.to_sympy() for item in numbers])
                 number = from_sympy(number)

mathics/builtin/base.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# cython: language_level=3
 
 import re
 import sympy

mathics/builtin/files.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# cython: language_level=3
 
 """
 File Operations
@@ -19,7 +20,7 @@
 import requests
 import pathlib
 
-from io import BytesIO, StringIO
+from io import BytesIO
 import os.path as osp
 from itertools import chain
 
@@ -29,21 +30,20 @@
 from mathics.core.parser import MathicsFileLineFeeder
 
 from mathics.core.expression import (
+    BoxError,
+    Complex,
     Expression,
+    Integer,
+    MachineReal,
     Real,
-    Complex,
     String,
     Symbol,
     SymbolFailed,
     SymbolFalse,
     SymbolNull,
     SymbolTrue,
-    SymbolInfinity,
+    from_mpmath,
     from_python,
-    Integer,
-    BoxError,
-    MachineReal,
-    Number,
     valid_context_name,
 )
 from mathics.core.numbers import dps
@@ -1067,7 +1067,7 @@ def _Real128_reader(s):
             else:
                 result = mpmath.fdiv(core, 2 ** -exp)
 
-            return Number.from_mpmath(result, dps(112))
+            return from_mpmath(result, dps(112))
 
     @staticmethod
     def _TerminatedString_reader(s):
@@ -2187,7 +2187,8 @@ def check_options(options):
             result = {}
             trace_get = evaluation.parse('Settings`$TraceGet')
             if options["System`Trace"].to_python() or trace_get.evaluate(evaluation) == SymbolTrue:
-                result["TraceFn"] = print
+                import builtins
+                result["TraceFn"] = builtins.print
             else:
                 result["TraceFn"] = None
 

mathics/builtin/linalg.py

@@ -11,7 +11,7 @@
 from mathics.version import __version__  # noqa used in loading to check consistency.
 from mathics.builtin.base import Builtin
 from mathics.core.convert import from_sympy
-from mathics.core.expression import Expression, Integer, Symbol, Real, Number
+from mathics.core.expression import Expression, Integer, Symbol, Real, from_mpmath
 
 
 def matrix_data(m):
@@ -385,7 +385,7 @@ def apply(self, m, b, evaluation):
 
         try:
             solution = matrix.solve_least_squares(b_vector)  # default method = Cholesky
-        except NotImplementedError as e:
+        except NotImplementedError:
             return evaluation.message("LeastSquares", "underdetermined")
 
         return from_sympy(solution)
@@ -729,7 +729,7 @@ def mp_eig(mp_matrix) -> Expression:
         eigenvalues.sort(
             key=lambda v: (abs(v[0]), -v[0].real, -(v[0].imag)), reverse=True
         )
-        eigenvalues = [[Number.from_mpmath(c) for c in row] for row in eigenvalues]
+        eigenvalues = [[from_mpmath(c) for c in row] for row in eigenvalues]
         return Expression("List", *eigenvalues)
 
     options = {"Method": "sympy"}
@@ -831,7 +831,7 @@ def apply(self, m, power, evaluation):
             res = sympy_m ** sympy_power
         except NotImplementedError:
             return evaluation.message("MatrixPower", "matrixpowernotimplemented", m)
-        except ValueError as e:
+        except ValueError:
             return evaluation.message("MatrixPower", "matrixpowernotinvertible", m)
         return from_sympy(res)