refactor: rename ak.nplike → ak.nplikes & nplikes.of →nplikes.nplike_of

dev/generate-tests.py

@@ -674,7 +674,7 @@ def gencudakerneltests(specdict):
                 )
 
                 f.write(
-                    "import cupy\nimport pytest\n\nimport awkward as ak\nimport awkward._connect.cuda as ak_cu\n\ncupy_nplike = ak.nplike.Cupy.instance()\n\n"
+                    "import cupy\nimport pytest\n\nimport awkward as ak\nimport awkward._connect.cuda as ak_cu\n\ncupy_nplike = ak.nplikes.Cupy.instance()\n\n"
                 )
                 num = 1
                 if spec.tests == []:

docs-sphinx/prepare_docstrings.py

@@ -280,7 +280,7 @@ def dofunction(link, linelink, shortname, name, astfcn):
                         "awkwardforth.rst",
                         ])
 
-    if modulename.startswith("awkward._") or modulename == "awkward.nplike" or modulename == "awkward.types._awkward_datashape_parser":
+    if modulename.startswith("awkward._") or modulename == "awkward.nplikes" or modulename == "awkward.types._awkward_datashape_parser":
         continue  # don't show awkward._*, including _v2
 
     link = ("`{0} <https://github.com/scikit-hep/awkward-1.0/blob/"

src/awkward/__init__.py

@@ -1,7 +1,7 @@
 # BSD 3-Clause License; see https://github.com/scikit-hep/awkward-1.0/blob/main/LICENSE
 
 # NumPy-like alternatives
-import awkward.nplike
+import awkward.nplikes
 
 # shims for C++ (now everything is compiled into one 'awkward._ext' module)
 import awkward._ext

src/awkward/_broadcasting.py

@@ -30,8 +30,8 @@
 )
 from awkward.record import Record  # noqa: F401
 
-np = ak.nplike.NumpyMetadata.instance()
-numpy = ak.nplike.Numpy.instance()
+np = ak.nplikes.NumpyMetadata.instance()
+numpy = ak.nplikes.Numpy.instance()
 
 optiontypes = (IndexedOptionArray, ByteMaskedArray, BitMaskedArray, UnmaskedArray)
 listtypes = (ListOffsetArray, ListArray, RegularArray)
@@ -48,7 +48,7 @@ def broadcast_pack(inputs, isscalar):
     nextinputs = []
     for x in inputs:
         if isinstance(x, Record):
-            index = ak.nplike.of(*inputs).full(maxlen, x.at, dtype=np.int64)
+            index = ak.nplikes.nplike_of(*inputs).full(maxlen, x.at, dtype=np.int64)
             nextinputs.append(RegularArray(x.array[index], maxlen, 1))
             isscalar.append(True)
         elif isinstance(x, Content):
@@ -1006,7 +1006,7 @@ def broadcast_and_apply(
     function_name=None,
     broadcast_parameters_rule=BroadcastParameterRule.INTERSECT,
 ):
-    nplike = ak.nplike.of(*inputs)
+    nplike = ak.nplikes.nplike_of(*inputs)
     isscalar = []
     out = apply_step(
         nplike,

src/awkward/_connect/cling.py

@@ -6,8 +6,8 @@
 
 import awkward as ak
 
-np = ak.nplike.NumpyMetadata.instance()
-numpy = ak.nplike.Numpy.instance()
+np = ak.nplikes.NumpyMetadata.instance()
+numpy = ak.nplikes.Numpy.instance()
 
 
 cache = {}

src/awkward/_connect/jax/__init__.py

@@ -84,7 +84,7 @@ def replace_numpyarray_nodes(node, **kwargs):
                 buffer,
                 layout.identifier,
                 layout.parameters,
-                nplike=ak.nplike.Jax.instance(),
+                nplike=ak.nplikes.Jax.instance(),
             )
 
     return layout.recursively_apply(action=replace_numpyarray_nodes)

src/awkward/_connect/jax/_reducers.py

@@ -3,7 +3,7 @@
 import awkward as ak
 from awkward._connect.jax import import_jax
 
-np = ak.nplike.NumpyMetadata.instance()
+np = ak.nplikes.NumpyMetadata.instance()
 
 
 class Reducer:

src/awkward/_connect/numba/arrayview.py

@@ -8,7 +8,7 @@
 
 import awkward as ak
 
-np = ak.nplike.NumpyMetadata.instance()
+np = ak.nplikes.NumpyMetadata.instance()
 
 
 def code_to_function(code, function_name, externals=None, debug=False):
@@ -871,7 +871,7 @@ def array_supported(dtype):
     ) or isinstance(dtype, (numba.types.NPDatetime, numba.types.NPTimedelta))
 
 
-@numba.extending.overload(ak.nplike.numpy.array)
+@numba.extending.overload(ak.nplikes.numpy.array)
 def overload_np_array(array, dtype=None):
     if isinstance(array, ArrayViewType):
         ndim = array.type.ndim
@@ -936,11 +936,11 @@ def array_impl(array, dtype=None):
                     "\n    ".join(fill_array),
                 ),
                 "array_impl",
-                {"numpy": ak.nplike.numpy},
+                {"numpy": ak.nplikes.numpy},
             )
 
 
-@numba.extending.type_callable(ak.nplike.numpy.asarray)
+@numba.extending.type_callable(ak.nplikes.numpy.asarray)
 def type_asarray(context):
     def typer(arrayview):
         if (
@@ -954,7 +954,7 @@ def typer(arrayview):
     return typer
 
 
-@numba.extending.lower_builtin(ak.nplike.numpy.asarray, ArrayViewType)
+@numba.extending.lower_builtin(ak.nplikes.numpy.asarray, ArrayViewType)
 def lower_asarray(context, builder, sig, args):
     rettype, (viewtype,) = sig.return_type, sig.args
     (viewval,) = args

src/awkward/_connect/numba/builder.py

@@ -6,7 +6,7 @@
 
 import awkward as ak
 
-numpy = ak.nplike.Numpy.instance()
+numpy = ak.nplikes.Numpy.instance()
 
 dynamic_addrs = {}
 

src/awkward/_connect/numba/layout.py

@@ -6,8 +6,8 @@
 
 import awkward as ak
 
-np = ak.nplike.NumpyMetadata.instance()
-numpy = ak.nplike.Numpy.instance()
+np = ak.nplikes.NumpyMetadata.instance()
+numpy = ak.nplikes.Numpy.instance()
 
 
 @numba.extending.typeof_impl.register(ak.contents.Content)

src/awkward/_connect/numpy.py

@@ -26,10 +26,10 @@ def convert_to_array(layout, args, kwargs):
 
 def _to_rectilinear(arg):
     if isinstance(arg, tuple):
-        nplike = ak.nplike.of(*arg)
+        nplike = ak.nplikes.nplike_of(*arg)
         return tuple(nplike.to_rectilinear(x) for x in arg)
     else:
-        nplike = ak.nplike.of(arg)
+        nplike = ak.nplikes.nplike_of(arg)
         nplike.to_rectilinear(arg)
 
 
@@ -39,7 +39,7 @@ def array_function(func, types, args, kwargs):
         args = tuple(_to_rectilinear(x) for x in args)
         kwargs = {k: _to_rectilinear(v) for k, v in kwargs.items()}
         out = func(*args, **kwargs)
-        nplike = ak.nplike.of(out)
+        nplike = ak.nplikes.nplike_of(out)
         if isinstance(out, nplike.ndarray) and len(out.shape) != 0:
             return ak.Array(out)
         else:
@@ -149,7 +149,7 @@ def action(inputs, **ignore):
             isinstance(x, NumpyArray) or not isinstance(x, ak.contents.Content)
             for x in inputs
         ):
-            nplike = ak.nplike.of(*inputs)
+            nplike = ak.nplikes.nplike_of(*inputs)
 
             # Broadcast parameters against one another
             parameters_factory = ak._broadcasting.intersection_parameters_factory(
@@ -164,7 +164,7 @@ def action(inputs, **ignore):
                     else:
                         args.append(x)
 
-                if isinstance(nplike, ak.nplike.Jax):
+                if isinstance(nplike, ak.nplikes.Jax):
                     from awkward._connect.jax import import_jax
 
                     jax = import_jax()

src/awkward/_connect/pyarrow.py

@@ -7,7 +7,7 @@
 
 import awkward as ak
 
-np = ak.nplike.NumpyMetadata.instance()
+np = ak.nplikes.NumpyMetadata.instance()
 
 try:
     import pyarrow
@@ -491,7 +491,7 @@ def popbuffers(paarray, awkwardarrow_type, storage_type, buffers, generate_bitma
             ak.contents.NumpyArray(
                 numpy.frombuffer(pacontent, dtype=np.uint8),
                 parameters=sub_parameters,
-                nplike=ak.nplike.Numpy.instance(),
+                nplike=ak.nplikes.Numpy.instance(),
             ),
             storage_type.byte_width,
             parameters=parameters,
@@ -527,7 +527,7 @@ def popbuffers(paarray, awkwardarrow_type, storage_type, buffers, generate_bitma
             ak.contents.NumpyArray(
                 numpy.frombuffer(pacontent, dtype=np.uint8),
                 parameters=sub_parameters,
-                nplike=ak.nplike.Numpy.instance(),
+                nplike=ak.nplikes.Numpy.instance(),
             ),
             parameters=parameters,
         )
@@ -627,7 +627,7 @@ def popbuffers(paarray, awkwardarrow_type, storage_type, buffers, generate_bitma
         out = ak.contents.NumpyArray(
             bytedata.view(np.bool_),
             parameters=node_parameters(awkwardarrow_type),
-            nplike=ak.nplike.Numpy.instance(),
+            nplike=ak.nplikes.Numpy.instance(),
         )
         return popbuffers_finalize(
             out, paarray, validbits, awkwardarrow_type, generate_bitmasks
@@ -647,7 +647,7 @@ def popbuffers(paarray, awkwardarrow_type, storage_type, buffers, generate_bitma
         out = ak.contents.NumpyArray(
             numpy.frombuffer(data, dtype=dt),
             parameters=node_parameters(awkwardarrow_type),
-            nplike=ak.nplike.Numpy.instance(),
+            nplike=ak.nplikes.Numpy.instance(),
         )
         return popbuffers_finalize(
             out, paarray, validbits, awkwardarrow_type, generate_bitmasks

src/awkward/_connect/rdataframe/from_rdataframe.py

@@ -29,8 +29,8 @@
     "timedelta64": "std::difftime",
 }
 
-np = ak.nplike.NumpyMetadata.instance()
-numpy = ak.nplike.Numpy.instance()
+np = ak.nplikes.NumpyMetadata.instance()
+numpy = ak.nplikes.Numpy.instance()
 
 
 cppyy.add_include_path(
@@ -64,7 +64,7 @@ def form_dtype(form):
     def empty_buffers(cpp_buffers_self, names_nbytes):
         buffers = {}
         for item in names_nbytes:
-            buffers[item.first] = ak.nplike.numpy.empty(item.second)
+            buffers[item.first] = ak.nplikes.numpy.empty(item.second)
             cpp_buffers_self.append(
                 item.first,
                 buffers[item.first].ctypes.data_as(ctypes.POINTER(ctypes.c_ubyte)),

src/awkward/_lookup.py

@@ -2,7 +2,7 @@
 
 import awkward as ak
 
-np = ak.nplike.NumpyMetadata.instance()
+np = ak.nplikes.NumpyMetadata.instance()
 
 
 class Lookup:

src/awkward/_prettyprint.py

@@ -6,7 +6,7 @@
 
 import awkward as ak
 
-numpy = ak.nplike.Numpy.instance()
+numpy = ak.nplikes.Numpy.instance()
 
 
 def half(integer):

src/awkward/_reducers.py

@@ -2,7 +2,7 @@
 
 import awkward as ak
 
-np = ak.nplike.NumpyMetadata.instance()
+np = ak.nplikes.NumpyMetadata.instance()
 
 
 class Reducer:

src/awkward/_slicing.py

@@ -2,7 +2,7 @@
 
 import awkward as ak
 
-np = ak.nplike.NumpyMetadata.instance()
+np = ak.nplikes.NumpyMetadata.instance()
 
 
 def headtail(oldtail):
@@ -61,7 +61,7 @@ def prepare_advanced_indexing(items):
         )
 
     # Then broadcast the index items
-    nplike = ak.nplike.of(*broadcastable)
+    nplike = ak.nplikes.nplike_of(*broadcastable)
     broadcasted = nplike.broadcast_arrays(*broadcastable)
 
     # And re-assemble the index with the broadcasted items
@@ -391,7 +391,7 @@ def normalise_item_bool_to_int(item):
         and issubclass(item.content.content.dtype.type, (bool, np.bool_))
     ):
         if item.nplike.known_data or item.nplike.known_shape:
-            if isinstance(item.nplike, ak.nplike.Jax):
+            if isinstance(item.nplike, ak.nplikes.Jax):
                 raise ak._util.error(
                     "This slice is not supported for JAX differentiation."
                 )
@@ -460,7 +460,7 @@ def normalise_item_bool_to_int(item):
             item.content.dtype.type, (bool, np.bool_)
         ):
             if item.nplike.known_data or item.nplike.known_shape:
-                if isinstance(item.nplike, ak.nplike.Jax):
+                if isinstance(item.nplike, ak.nplikes.Jax):
                     raise ak._util.error(
                         "This slice is not supported for JAX differentiation."
                     )

src/awkward/_typetracer.py

@@ -5,9 +5,9 @@
 import numpy
 
 import awkward as ak
-import awkward.nplike
+import awkward.nplikes
 
-np = ak.nplike.NumpyMetadata.instance()
+np = ak.nplikes.NumpyMetadata.instance()
 
 
 class NoError:
@@ -464,7 +464,7 @@ def copy(self):
         return self
 
 
-class TypeTracer(ak.nplike.NumpyLike):
+class TypeTracer(ak.nplikes.NumpyLike):
     known_data = False
     known_shape = False
 

src/awkward/_util.py

@@ -17,10 +17,10 @@
 
 import awkward as ak
 
-np = ak.nplike.NumpyMetadata.instance()
+np = ak.nplikes.NumpyMetadata.instance()
 
 win = os.name == "nt"
-bits32 = ak.nplike.numpy.iinfo(np.intp).bits == 32
+bits32 = ak.nplikes.numpy.iinfo(np.intp).bits == 32
 
 # matches include/awkward/common.h
 kMaxInt8 = 127  # 2**7  - 1
@@ -32,9 +32,9 @@
 kMaxLevels = 48
 
 _backends = {
-    "cpu": ak.nplike.Numpy,
-    "cuda": ak.nplike.Cupy,
-    "jax": ak.nplike.Jax,
+    "cpu": ak.nplikes.Numpy,
+    "cuda": ak.nplikes.Cupy,
+    "jax": ak.nplikes.Jax,
 }
 
 
@@ -782,7 +782,7 @@ def extra(args, kwargs, defaults):
 
 
 def union_to_record(unionarray, anonymous):
-    nplike = ak.nplike.of(unionarray)
+    nplike = ak.nplikes.nplike_of(unionarray)
 
     contents = []
     for layout in unionarray.contents:
@@ -921,8 +921,8 @@ def expand_braces(text, seen=None):
 
 
 def from_arraylib(array, regulararray, recordarray, highlevel, behavior):
-    np = ak.nplike.NumpyMetadata.instance()
-    numpy = ak.nplike.Numpy.instance()
+    np = ak.nplikes.NumpyMetadata.instance()
+    numpy = ak.nplikes.Numpy.instance()
 
     def recurse(array, mask=None):
         if regulararray and len(array.shape) > 1: