Changeset 9796d0a for python/genericio.py

Timestamp:

09/25/17 19:20:08 (7 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

56b997e

Parents:

b02d091

git-author:

Hal Finkel <hfinkel@…> (09/25/17 19:20:08)

git-committer:

Hal Finkel <hfinkel@…> (09/25/17 19:20:08)

Message:

Add support for float4 (and similar) to Python bindings

File:

• python/genericio.py (modified) (3 diffs)

python/genericio.py

@@ -53 +53 @@
 libpygio.get_variable_type.argtypes=[ct.c_char_p,ct.c_char_p]
 
+libpygio.get_variable_field_count.restype=ct.c_int
+libpygio.get_variable_field_count.argtypes=[ct.c_char_p,ct.c_char_p]
+
 libpygio.read_gio_int32.restype=None
-libpygio.read_gio_int32.argtypes=[ct.c_char_p,ct.c_char_p,ct.POINTER(ct.c_int)]
+libpygio.read_gio_int32.argtypes=[ct.c_char_p,ct.c_char_p,ct.POINTER(ct.c_int),ct.c_int]
 
 libpygio.read_gio_int64.restype=None
-libpygio.read_gio_int64.argtypes=[ct.c_char_p,ct.c_char_p,ct.POINTER(ct.c_int64)]
+libpygio.read_gio_int64.argtypes=[ct.c_char_p,ct.c_char_p,ct.POINTER(ct.c_int64),ct.c_int]
 
 libpygio.read_gio_float.restype=None
-libpygio.read_gio_float.argtypes=[ct.c_char_p,ct.c_char_p,ct.POINTER(ct.c_float)]
+libpygio.read_gio_float.argtypes=[ct.c_char_p,ct.c_char_p,ct.POINTER(ct.c_float),ct.c_int]
 
 libpygio.read_gio_double.restype=None
-libpygio.read_gio_double.argtypes=[ct.c_char_p,ct.c_char_p,ct.POINTER(ct.c_double)]
+libpygio.read_gio_double.argtypes=[ct.c_char_p,ct.c_char_p,ct.POINTER(ct.c_double),ct.c_int]
 
 libpygio.inspect_gio.restype=None
@@ -71 +74 @@
     var_size = libpygio.get_elem_num(file_name)
     var_type = libpygio.get_variable_type(file_name,var_name)
+    field_count = libpygio.get_variable_field_count(file_name,var_name)
     if(var_type==10):
         print "Variable not found"
@@ -78 +82 @@
     elif(var_type==0):
         #float
-        result = np.ndarray(var_size,dtype=np.float32)
-        libpygio.read_gio_float(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_float)))
+        result = np.ndarray((var_size,field_count),dtype=np.float32)
+        libpygio.read_gio_float(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_float)),field_count)
         return result
     elif(var_type==1):
         #double
-        result = np.ndarray(var_size,dtype=np.float64)
-        libpygio.read_gio_double(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_double)))
+        result = np.ndarray((var_size,field_count),dtype=np.float64)
+        libpygio.read_gio_double(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_double)),field_count)
         return result
     elif(var_type==2):
         #int32
-        result = np.ndarray(var_size,dtype=np.int32)
-        libpygio.read_gio_int32(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_int32)))
+        result = np.ndarray((var_size,field_count),dtype=np.int32)
+        libpygio.read_gio_int32(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_int32)),field_count)
         return result
     elif(var_type==3):
         #int64
-        result = np.ndarray(var_size,dtype=np.int64)
-        libpygio.read_gio_int64(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_int64)))
+        result = np.ndarray((var_size,field_count),dtype=np.int64)
+        libpygio.read_gio_int64(file_name,var_name,result.ctypes.data_as(ct.POINTER(ct.c_int64)),field_count)
         return result        
-        
+
+def gio_has_variable(file_name,var_name):
+    var_size = libpygio.get_elem_num(file_name)
+    var_type = libpygio.get_variable_type(file_name,var_name)
+    return var_type!=10
+
 def gio_inspect(file_name):
     libpygio.inspect_gio(file_name)