Changeset 20827

Timestamp:

Nov 24, 2008, 5:09:38 PM (17 years ago)

Author:

eugene

Message:

working on double vectors, other additions

Files:

• branches/eam_branch_20081124/Ohana/src/libautocode/def/common.h (modified) (1 diff)
• branches/eam_branch_20081124/Ohana/src/opihi/include/dvomath.h (modified) (2 diffs)
• branches/eam_branch_20081124/Ohana/src/opihi/lib.shell/VectorOps.c (modified) (6 diffs)
• branches/eam_branch_20081124/Ohana/src/opihi/lib.shell/stack_math.c (modified) (1 diff)
• trunk/Ohana/src/opihi/doc/opihi-vectors.txt (added)

branches/eam_branch_20081124/Ohana/src/libautocode/def/common.h

@@ -38 +38 @@
 # endif
 
-# define e_time unsigned int
+# define e_time int
 # define e_void long long
 # define rawshort short

branches/eam_branch_20081124/Ohana/src/opihi/include/dvomath.h

@@ -5 +5 @@
 
 # define NCHARS 256
+# define opihi_float float
+# define opihi_int unsigned int
 
 enum {ANYVECTOR, NEWVECTOR, OLDVECTOR};
 enum {ANYBUFFER, NEWBUFFER, OLDBUFFER};
+enum {OPIHI_FLOAT, OPIHI_INT};
 
 typedef struct {                        /* representation of a variable (0-D) */
@@ -16 +19 @@
 typedef struct {                        /* representation of a vector (1-D) */
   char name[1024];
+  char type;
   float *elements;
+  unsigned int *elementsInt;
   int Nelements;
 } Vector;

branches/eam_branch_20081124/Ohana/src/opihi/lib.shell/VectorOps.c

@@ -18 +18 @@
 
   for (i = 0; i < Nvectors; i++) {
-    free (vectors[i][0].elements);
+    if (vectors[i][0].elements) {
+      free (vectors[i][0].elements);
+    }
+    if (vectors[i][0].elementsInt) {
+      free (vectors[i][0].elementsInt);
+    }
     free (vectors[i]);
   }
@@ -28 +33 @@
 
   ALLOCATE (vec, Vector, 1);
-  ALLOCATE (vec[0].elements, float, 1);
+
+  vec[0].elementsInt = NULL;
+  ALLOCATE (vec[0].elements, opihi_float, 1);
+  vec[0].type = OPIHI_FLOAT;                      /* is a float unless specified otherwise */
+
   bzero (vec[0].name, 1024);
   vec[0].Nelements = 0;
@@ -95 +104 @@
   if (i == Nvectors) return (FALSE);
 
-  free (vectors[i][0].elements);
+  if (vectors[i][0].elements)    free (vectors[i][0].elements);
+  if (vectors[i][0].elementsInt) free (vectors[i][0].elementsInt);
   free (vectors[i]);
 
@@ -115 +125 @@
   if (i == Nvectors) return (FALSE);
 
-  free (vectors[i][0].elements);
+  if (vectors[i][0].elements)    free (vectors[i][0].elements);
+  if (vectors[i][0].elementsInt) free (vectors[i][0].elementsInt);
   free (vectors[i]);
 
@@ -137 +148 @@
   free (out[0].elements);
   out[0].Nelements = in[0].Nelements;
-  ALLOCATE (out[0].elements, float, out[0].Nelements);
-  memcpy (out[0].elements, in[0].elements, out[0].Nelements*sizeof(float));
+  if (in[0].elements) {
+    assert (in[0].type == OPIHI_FLOAT);
+    ALLOCATE (out[0].elements, opihi_float, out[0].Nelements);
+    memcpy (out[0].elements, in[0].elements, out[0].Nelements*sizeof(opihi_float));
+    out[0].type = OPIHI_FLOAT;
+  } else {
+    assert (in[0].type == OPIHI_INT);
+    ALLOCATE (out[0].elementsInt, opihi_int, out[0].Nelements);
+    memcpy (out[0].elementsInt, in[0].elementsInt, out[0].Nelements*sizeof(opihi_int));
+    out[0].type = OPIHI_INT;
+  }
   return (TRUE);
 }
@@ -154 +174 @@
 
   free (out[0].elements);
-  out[0].Nelements = in[0].Nelements;
-  out[0].elements =  in[0].elements;
+  out[0].Nelements   = in[0].Nelements;
+  out[0].elements    = in[0].elements;
+  out[0].elementsInt = in[0].elementsInt;
+  out[0].type        = in[0].type;
 
   /* delete vector entry from vector list, if it exists */

branches/eam_branch_20081124/Ohana/src/opihi/lib.shell/stack_math.c

@@ -35 +35 @@
   out = OUT[0].ptr = (float *)OUT[0].vector[0].elements;
 
-  switch (op[0]) { 
+// XXX this is not quite there:
+// 1) do I drop the .ptr element of StackVar?
+// 2) things below are using type from a StackVar to get the vector type -- wrong place
+// 3) the temp would need lots of work -- is it worth it?
+// 4) some operators force the output to be float -- we cannot use a single bit of code to 
+//    define the output type based on which is a float and which is not.  getting ugly.
+// ??? how much more work to bring the MV, etc functions into shape ???
+
+# define VV_FUNC(OP) \
+  if ((M1->type == OPIHI_FLOAT) && (M2->type == OPIHI_FLOAT)) { \
+    // output must be float, can use either as a temp \
+    opihi_float *M1 = V1[0].vector[0].elements; \
+    opihi_float *M2 = V2[0].vector[0].elements; \
+    for (i = 0; i < Nx; i++, out++, M1++, M2++) { \
+        *out = *M1 OP *M2; \
+    } \
+    break; \
+  } \
+  if ((M1->type != OPIHI_FLOAT) && (M2->type == OPIHI_FLOAT)) { \
+    // output must be float, can use M2 as a temp \
+    opihi_float *M1 = V1[0].vector[0].elementsInt; \
+    opihi_float *M2 = V2[0].vector[0].elements; \
+    for (i = 0; i < Nx; i++, out++, M1++, M2++) { \
+        *out = *M1 OP *M2; \
+    } \
+    break; \
+  } \
+  if ((M1->type == OPIHI_FLOAT) && (M2->type != OPIHI_FLOAT)) { \
+    // output must be float, can use M1 as a temp \
+    opihi_float *M1 = V1[0].vector[0].elements; \
+    opihi_float *M2 = V2[0].vector[0].elementsInt; \
+    for (i = 0; i < Nx; i++, out++, M1++, M2++) { \
+        *out = *M1 OP *M2; \
+    } \
+    break; \
+  } \
+  if ((M1->type != OPIHI_FLOAT) && (M2->type != OPIHI_FLOAT)) { \
+    // output may be int, can use either as temp \
+    opihi_float *M1 = V1[0].vector[0].elementsInt; \
+    opihi_float *M2 = V2[0].vector[0].elementsInt; \
+    for (i = 0; i < Nx; i++, out++, M1++, M2++) { \
+        *out = *M1 OP *M2; \
+    } \
+    break; \
+  }
+
+  switch (op[0]) {
   case '+': 
-    for (i = 0; i < Nx; i++, out++, M1++, M2++)
-      *out = *M1 + *M2;
-    break; 
+    VV_FUNC
+
+    if ((M1->type == OPIHI_FLOAT) && (M2->type == OPIHI_FLOAT)) {
+      // output must be float, can use either as a temp
+      M1 = V1[0].vector[0].elements;
+      M2 = V2[0].vector[0].elements;
+      for (i = 0; i < Nx; i++, out++, M1++, M2++) {
+        *out = *M1 + *M2;
+      }
+      break;
+    }
+    if ((M1->type != OPIHI_FLOAT) && (M2->type == OPIHI_FLOAT)) {
+      // output must be float, can use M2 as a temp
+      M1 = V1[0].vector[0].elementsInt;
+      M2 = V2[0].vector[0].elements;
+      for (i = 0; i < Nx; i++, out++, M1++, M2++) {
+        *out = *M1 + *M2;
+      }
+      break;
+    }
+    if ((M1->type == OPIHI_FLOAT) && (M2->type != OPIHI_FLOAT)) {
+      // output must be float, can use M1 as a temp
+      M1 = V1[0].vector[0].elements;
+      M2 = V2[0].vector[0].elementsInt;
+      for (i = 0; i < Nx; i++, out++, M1++, M2++) {
+        *out = *M1 + *M2;
+      }
+      break;
+    }
+    if ((M1->type != OPIHI_FLOAT) && (M2->type != OPIHI_FLOAT)) {
+      // output may be int, can use either as temp
+      M1 = V1[0].vector[0].elementsInt;
+      M2 = V2[0].vector[0].elementsInt;
+      for (i = 0; i < Nx; i++, out++, M1++, M2++) {
+        *out = *M1 + *M2;
+      }
+      break;
+    }
   case '-': 
     for (i = 0; i < Nx; i++, out++, M1++, M2++)