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

dsl: Patch issue #1578 (Check legality of symbolic derivatives) #1598

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
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
Prev Previous commit
Next Next commit
dsl: patch 2
Leitevmd committed May 5, 2021
commit ca25ce4e9016655b16a6bfa16eca84fa02d093a9
6 changes: 5 additions & 1 deletion devito/types/dense.py
Original file line number Diff line number Diff line change
@@ -860,7 +860,11 @@ def _arg_check(self, args, intervals):
warning("Data type %s of runtime value `%s` does not match the "
"Function data type %s" % (key.dtype, self.name, self.dtype))
for i, s in zip(self.dimensions, key.shape):
i._arg_check(args, s, intervals[i])
if i not in intervals and i.is_Sub:
interval = intervals[i.parent]
else:
interval = intervals[i]
i._arg_check(args, s, interval)

def _arg_as_ctype(self, args, alias=None):
key = alias or self
16 changes: 16 additions & 0 deletions devito/types/dimension.py
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@
from devito.types.args import ArgProvider
from devito.types.basic import Symbol, DataSymbol, Scalar

import inspect

__all__ = ['Dimension', 'SpaceDimension', 'TimeDimension', 'DefaultDimension',
'CustomDimension', 'SteppingDimension', 'SubDimension', 'ConditionalDimension',
'dimensions', 'ModuloDimension', 'IncrDimension']
@@ -672,6 +674,20 @@ def _arg_values(self, args, interval, grid, **kwargs):
['symbolic_min', 'symbolic_max', 'thickness', 'local']
_pickle_kwargs = []

def _arg_check(self, *args):
if len(args) == 2:
# Comes from Operator._prepare_arguments
dargs, interval = args
else:
# Comes from DiscreteFunction._arg_check
dargs, size, interval = args
if not interval.is_Null:
test0 = self._interval.subs(dargs).start + interval.lower < 0
test1 = self._interval.subs(dargs).end + interval.upper > size
if test0 or test1:
raise ValueError(' OOB access\n')
return


class ConditionalDimension(DerivedDimension):