scikit-hep · jpivarski · Jun 30, 2020 · May 12, 2020 · Jun 16, 2020 · Jun 16, 2020
diff --git a/include/awkward/Content.h b/include/awkward/Content.h
@@ -479,7 +479,7 @@ namespace awkward {
     /// {@link ListArrayOf ListArray}, only the `starts` and `stops` get
     /// duplicated, not the `content` (and similarly for all other node types).
     virtual const ContentPtr
-      carry(const Index64& carry) const = 0;
+      carry(const Index64& carry, bool must_be_eager = false) const = 0;
 
     /// @brief The parameter associated with `key` at the first level
     /// that has a non-null value, descending only as deep as the first

diff --git a/include/awkward/array/BitMaskedArray.h b/include/awkward/array/BitMaskedArray.h
@@ -279,7 +279,7 @@ namespace awkward {
                    const Index64& advanced) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/ByteMaskedArray.h b/include/awkward/array/ByteMaskedArray.h
@@ -248,7 +248,7 @@ namespace awkward {
                    const Index64& advanced) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/EmptyArray.h b/include/awkward/array/EmptyArray.h
@@ -161,7 +161,7 @@ namespace awkward {
       getitem_fields(const std::vector<std::string>& keys) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/IndexedArray.h b/include/awkward/array/IndexedArray.h
@@ -310,7 +310,7 @@ namespace awkward {
                    const Index64& advanced) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/ListArray.h b/include/awkward/array/ListArray.h
@@ -271,7 +271,7 @@ namespace awkward {
       getitem_fields(const std::vector<std::string>& keys) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/ListOffsetArray.h b/include/awkward/array/ListOffsetArray.h
@@ -258,7 +258,7 @@ namespace awkward {
                           const Slice& tail) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/None.h b/include/awkward/array/None.h
@@ -112,7 +112,7 @@ namespace awkward {
 
     /// @exception std::runtime_error is always thrown
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     /// @exception std::runtime_error is always thrown
     int64_t

diff --git a/include/awkward/array/NumpyArray.h b/include/awkward/array/NumpyArray.h
@@ -443,7 +443,7 @@ namespace awkward {
                    const Index64& advanced) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/RawArray.h b/include/awkward/array/RawArray.h
@@ -658,7 +658,7 @@ namespace awkward {
     }
 
     const ContentPtr
-      carry(const Index64& carry) const override {
+      carry(const Index64& carry, bool must_be_eager) const override {
       std::shared_ptr<T> ptr(new T[(size_t)carry.length()],
                              util::array_deleter<T>());
       struct Error err = awkward_numpyarray_getitem_next_null_64(
@@ -1077,7 +1077,7 @@ namespace awkward {
           nextcarryptr[i] = start + step*i;
         }
 
-        return carry(nextcarry);
+        return carry(nextcarry, false);
       }
     }
 
@@ -1098,7 +1098,7 @@ namespace awkward {
         flathead.length(),
         length_);
       util::handle_error(err, classname(), identities_.get());
-      return carry(flathead);
+      return carry(flathead, false);
     }
 
     const ContentPtr

diff --git a/include/awkward/array/Record.h b/include/awkward/array/Record.h
@@ -135,7 +135,7 @@ namespace awkward {
 
     /// @exception std::runtime_error is always thrown
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       purelist_depth() const override;

diff --git a/include/awkward/array/RecordArray.h b/include/awkward/array/RecordArray.h
@@ -245,7 +245,7 @@ namespace awkward {
                    const Index64& advanced) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/RegularArray.h b/include/awkward/array/RegularArray.h
@@ -223,7 +223,7 @@ namespace awkward {
       getitem_fields(const std::vector<std::string>& keys) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/UnionArray.h b/include/awkward/array/UnionArray.h
@@ -255,7 +255,7 @@ namespace awkward {
                    const Index64& advanced) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/UnmaskedArray.h b/include/awkward/array/UnmaskedArray.h
@@ -199,7 +199,7 @@ namespace awkward {
                    const Index64& advanced) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     int64_t
       numfields() const override;

diff --git a/include/awkward/array/VirtualArray.h b/include/awkward/array/VirtualArray.h
@@ -216,7 +216,7 @@ namespace awkward {
       getitem_fields(const std::vector<std::string>& keys) const override;
 
     const ContentPtr
-      carry(const Index64& carry) const override;
+      carry(const Index64& carry, bool must_be_eager) const override;
 
     const std::string
       purelist_parameter(const std::string& key) const override;

diff --git a/src/libawkward/array/BitMaskedArray.cpp b/src/libawkward/array/BitMaskedArray.cpp
@@ -626,8 +626,8 @@ namespace awkward {
   }
 
   const ContentPtr
-  BitMaskedArray::carry(const Index64& carry) const {
-    return toByteMaskedArray().get()->carry(carry);
+  BitMaskedArray::carry(const Index64& carry, bool must_be_eager) const {
+    return toByteMaskedArray().get()->carry(carry, must_be_eager);
   }
 
   int64_t

diff --git a/src/libawkward/array/ByteMaskedArray.cpp b/src/libawkward/array/ByteMaskedArray.cpp
@@ -220,7 +220,7 @@ namespace awkward {
       valid_when_);
     util::handle_error(err2, classname(), identities_.get());
 
-    return content_.get()->carry(nextcarry);
+    return content_.get()->carry(nextcarry, true);
   }
 
   const ContentPtr
@@ -639,7 +639,7 @@ namespace awkward {
   }
 
   const ContentPtr
-  ByteMaskedArray::carry(const Index64& carry) const {
+  ByteMaskedArray::carry(const Index64& carry, bool must_be_eager) const {
     Index8 nextmask(carry.length());
     struct Error err = awkward_bytemaskedarray_getitem_carry_64(
       nextmask.ptr().get(),
@@ -1036,7 +1036,7 @@ namespace awkward {
       Index64 nextcarry = pair.first;
       Index64 outindex = pair.second;
 
-      ContentPtr next = content_.get()->carry(nextcarry);
+      ContentPtr next = content_.get()->carry(nextcarry, false);
       ContentPtr out = next.get()->combinations(n,
                                                 replacement,
                                                 recordlookup,

diff --git a/src/libawkward/array/EmptyArray.cpp b/src/libawkward/array/EmptyArray.cpp
@@ -295,7 +295,7 @@ namespace awkward {
   }
 
   const ContentPtr
-  EmptyArray::carry(const Index64& carry) const {
+  EmptyArray::carry(const Index64& carry, bool must_be_eager) const {
     return shallow_copy();
   }
 

diff --git a/src/libawkward/array/IndexedArray.cpp b/src/libawkward/array/IndexedArray.cpp
@@ -359,7 +359,7 @@ namespace awkward {
         content_.get()->length());
       util::handle_error(err2, classname(), identities_.get());
 
-      return content_.get()->carry(nextcarry);
+      return content_.get()->carry(nextcarry, true);
     }
     else {
       Index64 nextcarry(length());
@@ -371,7 +371,7 @@ namespace awkward {
         content_.get()->length());
       util::handle_error(err, classname(), identities_.get());
 
-      return content_.get()->carry(nextcarry);
+      return content_.get()->carry(nextcarry, true);
     }
   }
 
@@ -1140,7 +1140,7 @@ namespace awkward {
         Index64 nextcarry = pair.first;
         IndexOf<T> outindex = pair.second;
 
-        ContentPtr next = content_.get()->carry(nextcarry);
+        ContentPtr next = content_.get()->carry(nextcarry, true);
         ContentPtr out = next.get()->getitem_next(head, tail, advanced);
         IndexedArrayOf<T, ISOPTION> out2(identities_,
                                          parameters_,
@@ -1158,7 +1158,7 @@ namespace awkward {
           content_.get()->length());
         util::handle_error(err, classname(), identities_.get());
 
-        ContentPtr next = content_.get()->carry(nextcarry);
+        ContentPtr next = content_.get()->carry(nextcarry, true);
         return next.get()->getitem_next(head, tail, advanced);
       }
     }
@@ -1189,7 +1189,7 @@ namespace awkward {
 
   template <typename T, bool ISOPTION>
   const ContentPtr
-  IndexedArrayOf<T, ISOPTION>::carry(const Index64& carry) const {
+  IndexedArrayOf<T, ISOPTION>::carry(const Index64& carry, bool must_be_eager) const {
     IndexOf<T> nextindex(carry.length());
     struct Error err = util::awkward_indexedarray_getitem_carry_64<T>(
       nextindex.ptr().get(),
@@ -1664,7 +1664,7 @@ namespace awkward {
         content_.get()->length());
       util::handle_error(err2, classname(), identities_.get());
 
-      ContentPtr next = content_.get()->carry(nextcarry);
+      ContentPtr next = content_.get()->carry(nextcarry, true);
 
       SliceItemPtr slicecontent = next.get()->asslice();
       if (SliceArray64* raw =
@@ -1961,7 +1961,7 @@ namespace awkward {
         Index64 nextcarry = pair.first;
         IndexOf<T> outindex = pair.second;
 
-        ContentPtr next = content_.get()->carry(nextcarry);
+        ContentPtr next = content_.get()->carry(nextcarry, false);
         ContentPtr out = next.get()->combinations(n,
                                                   replacement,
                                                   recordlookup,
@@ -2281,7 +2281,7 @@ namespace awkward {
       Index64 nextcarry = pair.first;
       IndexOf<T> outindex = pair.second;
 
-      ContentPtr next = content_.get()->carry(nextcarry);
+      ContentPtr next = content_.get()->carry(nextcarry, true);
       ContentPtr out = next.get()->getitem_next_jagged(slicestarts,
                                                        slicestops,
                                                        slicecontent,
@@ -2302,7 +2302,7 @@ namespace awkward {
         content_.get()->length());
       util::handle_error(err, classname(), identities_.get());
 
-      ContentPtr next = content_.get()->carry(nextcarry);
+      ContentPtr next = content_.get()->carry(nextcarry, true);
       return next.get()->getitem_next_jagged(slicestarts,
                                              slicestops,
                                              slicecontent,

diff --git a/src/libawkward/array/ListArray.cpp b/src/libawkward/array/ListArray.cpp
@@ -683,7 +683,7 @@ namespace awkward {
 
   template <typename T>
   const ContentPtr
-  ListArrayOf<T>::carry(const Index64& carry) const {
+  ListArrayOf<T>::carry(const Index64& carry, bool must_be_eager) const {
     int64_t lenstarts = starts_.length();
     if (stops_.length() < lenstarts) {
       util::handle_error(
@@ -1357,7 +1357,7 @@ namespace awkward {
 
       ContentPtrVec contents;
       for (auto ptr : tocarry) {
-        contents.push_back(content_.get()->carry(Index64(ptr, 0, totallen)));
+        contents.push_back(content_.get()->carry(Index64(ptr, 0, totallen), false));
       }
       ContentPtr recordarray = std::make_shared<RecordArray>(
         Identities::none(),

diff --git a/src/libawkward/array/ListOffsetArray.cpp b/src/libawkward/array/ListOffsetArray.cpp
@@ -695,7 +695,7 @@ namespace awkward {
 
   template <typename T>
   const ContentPtr
-  ListOffsetArrayOf<T>::carry(const Index64& carry) const {
+  ListOffsetArrayOf<T>::carry(const Index64& carry, bool must_be_eager) const {
     IndexOf<T> starts = util::make_starts(offsets_);
     IndexOf<T> stops = util::make_stops(offsets_);
     IndexOf<T> nextstarts(carry.length());
@@ -1661,7 +1661,7 @@ namespace awkward {
 
       ContentPtrVec contents;
       for (auto ptr : tocarry) {
-        contents.push_back(content_.get()->carry(Index64(ptr, 0, totallen)));
+        contents.push_back(content_.get()->carry(Index64(ptr, 0, totallen), false));
       }
       ContentPtr recordarray = std::make_shared<RecordArray>(
         Identities::none(), parameters, contents, recordlookup);

diff --git a/src/libawkward/array/None.cpp b/src/libawkward/array/None.cpp
@@ -131,7 +131,7 @@ namespace awkward {
   }
 
   const ContentPtr
-  None::carry(const Index64& carry) const {
+  None::carry(const Index64& carry, bool must_be_eager) const {
     throw std::runtime_error("undefined operation: None::carry");
   }
 

diff --git a/src/libawkward/array/NumpyArray.cpp b/src/libawkward/array/NumpyArray.cpp
@@ -1222,7 +1222,7 @@ namespace awkward {
   }
 
   const ContentPtr
-  NumpyArray::carry(const Index64& carry) const {
+  NumpyArray::carry(const Index64& carry, bool must_be_eager) const {
     std::shared_ptr<void> ptr(
       new uint8_t[(size_t)(carry.length()*strides_[0])],
       util::array_deleter<uint8_t>());

diff --git a/src/libawkward/array/Record.cpp b/src/libawkward/array/Record.cpp
@@ -217,7 +217,7 @@ namespace awkward {
   }
 
   const ContentPtr
-  Record::carry(const Index64& carry) const {
+  Record::carry(const Index64& carry, bool must_be_eager) const {
     throw std::runtime_error("undefined operation: Record::carry");
   }
 

diff --git a/src/libawkward/array/RecordArray.cpp b/src/libawkward/array/RecordArray.cpp
@@ -737,20 +737,29 @@ namespace awkward {
   }
 
   const ContentPtr
-  RecordArray::carry(const Index64& carry) const {
-    ContentPtrVec contents;
-    for (auto content : contents_) {
-      contents.push_back(content.get()->carry(carry));
-    }
+  RecordArray::carry(const Index64& carry, bool must_be_eager) const {
     IdentitiesPtr identities(nullptr);
     if (identities_.get() != nullptr) {
       identities = identities_.get()->getitem_carry_64(carry);
     }
-    return std::make_shared<RecordArray>(identities,
-                                         parameters_,
-                                         contents,
-                                         recordlookup_,
-                                         carry.length());
+    if (must_be_eager) {
+      ContentPtrVec contents;
+      for (auto content : contents_) {
+        contents.push_back(content.get()->carry(carry, must_be_eager));
+      }
+      return std::make_shared<RecordArray>(identities,
+                                           parameters_,
+                                           contents,
+                                           recordlookup_,
+                                           carry.length());
+
+    }
+    else {
+      return std::make_shared<IndexedArray64>(identities,
+                                              util::Parameters(),
+                                              carry,
+                                              shallow_copy());
+    }
   }
 
   int64_t