update based on review suggestions

seibert · seibert · commit 53bd0903cd05 · 2018-08-02T08:58:56.000-05:00
diff --git a/cupy/core/core.pxd b/cupy/core/core.pxd
@@ -14,7 +14,6 @@ cdef class ndarray:
         readonly object dtype
         readonly memory.MemoryPointer data
         readonly ndarray base
-        readonly object _cuda_array_descr
 
     cpdef tolist(self)
     cpdef tofile(self, fid, sep=*, format=*)
diff --git a/cupy/core/core.pyx b/cupy/core/core.pyx
@@ -132,24 +132,17 @@ cdef class ndarray:
         else:
             raise TypeError('order not understood. order={}'.format(order))
 
-        self._cuda_array_descr = None
-
     @property
     def __cuda_array_interface__(self):
-        if self._cuda_array_descr is None:
-            desc = {
-                'shape': self.shape,
-                'typestr': self.dtype.str,
-                'descr': self.dtype.descr,
-                'data': (self.data.mem.ptr, False),
-                'version': 0,
-            }
-            if not self._c_contiguous:
-                desc['strides'] = self._strides
-
-            self._cuda_array_descr = desc
-        else:
-            desc = self._cuda_array_descr
+        desc = {
+            'shape': self.shape,
+            'typestr': self.dtype.str,
+            'descr': self.dtype.descr,
+            'data': (self.data.mem.ptr, False),
+            'version': 0,
+        }
+        if not self._c_contiguous:
+            desc['strides'] = self._strides
 
         return desc
 
diff --git a/tests/cupy_tests/core_tests/test_ndarray.py b/tests/cupy_tests/core_tests/test_ndarray.py
@@ -135,29 +135,31 @@ def test_shape_set_int(self, xp):
 class TestNdarrayCudaInterface(unittest.TestCase):
 
     def test_cuda_array_interface(self):
-        arr = cupy.zeros(shape=(2,3), dtype=cupy.float64)
+        arr = cupy.zeros(shape=(2, 3), dtype=cupy.float64)
         iface = arr.__cuda_array_interface__
         self.assertEqual(set(iface.keys()),
                          set(['shape', 'typestr', 'data', 'version', 'descr']))
-        self.assertEqual(iface['shape'], (2,3))
+        self.assertEqual(iface['shape'], (2, 3))
         self.assertEqual(iface['typestr'], '<f8')
         self.assertIsInstance(iface['data'], tuple)
         self.assertEqual(len(iface['data']), 2)
+        self.assertEqual(iface['data'][0], arr.data.ptr)
         self.assertEqual(iface['data'][1], False)
         self.assertEqual(iface['version'], 0)
         self.assertEqual(iface['descr'], [('', '<f8')])
 
     def test_cuda_array_interface_view(self):
-        arr = cupy.zeros(shape=(10,20), dtype=cupy.float64)
+        arr = cupy.zeros(shape=(10, 20), dtype=cupy.float64)
         view = arr[::2,::5]
         iface = view.__cuda_array_interface__
         self.assertEqual(set(iface.keys()),
                          set(['shape', 'typestr', 'data', 'version',
                               'strides', 'descr']))
-        self.assertEqual(iface['shape'], (5,4))
+        self.assertEqual(iface['shape'], (5, 4))
         self.assertEqual(iface['typestr'], '<f8')
         self.assertIsInstance(iface['data'], tuple)
         self.assertEqual(len(iface['data']), 2)
+        self.assertEqual(iface['data'][0], arr.data.ptr)
         self.assertEqual(iface['data'][1], False)
         self.assertEqual(iface['version'], 0)
         self.assertEqual(iface['strides'], [320, 40])
