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.

Sign up for GitHub

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

Functions on subdomains (WIP) #1380

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Functions on subdomains (WIP) #1380

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1c91a0f
grid, tests: Update + initial tests (WIP).
rhodrin Jul 2, 2020
a087c9f
grid: Add functions on subdomains functionality for left and right su…
rhodrin Jul 7, 2020
4fac370
algorithms: Update Fns on SubDomain's indexing here + bug fixes.
rhodrin Jul 28, 2020
b00a523
Placeholder.
rhodrin Jul 30, 2020
1783a71
Fns on subdomains: Updates for sparse functions, pretty horrible and …
rhodrin Aug 6, 2020
19b77dd
.
rhodrin Aug 11, 2020
61b3904
interpolators: Tidying. tests: Fix iso-acoustic subdomains test.
rhodrin Aug 11, 2020
536d8a1
tests: Update tolerance + add mpi fixme.
rhodrin Aug 14, 2020
cb800dc
test: Test tolerance change.
rhodrin Aug 14, 2020
03b86a6
.
rhodrin Sep 16, 2020
e754655
.
rhodrin Sep 24, 2020
3946951
Still need to add new decomposition for subdomains.
rhodrin Oct 5, 2020
2ebd067
?
rhodrin Oct 20, 2020
2a377c1
I have an idea! Lets hope that I don't forget what it is...
rhodrin Oct 29, 2020
f50102d
grid: Minor updates and reminders.
rhodrin Oct 30, 2020
7f61284
.
rhodrin Nov 2, 2020
77c9c69
.
rhodrin Nov 3, 2020
05e56b7
.
rhodrin Nov 4, 2020
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
grid: Add functions on subdomains functionality for left and right su… 
…bdomains.
  • Loading branch information
@rhodrin
rhodrin committed Sep 15, 2020
commit a087c9f6577d90474f26724f0fcd3a6d263d781d
93 changes: 57 additions & 36 deletions devito/types/grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,67 +353,86 @@ def __subdomain_finalize__(self, dimensions, shape, distributor=None, **kwargs):
# Create the SubDomain's SubDimensions
sub_dimensions = []
sdshape = []
access_map = {}
counter = kwargs.get('counter', 0) - 1
for k, v, s in zip(self.define(dimensions).keys(),
self.define(dimensions).values(), shape):
if isinstance(v, Dimension):
sub_dimensions.append(v)
sdshape.append(s)
access_map.update({v: v})
else:
sd_name = 'i%d%s' % (counter, k.name)
try:
# Case ('middle', int, int)
side, thickness_left, thickness_right = v
if side != 'middle':
raise ValueError("Expected side 'middle', not `%s`" % side)
sd = SubDimension.middle('i%d%s' % (counter, k.name),
k, thickness_left, thickness_right)
sub_dimensions.append(sd)
thickness = s-thickness_left-thickness_right
sdshape.append(thickness)
access_map.update({sd: sd-thickness_left})
sub_dimensions.append(SubDimension.middle(sd_name, k, thickness_left,
thickness_right))
sdshape.append(s-thickness_left-thickness_right)
except ValueError:
side, thickness = v
if side == 'left':
if s-thickness < 0:
raise ValueError("Maximum thickness of dimension %s "
"is %d, not %d" % (k.name, s, thickness))
sub_dimensions.append(SubDimension.left('i%d%s' %
(counter, k.name),
k, thickness))
sub_dimensions.append(SubDimension.left(sd_name, k,
thickness))
sdshape.append(thickness)
access_map.update({k: 0})
elif side == 'right':
if s-thickness < 0:
raise ValueError("Maximum thickness of dimension %s "
"is %d, not %d" % (k.name, s, thickness))
sub_dimensions.append(SubDimension.right('i%d%s' %
(counter, k.name),
k, thickness))
sub_dimensions.append(SubDimension.right(sd_name, k,
thickness))
sdshape.append(thickness)
access_map.update({k: k-(s-thickness)})
else:
raise ValueError("Expected sides 'left|right', not `%s`" % side)
self._dimensions = tuple(sub_dimensions)

# Compute the SubDomain shape
# Set the SubDomain shape
self._shape = tuple(sdshape)

# TODO: Tidy + generalize
# Local shape for distributed cases + access map for any
# Function defined on this `SubDomain`.
if distributor and distributor.is_parallel:
access_map = {}
shape_local = []
for dim, v, d in zip(sub_dimensions, self.define(dimensions).values(),
distributor.decomposition):
if isinstance(v, Dimension):
shape_local.append(len(d.loc_abs_numb))
access_map.update({v: v})
# Derive the local shape for `SubDomain`'s on distributed grids along with the
# memory access map for any `Function` defined on this `SubDomain`.
access_map = {}
shape_local = []
for dim, d, s in zip(sub_dimensions, distributor.decomposition, self._shape):
if dim.is_Sub:
if dim._local:
if distributor and distributor.is_parallel:
if dim.thickness.right[1] == 0:
ls = len(d.loc_abs_numb)
minc = d.glb_min
maxc = d.glb_max - (ls-dim.thickness.left[1])
l = d.index_glb_to_loc(0, LEFT)
r = d.index_glb_to_loc(ls-dim.thickness.left[1], RIGHT)
else:
ls = len(d.loc_abs_numb)
minc = d.glb_min + (ls-dim.thickness.right[1])
maxc = d.glb_max
l = d.index_glb_to_loc(ls-dim.thickness.right[1], LEFT)
r = d.index_glb_to_loc(0, RIGHT)
if d.loc_abs_min > maxc:
shape_local.append(0)
elif d.loc_abs_max < minc:
shape_local.append(0)
else:
if l is None:
l = 0
if r is None:
r = 0
shape_local.append(ls-l-r)
access_map.update({dim: dim-l if l else dim})
else:
if dim.thickness.left[1] == 0:
access_map.update({dim: dim-(s-dim.thickness.right[1])})
else:
access_map.update({dim: dim})
shape_local.append(s)
else:
try:
side, tl, tr = v
if distributor and distributor.is_parallel:
tl = dim.thickness.left[1]
tr = dim.thickness.right[1]
ls = len(d.loc_abs_numb)
minc = d.glb_min + tl
maxc = d.glb_max - tr
Expand All @@ -429,13 +448,15 @@ def __subdomain_finalize__(self, dimensions, shape, distributor=None, **kwargs):
if r is None:
r = 0
shape_local.append(ls-l-r)
access_map.update({dim: dim-l})
except ValueError:
raise NotImplementedError
self._shape_local = tuple(shape_local)
else:
self._shape_local = self._shape
access_map.update({dim: dim-l if l else dim})
else:
access_map.update({dim: dim-dim.thickness.left[1]})
shape_local.append(s)
else:
shape_local.append(len(d.loc_abs_numb))
access_map.update({dim: dim})
self._access_map = access_map
self._shape_local = tuple(shape_local)

def __eq__(self, other):
if not isinstance(other, SubDomain):
Expand Down