Support for advanced indexing on 2d arrays

legate/numpy/array.py

@@ -370,13 +370,6 @@ def _convert_key(self, key, stacklevel=2, first=True):
     def __getitem__(self, key):
         if key is None:
             raise KeyError("invalid key passed to legate.numpy.ndarray")
-        # If we're a scalar, we're our own value
-        if self.size == 1:
-            if (self.ndim == 0 and key != () and key != Ellipsis) or (
-                key != ((0,) * self.ndim)
-            ):
-                raise KeyError("invalid key passed to legate.numpy.ndarray")
-            return self
         key = self._convert_key(key)
         return ndarray(
             shape=None, thunk=self._thunk.get_item(key, stacklevel=2)
@@ -745,11 +738,6 @@ def __setitem__(self, key, value):
             temp = ndarray(value_array.shape, dtype=self.dtype)
             temp._thunk.convert(value_array._thunk, stacklevel=2)
             value_array = temp
-        if self.size == 1:
-            if (self.ndim == 0 and key != () and key != Ellipsis) or (
-                key != ((0,) * self.ndim)
-            ):
-                raise KeyError("invalid key passed to legate.numpy.ndarray")
         key = self._convert_key(key)
         self._thunk.set_item(key, value_array._thunk, stacklevel=2)
 

legate/numpy/config.py

@@ -189,6 +189,8 @@ class NumPyOpCode(IntEnum):
     INCLUSIVE_SCAN = legate_numpy.NUMPY_INCLUSIVE_SCAN
     CONVERT_TO_RECT = legate_numpy.NUMPY_CONVERT_TO_RECT
     ARANGE = legate_numpy.NUMPY_ARANGE
+    ZIP = legate_numpy.NUMPY_ZIP
+    TRANSFORM = legate_numpy.NUMPY_TRANSFORM
 
 
 # Match these to NumPyRedopID in legate_numpy_c.h
@@ -317,6 +319,6 @@ class NumPyProjCode(IntEnum):
     PROJ_RADIX_3D_Z_4_2 = legate_numpy.NUMPY_PROJ_RADIX_3D_Z_4_2
     PROJ_RADIX_3D_Z_4_3 = legate_numpy.NUMPY_PROJ_RADIX_3D_Z_4_3
     # Flattening
-    PROJ_ND_1D_C_ORDER = legate_numpy.NUMPY_PROJ_ND_1D_C_ORDER
+    PROJ_ND_MD_C_ORDER = legate_numpy.NUMPY_PROJ_ND_MD_C_ORDER
     # Must always be last
     PROJ_LAST = legate_numpy.NUMPY_PROJ_LAST