Changeset 1658 for trunk/bindings

Timestamp:

21/10/11 19:55:03 (7 months ago)

Author:

Paul Kienzle

Message:

python: support 64-bit dims. Refs #285

File:

• trunk/bindings/python/nxs/napi.py (modified) (11 diffs)

trunk/bindings/python/nxs/napi.py

@@ -738 +738 @@
 
     # ==== Data ====
-    nxlib.nxigetrawinfo_.restype = c_int
-    nxlib.nxigetrawinfo_.argtypes = [c_void_p, c_int_p, c_void_p, c_int_p]
+    nxlib.nxigetrawinfo64_.restype = c_int
+    nxlib.nxigetrawinfo64_.argtypes = [c_void_p, c_int_p, c_void_p, c_int_p]
     def getrawinfo(self):
         """
@@ -760 +760 @@
         """
         rank = c_int(0)
-        shape = numpy.zeros(MAXRANK, 'i')
+        shape = numpy.zeros(MAXRANK, 'int64')
         storage = c_int(0)
-        status = nxlib.nxigetrawinfo_(self.handle, _ref(rank), shape.ctypes.data,
-                                     _ref(storage))
+        status = nxlib.nxigetrawinfo64_(self.handle, _ref(rank), 
+                                        shape.ctypes.data, _ref(storage))
         if status == ERROR:
             raise NeXusError, "Could not get data info: %s"%(self._loc())
@@ -771 +771 @@
         return shape,dtype
 
-    nxlib.nxigetinfo_.restype = c_int
-    nxlib.nxigetinfo_.argtypes = [c_void_p, c_int_p, c_void_p, c_int_p]
+    nxlib.nxigetinfo64_.restype = c_int
+    nxlib.nxigetinfo64_.argtypes = [c_void_p, c_int_p, c_void_p, c_int_p]
     def getinfo(self):
         """
@@ -796 +796 @@
         """
         rank = c_int(0)
-        shape = numpy.zeros(MAXRANK, 'i')
+        shape = numpy.zeros(MAXRANK, 'int64')
         storage = c_int(0)
-        status = nxlib.nxigetinfo_(self.handle, _ref(rank), shape.ctypes.data,
+        status = nxlib.nxigetinfo64_(self.handle, _ref(rank), 
+                                     shape.ctypes.data,
                                      _ref(storage))
         if status == ERROR:
@@ -846 +847 @@
         self._indata = False
 
-    nxlib.nximakedata_.restype = c_int
-    nxlib.nximakedata_.argtypes  = [c_void_p, c_char_p, c_int, c_int, c_int_p]
+    nxlib.nximakedata64_.restype = c_int
+    nxlib.nximakedata64_.argtypes  = [c_void_p, c_char_p, c_int, c_int, c_int64_p]
     def makedata(self, name, dtype=None, shape=None):
         """
@@ -866 +867 @@
         #print "makedata",self._loc(),name,shape,dtype
         storage = _nxtype_code[str(dtype)]
-        shape = numpy.array(shape,'i')
-        status = nxlib.nximakedata_(self.handle,name,storage,len(shape),
-                                  shape.ctypes.data_as(c_int_p))
+        shape = numpy.asarray(shape,'int64')
+        status = nxlib.nximakedata64_(self.handle,name,storage,len(shape),
+                                      shape.ctypes.data_as(c_int64_p))
         if status == ERROR:
             raise ValueError, "Could not create data %s: %s"%(name,self._loc())
 
-    nxlib.nxicompmakedata_.restype = c_int
-    nxlib.nxicompmakedata_.argtypes  = [c_void_p, c_char_p, c_int, c_int, c_int_p,
-                                      c_int, c_int_p]
+    nxlib.nxicompmakedata64_.restype = c_int
+    nxlib.nxicompmakedata64_.argtypes  = [c_void_p, c_char_p, c_int, c_int, c_int64_p,
+                                          c_int, c_int64_p]
     def compmakedata(self, name, dtype=None, shape=None, mode='lzw',
                      chunks=None):
@@ -894 +895 @@
         # Make sure shape/chunk_shape are integers; hope that 32/64 bit issues
         # with the c int type sort themselves out.
-        dims = numpy.array(shape,'i')
+        dims = numpy.asarray(shape,'int64')
         if chunks == None:
-            chunks = numpy.ones(dims.shape,'i')
+            chunks = numpy.ones(dims.shape,'int64')
             chunks[-1] = shape[-1]
         else:
-            chunks = numpy.array(chunks,'i')
-        status = nxlib.nxicompmakedata_(self.handle,name,storage,len(dims),
-                                      dims.ctypes.data_as(c_int_p),
-                                      _compression_code[mode],
-                                      chunks.ctypes.data_as(c_int_p))
+            chunks = numpy.array(chunks,'int64')
+        status = nxlib.nxicompmakedata64_(self.handle,name,storage,len(dims),
+                                          dims.ctypes.data_as(c_int64_p),
+                                          _compression_code[mode],
+                                          chunks.ctypes.data_as(c_int64_p))
         if status == ERROR:
             raise ValueError, \
@@ -932 +933 @@
         return datafn()
 
-    nxlib.nxigetslab_.restype = c_int
-    nxlib.nxigetslab_.argtypes = [c_void_p, c_void_p, c_int_p, c_int_p]
+    nxlib.nxigetslab64_.restype = c_int
+    nxlib.nxigetslab64_.argtypes = [c_void_p, c_void_p, c_int64_p, c_int64_p]
     def getslab(self, slab_offset, slab_shape):
         """
@@ -948 +949 @@
         dummy_shape,dtype = self.getrawinfo()
         dummy_data,pdata,dummy_size,datafn = self._poutput(dtype,slab_shape)
-        slab_offset = numpy.array(slab_offset,'i')
-        slab_shape = numpy.array(slab_shape,'i')
-        status = nxlib.nxigetslab_(self.handle,pdata,
-                                      slab_offset.ctypes.data_as(c_int_p),
-                                      slab_shape.ctypes.data_as(c_int_p))
+        slab_offset = numpy.asarray(slab_offset,'int64')
+        slab_shape = numpy.asarray(slab_shape,'int64')
+        status = nxlib.nxigetslab64_(self.handle,pdata,
+                                     slab_offset.ctypes.data_as(c_int64_p),
+                                     slab_shape.ctypes.data_as(c_int64_p))
         #print "slab",offset,size,data
         if status == ERROR:
@@ -975 +976 @@
             raise ValueError, "Could not write data: %s"%(self._loc())
 
-    nxlib.nxiputslab_.restype = c_int
-    nxlib.nxiputslab_.argtypes = [c_void_p, c_void_p, c_int_p, c_int_p]
+    nxlib.nxiputslab64_.restype = c_int
+    nxlib.nxiputslab64_.argtypes = [c_void_p, c_void_p, c_int64_p, c_int64_p]
     def putslab(self, data, slab_offset, slab_shape):
         """
@@ -990 +991 @@
         dummy_shape,dtype = self.getrawinfo()
         data,pdata = self._pinput(data,dtype,slab_shape)
-        slab_offset = numpy.array(slab_offset,'i')
-        slab_shape = numpy.array(slab_shape,'i')
+        slab_offset = numpy.asarray(slab_offset,'int64')
+        slab_shape = numpy.asarray(slab_shape,'int64')
         #print "slab",offset,size,data
         status = nxlib.nxiputslab_(self.handle,pdata,
-                                      slab_offset.ctypes.data_as(c_int_p),
-                                      slab_shape.ctypes.data_as(c_int_p))
+                                      slab_offset.ctypes.data_as(c_int64_p),
+                                      slab_shape.ctypes.data_as(c_int64_p))
         if status == ERROR:
             raise ValueError, "Could not write slab: %s"%(self._loc())