More validation and rename cai to readonly cai

rapidsai · Dec 8, 2022 · b55f039 · b55f039
1 parent 082202f
commit b55f039
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/python/cudf/cudf/_lib/column.pyx b/python/cudf/cudf/_lib/column.pyx
@@ -219,7 +219,9 @@ cdef class Column:
         ):
             if isinstance(value, RefCountableBuffer):
                 value = SimpleNamespace(
-                    __cuda_array_interface__=value._cai,
+                    __cuda_array_interface__=(
+                        value._cuda_array_interface_readonly
+                    ),
                     owner=value
                 )
             if value.__cuda_array_interface__["typestr"] not in ("|i1", "|u1"):

diff --git a/python/cudf/cudf/core/buffer/buffer.py b/python/cudf/cudf/core/buffer/buffer.py
@@ -237,7 +237,7 @@ def __cuda_array_interface__(self) -> dict:
         }
 
     @property
-    def _cai(self) -> dict:
+    def _cuda_array_interface_readonly(self) -> dict:
         """
         Internal Implementation for the CUDA Array Interface which is
         read-only.

diff --git a/python/cudf/cudf/core/buffer/weakrefable_buffer.py b/python/cudf/cudf/core/buffer/weakrefable_buffer.py
@@ -278,7 +278,7 @@ def copy(self, deep: bool = True):
             )
 
     @property
-    def _cai(self) -> dict:
+    def _cuda_array_interface_readonly(self) -> dict:
         """
         Internal Implementation for the CUDA Array Interface without
         triggering a deepcopy.
@@ -304,7 +304,7 @@ def __cuda_array_interface__(self) -> dict:
         # pointing to.
         self._detach_refs(zero_copied=True)
 
-        result = self._cai
+        result = self._cuda_array_interface_readonly
         result["data"] = (self.ptr, False)
         return result
 

diff --git a/python/cudf/cudf/core/column/column.py b/python/cudf/cudf/core/column/column.py
@@ -128,29 +128,27 @@ def _data_array_view(self) -> "cuda.devicearray.DeviceNDArray":
         Internal implementation for viewing the data as a device array object
         without triggering a deep-copy.
         """
-        return cuda.as_cuda_array(
-            SimpleNamespace(
-                __cuda_array_interface__=self.data._cai
-                if self.data is not None
-                else None,
-                owner=self.data,
-            )
-        ).view(self.dtype)
+        arr_obj = SimpleNamespace(
+            __cuda_array_interface__=self.data._cuda_array_interface_readonly
+            if self.data is not None
+            else None,
+            owner=self.data,
+        )
+        return cuda.as_cuda_array(arr_obj).view(self.dtype)
 
     @property
     def _mask_array_view(self) -> "cuda.devicearray.DeviceNDArray":
         """
         Internal implementation for viewing the mask as a device array object
         without triggering a deep-copy.
         """
-        return cuda.as_cuda_array(
-            SimpleNamespace(
-                __cuda_array_interface__=self.mask._cai
-                if self.mask is not None
-                else None,
-                owner=self.mask,
-            )
-        ).view(mask_dtype)
+        arr_obj = SimpleNamespace(
+            __cuda_array_interface__=self.mask._cuda_array_interface_readonly
+            if self.mask is not None
+            else None,
+            owner=self.mask,
+        )
+        return cuda.as_cuda_array(arr_obj).view(mask_dtype)
 
     @property
     def mask_array_view(self) -> "cuda.devicearray.DeviceNDArray":