Changeset 37067 for branches/eam_branches/ipp-ops-20130712/Ohana/src/opihi/lib.shell/VectorIO.c

Timestamp:

Jul 17, 2014, 12:32:26 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/Ohana

Files:

• . (modified) (1 prop)
• src/opihi (modified) (1 prop)
• src/opihi/lib.shell/VectorIO.c (modified) (3 diffs)

branches/eam_branches/ipp-ops-20130712/Ohana/src/opihi/lib.shell/VectorIO.c

@@ -134 +134 @@
   FTable ftable;
 
-  int i, j, k;
+  int i, j;
   FILE *f = NULL;
 
@@ -202 +202 @@
     assert (status);
 
-# define ASSIGN_DATA(TYPE,OPTYPE) \
-    /* assign the data to the actual vector */ \
-    if (!strcmp (type, #TYPE)) { \
-      TYPE *Ptr = data;     \
-      for (k = 0; k < Nrows; k++) { \
-        for (j = 0; j < Nval; j++, Ptr++) { \
-          vec[Nvec + j][0].elements.OPTYPE[k] = *Ptr; \
-        } } }
-
-    // assign the data to the actual vector
-    ASSIGN_DATA(char,    Int);
-    ASSIGN_DATA(short,   Int);
-    ASSIGN_DATA(int,     Int);
-    ASSIGN_DATA(int64_t, Int);
-    ASSIGN_DATA(float,   Flt);
-    ASSIGN_DATA(double,  Flt);
+    if (!VectorAssignData(&vec[Nvec], type, data, Nrows, Nval)) {
+      // free unneeded things
+      gprint (GP_ERR, "trouble parsing data block type %s\n", type);
+      return (NULL);
+    }
 
     free (data);
@@ -241 +230 @@
 //  return (FALSE);
 }
+
+# define ASSIGN_DATA(TYPE,DTYPE,OPTYPE)        \
+    /* assign the data to the actual vector */ \
+    if (!strcmp (type, #TYPE)) { \
+      DTYPE *Ptr = data;                    \
+      for (k = 0; k < Nrows; k++) { \
+        for (j = 0; j < Nval; j++, Ptr++) { \
+          vec[j][0].elements.OPTYPE[k] = *Ptr; \
+          } } return TRUE; }
+
+int VectorAssignData (Vector **vec, char *type, void *data, int Nrows, int Nval) {
+
+  int j, k;
+
+  // assign the data to the actual vector
+  ASSIGN_DATA(byte,    char,    Int);
+  ASSIGN_DATA(char,    char,    Int);
+  ASSIGN_DATA(short,   short,   Int);
+  ASSIGN_DATA(int,     int,     Int);
+  ASSIGN_DATA(int64_t, int64_t, Int);
+  ASSIGN_DATA(float,   float,   Flt);
+  ASSIGN_DATA(double,  double,  Flt);
+
+  return FALSE;
+}
+
+# define ASSIGN_DATA_TRANSPOSE(TYPE,DTYPE,OPTYPE)       \
+    /* assign the data to the actual vector */ \
+    if (!strcmp (type, #TYPE)) { \
+      DTYPE *Ptr = data;                    \
+      for (k = 0; k < Nrows; k++) { \
+        for (j = 0; j < Nval; j++, Ptr++) { \
+          vec[k][0].elements.OPTYPE[j] = *Ptr; \
+          } } return TRUE; }
+
+int VectorAssignDataTranspose (Vector **vec, char *type, void *data, int Nrows, int Nval) {
+
+  int j, k;
+
+  // assign the data to the actual vector
+  ASSIGN_DATA_TRANSPOSE(byte,    char,    Int);
+  ASSIGN_DATA_TRANSPOSE(char,    char,    Int);
+  ASSIGN_DATA_TRANSPOSE(short,   short,   Int);
+  ASSIGN_DATA_TRANSPOSE(int,     int,     Int);
+  ASSIGN_DATA_TRANSPOSE(int64_t, int64_t, Int);
+  ASSIGN_DATA_TRANSPOSE(float,   float,   Flt);
+  ASSIGN_DATA_TRANSPOSE(double,  double,  Flt);
+
+  return FALSE;
+}