deps: support sympy 1.13

.github/workflows/pytest-core-nompi.yml

@@ -68,14 +68,14 @@ jobs:
           os: ubuntu-20.04
           arch: "gcc-10"
           language: "C"
-          sympy: "1.10"
+          sympy: "1.11"
 
         - name: pytest-ubuntu-py312-gcc13-omp
           python-version: '3.12'
           os: ubuntu-24.04
           arch: "gcc-13"
           language: "openmp"
-          sympy: "1.11"
+          sympy: "1.13"
 
         - name: pytest-ubuntu-py39-gcc9-omp
           python-version: '3.9'

devito/finite_differences/differentiable.py

@@ -6,9 +6,13 @@
 import sympy
 from sympy.core.add import _addsort
 from sympy.core.mul import _keep_coeff, _mulsort
-from sympy.core.core import ordering_of_classes
 from sympy.core.decorators import call_highest_priority
 from sympy.core.evalf import evalf_table
+try:
+    from sympy.core.core import ordering_of_classes
+except ImportError:
+    # Moved in 1.13
+    from sympy.core.basic import ordering_of_classes
 
 from devito.finite_differences.tools import make_shift_x0, coeff_priority
 from devito.logger import warning

devito/passes/clusters/cse.py

@@ -2,7 +2,11 @@
 from functools import singledispatch
 
 from sympy import Add, Function, Indexed, Mul, Pow
-from sympy.core.core import ordering_of_classes
+try:
+    from sympy.core.core import ordering_of_classes
+except ImportError:
+    # Moved in 1.13
+    from sympy.core.basic import ordering_of_classes
 
 from devito.finite_differences.differentiable import IndexDerivative
 from devito.ir import Cluster, Scope, cluster_pass

devito/symbolics/manipulation.py

@@ -289,7 +289,7 @@ def pow_to_mul(expr):
         if exp > 10 or exp < -10 or exp == 0:
             # Large powers remain untouched
             return expr
-        elif exp == -1 or int(exp) != exp:
+        elif exp == -1 or (int(exp) - exp != 0):
             # Reciprocals and fractional powers also remain untouched,
             # but at least we traverse the base looking for other Pows
             return expr.func(pow_to_mul(base), exp, evaluate=False)

devito/types/misc.py

@@ -2,7 +2,11 @@
 
 import numpy as np
 import sympy
-from sympy.core.core import ordering_of_classes
+try:
+    from sympy.core.core import ordering_of_classes
+except ImportError:
+    # Moved in 1.13
+    from sympy.core.basic import ordering_of_classes
 
 from devito.types import Array, CompositeObject, Indexed, Symbol, LocalObject
 from devito.types.basic import IndexedData

requirements.txt

@@ -1,6 +1,6 @@
 pip>=9.0.1
 numpy>1.16,<2.1
-sympy>=1.9,<1.13
+sympy>=1.9,<1.14
 psutil>=5.1.0,<7.0
 py-cpuinfo<10
 cgen>=2020.1

setup.py

@@ -15,7 +15,7 @@ def numpy_compat(required):
 
     # Due to api changes in numpy 2.0, it requires sympy 1.12.1 at the minimum
     # Check if sympy is installed and enforce numpy version accordingly.
-    # If sympy isn't installed, endforce sympy>=1.12.1 and numpy>=2.0
+    # If sympy isn't installed, enforce sympy>=1.12.1 and numpy>=2.0
     try:
         sympy_version = pkg_resources.get_distribution("sympy").version
         min_ver2 = pkg_resources.parse_version("1.12.1")