From 18e08aba0369cac59ee1bc7704bb5a35731e4a41 Mon Sep 17 00:00:00 2001 From: Alexandru Fikl <alexfikl@gmail.com> Date: Sun, 26 Sep 2021 20:34:16 -0500 Subject: [PATCH] rename argument in unflatten_to_numpy --- arraycontext/container/traversal.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arraycontext/container/traversal.py b/arraycontext/container/traversal.py index c3bf32f..dc60880 100644 --- a/arraycontext/container/traversal.py +++ b/arraycontext/container/traversal.py @@ -655,25 +655,26 @@ def unflatten_from_numpy( # NOTE: https://github.com/python/mypy/issues/7057 offset = 0 - def _unflatten_from_numpy(subary: ArrayOrContainerT) -> ArrayOrContainerT: + def _unflatten_from_numpy( + template_subary: ArrayOrContainerT) -> ArrayOrContainerT: nonlocal offset try: - iterable = serialize_container(subary) + iterable = serialize_container(template_subary) except TypeError: # NOTE: the max is needed to handle device scalars with size == 0 - offset += max(1, subary.size) + offset += max(1, template_subary.size) if offset > ary.size: raise ValueError("'template' and 'ary' sizes do not match") # FIXME: subary can be F-contiguous and ary will always be C-contiguous return actx.from_numpy( - ary[offset - subary.size:offset] - .astype(subary.dtype, copy=False) - .reshape(subary.shape) + ary[offset - template_subary.size:offset] + .astype(template_subary.dtype, copy=False) + .reshape(template_subary.shape) ) else: - return deserialize_container(subary, [ + return deserialize_container(template_subary, [ (key, _unflatten_from_numpy(isubary)) for key, isubary in iterable ]) -- GitLab