Merge pull request #77 from lgray/topic_recurse_speed

Modifications to speed up recurse in when certain information is known
scikit-hep · Feb 5, 2019 · faa909f · faa909f
2 parents bcc5954 + cc5f895
commit faa909f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/awkward/array/jagged.py b/awkward/array/jagged.py
@@ -879,7 +879,10 @@ def __array_ufunc__(self, ufunc, method, *inputs, **kwargs):
 
                 if parents is None:
                     parents = jaggedarray.parents
-                    good = (parents >= 0)
+                    if self._canuseoffset() and len(jaggedarray.starts) > 0 and jaggedarray.starts[0] == 0:
+                        good = None
+                    else:
+                        good = (parents >= 0)
 
                 def recurse(x):
                     if isinstance(x, awkward.array.objects.ObjectArray):
@@ -891,6 +894,13 @@ def recurse(x):
                             content[n] = recurse(x[n])
                         return content
 
+                    elif good is None:
+                        if len(x.shape) == 0:
+                            content = self.numpy.full(len(parents), x, dtype=x.dtype)
+                        else:
+                            content = x[parents]
+                        return content
+
                     else:
                         content = self.numpy.empty(len(parents), dtype=x.dtype)
                         if len(x.shape) == 0:

diff --git a/awkward/version.py b/awkward/version.py
@@ -30,7 +30,7 @@
 
 import re
 
-__version__ = "0.8.2"
+__version__ = "0.8.3"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))