Changeset 9796d0a for python/lib/gio.h

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/lib/gio.h (modified) (4 diffs)

python/lib/gio.h

@@ -46 +46 @@
 
 template <class T>
-void read_gio(char* file_name, std::string var_name, T*& data){
+void read_gio(char* file_name, std::string var_name, T*& data, int field_count){
   gio::GenericIO reader(file_name);
   reader.openAndReadHeader(gio::GenericIO::MismatchAllowed);
@@ -57 +57 @@
       max_size = rank_size[i];
   }
-  T* rank_data = new T[max_size+reader.requestedExtraSpace()/sizeof(T)];
+  T* rank_data = new T[max_size*field_count+reader.requestedExtraSpace()/sizeof(T)];
   int64_t offset =0;
-  reader.addVariable(var_name,rank_data,true);
+  reader.addScalarizedVariable(var_name,rank_data,field_count,
+                               gio::GenericIO::VarHasExtraSpace);
   for(int i=0;i<num_ranks;++i){
     reader.readData(i,false);
-    std::copy(rank_data,rank_data+rank_size[i],data+offset);
-    offset +=rank_size[i];
+    std::copy(rank_data,rank_data+rank_size[i]*field_count,data+offset);
+    offset +=rank_size[i]*field_count;
   }
   delete [] rank_data;
@@ -70 +71 @@
 extern "C" int64_t get_elem_num(char* file_name);
 
-extern "C" void read_gio_float (char* file_name, char* var_name, float* data);
-extern "C" void read_gio_double(char* file_name, char* var_name, double* data);
-extern "C" void read_gio_int32 (char* file_name, char* var_name, int* data); 
-extern "C" void read_gio_int64 (char* file_name, char* var_name, int64_t* data);
+extern "C" void read_gio_float (char* file_name, char* var_name, float* data, int field_count);
+extern "C" void read_gio_double(char* file_name, char* var_name, double* data, int field_count);
+extern "C" void read_gio_int32 (char* file_name, char* var_name, int* data, int field_count); 
+extern "C" void read_gio_int64 (char* file_name, char* var_name, int64_t* data, int field_count);
 enum var_type{
   float_type=0,
@@ -83 +84 @@
 };
 extern "C" var_type get_variable_type(char* file_name,char* var_name);
+extern "C" int get_variable_field_count(char* file_name,char* var_name);
 extern "C" void inspect_gio(char* file_name);