fix: merge main

scikit-hep · Nov 18, 2022 · 97a2589 · 97a2589
1 parent 5485e0e
commit 97a2589
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/awkward/nplikes.py b/src/awkward/nplikes.py
@@ -12,7 +12,9 @@
 import ctypes
 from collections.abc import Iterable
 
+import awkward_cpp.cpu_kernels
 import numpy
+from awkward_cpp.lib import _ext
 
 import awkward as ak
 
@@ -471,7 +473,7 @@ def to_rectilinear(self, array, *args, **kwargs):
                 ak.ArrayBuilder,
                 ak.contents.Content,
                 ak.record.Record,
-                ak._ext.ArrayBuilder,
+                _ext.ArrayBuilder,
             ),
         ):
             return ak.operations.ak_to_numpy.to_numpy(array, *args, **kwargs)
@@ -483,7 +485,9 @@ def to_rectilinear(self, array, *args, **kwargs):
             raise TypeError("to_rectilinear argument must be iterable")
 
     def __getitem__(self, name_and_types):
-        return NumpyKernel(ak._cpu_kernels.kernel[name_and_types], name_and_types)
+        return NumpyKernel(
+            awkward_cpp.cpu_kernels.kernel[name_and_types], name_and_types
+        )
 
     def __init__(self):
         self._module = numpy
@@ -764,7 +768,7 @@ def to_rectilinear(self, array, *args, **kwargs):
                 ak.ArrayBuilder,
                 ak.contents.Content,
                 ak.record.Record,
-                ak._ext.ArrayBuilder,
+                _ext.ArrayBuilder,
             ),
         ):
             return ak.operations.ak_to_jax.to_jax(array, *args, **kwargs)
@@ -778,7 +782,9 @@ def to_rectilinear(self, array, *args, **kwargs):
             )
 
     def __getitem__(self, name_and_types):
-        return NumpyKernel(ak._cpu_kernels.kernel[name_and_types], name_and_types)
+        return NumpyKernel(
+            awkward_cpp.cpu_kernels.kernel[name_and_types], name_and_types
+        )
 
     def __init__(self):
         jax = ak.jax.import_jax()