Merge pull request #575 from OP2/pefarrell/mixedmap-kernel-args-R

Fix MixedMap._kernel_args_ with R block
OP2 · Mar 19, 2020 · 859003d · 859003d
2 parents 8e1c572 + 7551de8
commit 859003d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pyop2/base.py b/pyop2/base.py
@@ -2652,15 +2652,15 @@ def _cache_key(cls, maps):
 
     @cached_property
     def _kernel_args_(self):
-        return tuple(itertools.chain(*(m._kernel_args_ for m in self)))
+        return tuple(itertools.chain(*(m._kernel_args_ for m in self if m is not None)))
 
     @cached_property
     def _argtypes_(self):
-        return tuple(itertools.chain(*(m._argtypes_ for m in self)))
+        return tuple(itertools.chain(*(m._argtypes_ for m in self if m is not None)))
 
     @cached_property
     def _wrapper_cache_key_(self):
-        return tuple(m._wrapper_cache_key_ for m in self)
+        return tuple(m._wrapper_cache_key_ for m in self if m is not None)
 
     @cached_property
     def split(self):