Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

api: enforce sympy shifts #2471

Merged
merged 1 commit into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pytest-core-nompi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
run : |
if [ "${{ runner.os }}" == 'macOS' ]; then
brew install llvm libomp
echo "/opt/homebrew/bin:/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH
echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH
fi
id: set-tests

Expand Down
6 changes: 3 additions & 3 deletions devito/finite_differences/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from itertools import product

import numpy as np
from sympy import S, finite_diff_weights, cacheit, sympify, Function
from sympy import S, finite_diff_weights, cacheit, sympify, Function, Rational

from devito.tools import Tag, as_tuple
from devito.types.dimension import StencilDimension
Expand Down Expand Up @@ -308,8 +308,8 @@ def make_shift_x0(shift, ndim):
"""
if shift is None:
return lambda s, d, i, j: None
elif isinstance(shift, float):
return lambda s, d, i, j: d + s * d.spacing
elif sympify(shift).is_Number:
return lambda s, d, i, j: d + Rational(s) * d.spacing
elif type(shift) is tuple and np.shape(shift) == ndim:
if len(ndim) == 1:
return lambda s, d, i, j: d + s[j] * d.spacing
Expand Down
2 changes: 2 additions & 0 deletions devito/symbolics/printer.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from mpmath.libmp import prec_to_dps, to_str
from packaging.version import Version

from sympy.logic.boolalg import BooleanFunction
from sympy.printing.precedence import PRECEDENCE_VALUES, precedence
from sympy.printing.c import C99CodePrinter
Expand Down Expand Up @@ -185,6 +186,7 @@ def _print_Float(self, expr):
dps = 0
else:
dps = prec_to_dps(expr._prec)

if self._settings["full_prec"] is True:
strip = False
elif self._settings["full_prec"] is False:
Expand Down
4 changes: 3 additions & 1 deletion tests/test_tensors.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import numpy as np
import sympy
from sympy import Rational

import pytest

Expand Down Expand Up @@ -372,7 +373,8 @@ def test_shifted_lap_of_vector(shift, ndim):
assert dfvi == ref


@pytest.mark.parametrize('shift, ndim', [(None, 2), (.5, 2), (.5, 3),
@pytest.mark.parametrize('shift, ndim', [(None, 2), (Rational(1/2), 2),
(Rational(1/2), 3),
(tuple([tuple([.5]*3)]*3), 3)])
def test_shifted_lap_of_tensor(shift, ndim):
grid = Grid(tuple([11]*ndim))
Expand Down
Loading