Rename Identity/id -> Identities/identities and location -> identity. (…

…#40)

* [WIP] Rename Identity/id -> Identities/identities and location -> identity.

* Renamed Identity/identity -> Identities/identities and all tests pass.

* Updated XML files.

* [skip ci] Replaced id -> identities in C++ code; compiles.

* Replaced id -> identities in all code; tests pass.

* [skip ci] Replaced cpu-kernels identity -> identities; compiles.

* Replaced cpu-kernels identity -> identities; all tests pass.

* Replaced location -> identity (singular); all tests pass. Should be done now.

VERSION_INFO

@@ -1 +1 @@
-0.1.39
+0.1.40

awkward1/_numba/__init__.py

@@ -9,7 +9,7 @@
     import awkward1._numba.cpu
     import awkward1._numba.libawkward
     import awkward1._numba.util
-    import awkward1._numba.identity
+    import awkward1._numba.identities
     import awkward1._numba.types
     import awkward1._numba.content
     import awkward1._numba.iterator

awkward1/_numba/array/emptyarray.py

@@ -10,13 +10,13 @@
 
 @numba.extending.typeof_impl.register(awkward1.layout.EmptyArray)
 def typeof(val, c):
-    return EmptyArrayType(numba.typeof(val.id), util.dict2parameters(val.parameters))
+    return EmptyArrayType(numba.typeof(val.identities), util.dict2parameters(val.parameters))
 
 class EmptyArrayType(content.ContentType):
-    def __init__(self, idtpe, parameters):
+    def __init__(self, identitiestpe, parameters):
         assert isinstance(parameters, tuple)
-        super(EmptyArrayType, self).__init__(name="ak::EmptyArrayType(id={0}, parameters={1})".format(idtpe.name, util.parameters2str(parameters)))
-        self.idtpe = idtpe
+        super(EmptyArrayType, self).__init__(name="ak::EmptyArrayType(identities={0}, parameters={1})".format(identitiestpe.name, util.parameters2str(parameters)))
+        self.identitiestpe = identitiestpe
         self.parameters = parameters
 
     @property
@@ -73,16 +73,16 @@ def lower_carry(self):
 class EmptyArrayModel(numba.datamodel.models.StructModel):
     def __init__(self, dmm, fe_type):
         members = []
-        if fe_type.idtpe != numba.none:
-            members.append(("id", fe_type.idtpe))
+        if fe_type.identitiestpe != numba.none:
+            members.append(("identities", fe_type.identitiestpe))
         super(EmptyArrayModel, self).__init__(dmm, fe_type, members)
 
 @numba.extending.unbox(EmptyArrayType)
 def unbox(tpe, obj, c):
     proxyout = numba.cgutils.create_struct_proxy(tpe)(c.context, c.builder)
-    if tpe.idtpe != numba.none:
-        id_obj = c.pyapi.object_getattr_string(obj, "id")
-        proxyout.id = c.pyapi.to_native_value(tpe.idtpe, id_obj).value
+    if tpe.identitiestpe != numba.none:
+        id_obj = c.pyapi.object_getattr_string(obj, "identities")
+        proxyout.identities = c.pyapi.to_native_value(tpe.identitiestpe, id_obj).value
         c.pyapi.decref(id_obj)
     is_error = numba.cgutils.is_not_null(c.builder, c.pyapi.err_occurred())
     return numba.extending.NativeValue(proxyout._getvalue(), is_error)
@@ -92,8 +92,8 @@ def box(tpe, val, c):
     EmptyArray_obj = c.pyapi.unserialize(c.pyapi.serialize_object(awkward1.layout.EmptyArray))
     proxyin = numba.cgutils.create_struct_proxy(tpe)(c.context, c.builder, value=val)
     args = []
-    if tpe.idtpe != numba.none:
-        args.append(c.pyapi.from_native_value(tpe.idtpe, proxyin.id, c.env_manager))
+    if tpe.identitiestpe != numba.none:
+        args.append(c.pyapi.from_native_value(tpe.identitiestpe, proxyin.identities, c.env_manager))
     else:
         args.append(c.pyapi.make_none())
     args.append(util.parameters2dict_impl(c, tpe.parameters))
@@ -141,18 +141,18 @@ class type_methods(numba.typing.templates.AttributeTemplate):
     key = EmptyArrayType
 
     def generic_resolve(self, tpe, attr):
-        if attr == "id":
-            if tpe.idtpe == numba.none:
-                return numba.optional(identity.IdentityType(numba.int32[:, :]))
+        if attr == "identities":
+            if tpe.identitiestpe == numba.none:
+                return numba.optional(identity.IdentitiesType(numba.int32[:, :]))
             else:
-                return tpe.idtpe
+                return tpe.identitiestpe
 
-@numba.extending.lower_getattr(EmptyArrayType, "id")
-def lower_id(context, builder, tpe, val):
+@numba.extending.lower_getattr(EmptyArrayType, "identities")
+def lower_identities(context, builder, tpe, val):
     proxyin = numba.cgutils.create_struct_proxy(tpe)(context, builder, value=val)
-    if tpe.idtpe == numba.none:
-        return context.make_optional_none(builder, identity.IdentityType(numba.int32[:, :]))
+    if tpe.identitiestpe == numba.none:
+        return context.make_optional_none(builder, identity.IdentitiesType(numba.int32[:, :]))
     else:
         if context.enable_nrt:
-            context.nrt.incref(builder, tpe.idtpe, proxyin.id)
-        return proxyin.id
+            context.nrt.incref(builder, tpe.identitiestpe, proxyin.identities)
+        return proxyin.identities

awkward1/_numba/array/listarray.py

@@ -14,16 +14,16 @@
 @numba.extending.typeof_impl.register(awkward1.layout.ListArrayU32)
 @numba.extending.typeof_impl.register(awkward1.layout.ListArray64)
 def typeof(val, c):
-    return ListArrayType(numba.typeof(numpy.asarray(val.starts)), numba.typeof(numpy.asarray(val.stops)), numba.typeof(val.content), numba.typeof(val.id), util.dict2parameters(val.parameters))
+    return ListArrayType(numba.typeof(numpy.asarray(val.starts)), numba.typeof(numpy.asarray(val.stops)), numba.typeof(val.content), numba.typeof(val.identities), util.dict2parameters(val.parameters))
 
 class ListArrayType(content.ContentType):
-    def __init__(self, startstpe, stopstpe, contenttpe, idtpe, parameters):
+    def __init__(self, startstpe, stopstpe, contenttpe, identitiestpe, parameters):
         assert startstpe == stopstpe
         assert isinstance(parameters, tuple)
-        super(ListArrayType, self).__init__(name="ak::ListArray{0}{1}Type({2}, id={3}, parameters={4})".format("" if startstpe.dtype.signed else "U", startstpe.dtype.bitwidth, contenttpe.name, idtpe.name, util.parameters2str(parameters)))
+        super(ListArrayType, self).__init__(name="ak::ListArray{0}{1}Type({2}, identities={3}, parameters={4})".format("" if startstpe.dtype.signed else "U", startstpe.dtype.bitwidth, contenttpe.name, identitiestpe.name, util.parameters2str(parameters)))
         self.startstpe = startstpe
         self.contenttpe = contenttpe
-        self.idtpe = idtpe
+        self.identitiestpe = identitiestpe
         self.parameters = parameters
 
     @property
@@ -49,7 +49,7 @@ def getitem_range(self):
         return self
 
     def getitem_str(self, key):
-        return ListArrayType(self.startstpe, self.stopstpe, self.contenttpe.getitem_str(key), self.idtpe, ())
+        return ListArrayType(self.startstpe, self.stopstpe, self.contenttpe.getitem_str(key), self.identitiestpe, ())
 
     def getitem_tuple(self, wheretpe):
         nexttpe = ListArrayType(util.index64tpe, util.index64tpe, self, numba.none, ())
@@ -68,7 +68,7 @@ def getitem_next(self, wheretpe, isadvanced):
 
         elif isinstance(headtpe, numba.types.SliceType):
             contenttpe = self.contenttpe.carry().getitem_next(tailtpe, isadvanced)
-            return awkward1._numba.array.listoffsetarray.ListOffsetArrayType(util.indextpe(self.indexname), contenttpe, self.idtpe, self.parameters)
+            return awkward1._numba.array.listoffsetarray.ListOffsetArrayType(util.indextpe(self.indexname), contenttpe, self.identitiestpe, self.parameters)
 
         elif isinstance(headtpe, numba.types.StringLiteral):
             return self.getitem_str(headtpe.literal_value).getitem_next(tailtpe, isadvanced)
@@ -84,7 +84,7 @@ def getitem_next(self, wheretpe, isadvanced):
                 raise NotImplementedError("array.ndim != 1")
             contenttpe = self.contenttpe.carry().getitem_next(tailtpe, True)
             if not isadvanced:
-                return awkward1._numba.array.regulararray.RegularArrayType(contenttpe, self.idtpe, self.parameters)
+                return awkward1._numba.array.regulararray.RegularArrayType(contenttpe, self.identitiestpe, self.parameters)
             else:
                 return contenttpe
 
@@ -128,8 +128,8 @@ def __init__(self, dmm, fe_type):
         members = [("starts", fe_type.startstpe),
                    ("stops", fe_type.stopstpe),
                    ("content", fe_type.contenttpe)]
-        if fe_type.idtpe != numba.none:
-            members.append(("id", fe_type.idtpe))
+        if fe_type.identitiestpe != numba.none:
+            members.append(("identities", fe_type.identitiestpe))
         super(ListArrayModel, self).__init__(dmm, fe_type, members)
 
 @numba.extending.unbox(ListArrayType)
@@ -150,9 +150,9 @@ def unbox(tpe, obj, c):
     c.pyapi.decref(content_obj)
     c.pyapi.decref(startsarray_obj)
     c.pyapi.decref(stopsarray_obj)
-    if tpe.idtpe != numba.none:
-        id_obj = c.pyapi.object_getattr_string(obj, "id")
-        proxyout.id = c.pyapi.to_native_value(tpe.idtpe, id_obj).value
+    if tpe.identitiestpe != numba.none:
+        id_obj = c.pyapi.object_getattr_string(obj, "identities")
+        proxyout.identities = c.pyapi.to_native_value(tpe.identitiestpe, id_obj).value
         c.pyapi.decref(id_obj)
     is_error = numba.cgutils.is_not_null(c.builder, c.pyapi.err_occurred())
     return numba.extending.NativeValue(proxyout._getvalue(), is_error)
@@ -180,8 +180,8 @@ def box(tpe, val, c):
     c.pyapi.decref(startsarray_obj)
     c.pyapi.decref(stopsarray_obj)
     args = [starts_obj, stops_obj, content_obj]
-    if tpe.idtpe != numba.none:
-        args.append(c.pyapi.from_native_value(tpe.idtpe, proxyin.id, c.env_manager))
+    if tpe.identitiestpe != numba.none:
+        args.append(c.pyapi.from_native_value(tpe.identitiestpe, proxyin.identities, c.env_manager))
     else:
         args.append(c.pyapi.make_none())
     args.append(util.parameters2dict_impl(c, tpe.parameters))
@@ -217,7 +217,7 @@ def lower_getitem_int(context, builder, sig, args):
 
 @numba.extending.lower_builtin(operator.getitem, ListArrayType, numba.types.slice2_type)
 def lower_getitem_range(context, builder, sig, args):
-    import awkward1._numba.identity
+    import awkward1._numba.identities
 
     rettpe, (tpe, wheretpe) = sig.return_type, sig.args
     val, whereval = args
@@ -228,8 +228,8 @@ def lower_getitem_range(context, builder, sig, args):
     proxyout.starts = numba.targets.arrayobj.getitem_arraynd_intp(context, builder, tpe.startstpe(tpe.startstpe, wheretpe), (proxyin.starts, whereval))
     proxyout.stops = numba.targets.arrayobj.getitem_arraynd_intp(context, builder, tpe.stopstpe(tpe.stopstpe, wheretpe), (proxyin.stops, whereval))
     proxyout.content = proxyin.content
-    if tpe.idtpe != numba.none:
-        proxyout.id = awkward1._numba.identity.lower_getitem_any(context, builder, tpe.idtpe, wheretpe, proxyin.id, whereval)
+    if tpe.identitiestpe != numba.none:
+        proxyout.identities = awkward1._numba.identities.lower_getitem_any(context, builder, tpe.identitiestpe, wheretpe, proxyin.identities, whereval)
 
     out = proxyout._getvalue()
     if context.enable_nrt:
@@ -246,8 +246,8 @@ def lower_getitem_str(context, builder, sig, args):
     proxyout.starts = proxyin.starts
     proxyout.stops = proxyin.stops
     proxyout.content = tpe.contenttpe.lower_getitem_str(context, builder, rettpe.contenttpe(tpe.contenttpe, wheretpe), (proxyin.content, whereval))
-    if tpe.idtpe != numba.none:
-        proxyout.id = proxyin.id
+    if tpe.identitiestpe != numba.none:
+        proxyout.identities = proxyin.identities
 
     out = proxyout._getvalue()
     if context.enable_nrt:
@@ -386,12 +386,12 @@ def lower_getitem_next(context, builder, arraytpe, wheretpe, arrayval, whereval,
             outcontenttpe = nextcontenttpe.getitem_next(tailtpe, True)
             outcontentval = nextcontenttpe.lower_getitem_next(context, builder, nextcontenttpe, tailtpe, nextcontentval, tailval, nextadvanced)
 
-        outtpe = awkward1._numba.array.listoffsetarray.ListOffsetArrayType(util.indextpe(arraytpe.indexname), outcontenttpe, arraytpe.idtpe, arraytpe.parameters)
+        outtpe = awkward1._numba.array.listoffsetarray.ListOffsetArrayType(util.indextpe(arraytpe.indexname), outcontenttpe, arraytpe.identitiestpe, arraytpe.parameters)
         proxyout = numba.cgutils.create_struct_proxy(outtpe)(context, builder)
         proxyout.offsets = nextoffsets
         proxyout.content = outcontentval
-        if arraytpe.idtpe != numba.none:
-            proxyout.id = proxyin.id
+        if arraytpe.identitiestpe != numba.none:
+            proxyout.identities = proxyin.identities
         return proxyout._getvalue()
 
     elif isinstance(headtpe, numba.types.StringLiteral):
@@ -446,12 +446,12 @@ def lower_getitem_next(context, builder, arraytpe, wheretpe, arrayval, whereval,
             contenttpe = nexttpe.getitem_next(tailtpe, True)
             contentval = nexttpe.lower_getitem_next(context, builder, nexttpe, tailtpe, nextval, tailval, nextadvanced)
 
-            outtpe = awkward1._numba.array.regulararray.RegularArrayType(contenttpe, arraytpe.idtpe, arraytpe.parameters)
+            outtpe = awkward1._numba.array.regulararray.RegularArrayType(contenttpe, arraytpe.identitiestpe, arraytpe.parameters)
             proxyout = numba.cgutils.create_struct_proxy(outtpe)(context, builder)
             proxyout.content = contentval
             proxyout.size = lenflathead
-            if outtpe.idtpe != numba.none:
-                proxyout.id = awkward1._numba.identity.lower_getitem_any(context, builder, outtpe.idtpe, util.index64tpe, proxyin.id, flathead)
+            if outtpe.identitiestpe != numba.none:
+                proxyout.identities = awkward1._numba.identities.lower_getitem_any(context, builder, outtpe.identitiestpe, util.index64tpe, proxyin.identities, flathead)
             return proxyout._getvalue()
 
         else:
@@ -490,16 +490,16 @@ def lower_getitem_next(context, builder, arraytpe, wheretpe, arrayval, whereval,
         raise AssertionError(headtpe)
 
 def lower_carry(context, builder, arraytpe, carrytpe, arrayval, carryval):
-    import awkward1._numba.identity
+    import awkward1._numba.identities
 
     proxyin = numba.cgutils.create_struct_proxy(arraytpe)(context, builder, value=arrayval)
 
     proxyout = numba.cgutils.create_struct_proxy(arraytpe)(context, builder)
     proxyout.starts = numba.targets.arrayobj.fancy_getitem_array(context, builder, arraytpe.startstpe(arraytpe.startstpe, carrytpe), (proxyin.starts, carryval))
     proxyout.stops = numba.targets.arrayobj.fancy_getitem_array(context, builder, arraytpe.stopstpe(arraytpe.stopstpe, carrytpe), (proxyin.stops, carryval))
     proxyout.content = proxyin.content
-    if arraytpe.idtpe != numba.none:
-        proxyout.id = awkward1._numba.identity.lower_getitem_any(context, builder, arraytpe.idtpe, carrytpe, proxyin.id, carryval)
+    if arraytpe.identitiestpe != numba.none:
+        proxyout.identities = awkward1._numba.identities.lower_getitem_any(context, builder, arraytpe.identitiestpe, carrytpe, proxyin.identities, carryval)
 
     return proxyout._getvalue()
 
@@ -517,11 +517,11 @@ def generic_resolve(self, tpe, attr):
         elif attr == "content":
             return tpe.contenttpe
 
-        elif attr == "id":
-            if tpe.idtpe == numba.none:
-                return numba.optional(identity.IdentityType(numba.int32[:, :]))
+        elif attr == "identities":
+            if tpe.identitiestpe == numba.none:
+                return numba.optional(identity.IdentitiesType(numba.int32[:, :]))
             else:
-                return tpe.idtpe
+                return tpe.identitiestpe
 
 @numba.extending.lower_getattr(ListArrayType, "starts")
 def lower_starts(context, builder, tpe, val):
@@ -544,12 +544,12 @@ def lower_content(context, builder, tpe, val):
         context.nrt.incref(builder, tpe.contenttpe, proxyin.content)
     return proxyin.content
 
-@numba.extending.lower_getattr(ListArrayType, "id")
-def lower_id(context, builder, tpe, val):
+@numba.extending.lower_getattr(ListArrayType, "identities")
+def lower_identities(context, builder, tpe, val):
     proxyin = numba.cgutils.create_struct_proxy(tpe)(context, builder, value=val)
-    if tpe.idtpe == numba.none:
-        return context.make_optional_none(builder, identity.IdentityType(numba.int32[:, :]))
+    if tpe.identitiestpe == numba.none:
+        return context.make_optional_none(builder, identity.IdentitiesType(numba.int32[:, :]))
     else:
         if context.enable_nrt:
-            context.nrt.incref(builder, tpe.idtpe, proxyin.id)
-        return proxyin.id
+            context.nrt.incref(builder, tpe.identitiestpe, proxyin.identities)
+        return proxyin.identities