Changeset 40319 for trunk/Ohana/src/opihi/cmd.data/nnet_commands.c

Timestamp:

Jan 23, 2018, 10:11:50 AM (9 years ago)

Author:

eugene

Message:

working on nnet

File:

• trunk/Ohana/src/opihi/cmd.data/nnet_commands.c (modified) (5 diffs)

trunk/Ohana/src/opihi/cmd.data/nnet_commands.c

@@ -12 +12 @@
 }
 
-/** Fix These ...
-int nnet_init (int argc, char **argv) {
-
+int nnet_delete (int argc, char **argv) {
+
+# if (0)
   int status;
   Nnet *nnet;
 
   if (argc != 2) {
-    gprint (GP_ERR, "USAGE: nnet init (nnet)\n");
-    return FALSE;
-  }
-
-  nnet = FindNnet (argv[1]);
-  if (nnet != NULL) {
-      status = DeleteNnet (nnet);
-      if (!status) abort ();
-  }
-
-  CreateNnet (argv[1]);
-  return TRUE;
-}
-
-int nnet_delete (int argc, char **argv) {
-
-  int status;
-  Nnet *nnet;
-
-  if (argc != 2) {
     gprint (GP_ERR, "USAGE: nnet delete (nnet)\n");
     return FALSE;
@@ -51 +31 @@
   status = DeleteNnet (nnet);
   if (!status) abort ();
+# endif
+
   return TRUE;
 }
@@ -56 +38 @@
 int nnet_show (int argc, char **argv) {
 
+# if (0)
   Nnet *nnet;
 
@@ -70 +53 @@
 
   ListPages (nnet);
-  return TRUE;
-}
-**/
+# endif
+
+  return TRUE;
+}
 
 int nnet_create (int argc, char **argv) {
@@ -97 +81 @@
 }
 
+int nnet_set (int argc, char **argv) {
+
+  Buffer *matrix;
+  Vector *vector;
+
+  if (argc < 5) {
+    gprint (GP_ERR, "USAGE: nnet set (nnet) [weights] [biases] ... [weights] [biases] : set nnet weights (images) and biases (vectors)\n");
+    return FALSE;
+  }
+
+  Nnet *nnet = FindNnet (argv[1]);
+  if (nnet == NULL) {
+    gprint (GP_ERR, "nnet %s not found, create it first\n", argv[1]);
+    return FALSE;
+  }
+
+  // compare argc and nnet[0].Nlayer 
+  if (argc - 2 != nnet[0].Nlayer * 2) {
+    gprint (GP_ERR, "ERROR: invalid number of arguments\n");
+    gprint (GP_ERR, "USAGE: nnet set (nnet) [weights] [biases] ... [weights] [biases] : set nnet weights (images) and biases (vectors)\n");
+    return FALSE;
+  }
+
+  // check for existence of each matrix & vector (and check sizes)
+  for (int L = 1; L < nnet[0].Nlayer; L++) {
+    int Narg = 2*(L - 1) + 2;
+    if ((matrix = SelectBuffer (argv[Narg + 0], OLDBUFFER, FALSE)) == NULL) {
+      gprint (GP_ERR, "unknown input image %s\n", argv[Narg + 0]);
+      gprint (GP_ERR, "USAGE: nnet set (nnet) [weights] [biases] ... [weights] [biases] : set nnet weights (images) and biases (vectors)\n");
+      return (FALSE);    
+    }
+    if ((vector = SelectVector (argv[Narg + 1], OLDVECTOR, FALSE)) == NULL) {
+      gprint (GP_ERR, "unknown input vector %s\n", argv[Narg + 1]);
+      gprint (GP_ERR, "USAGE: nnet set (nnet) [weights] [biases] ... [weights] [biases] : set nnet weights (images) and biases (vectors)\n");
+      return (FALSE);    
+    }
+
+    if (vector->Nelements != nnet[0].Nnodes[L]) {
+      gprint (GP_ERR, "invalid bias vector length %s (%d vs %d)\n", argv[Narg + 1], vector->Nelements, nnet[0].Nnodes[L]);
+      gprint (GP_ERR, "USAGE: nnet set (nnet) [weights] [biases] ... [weights] [biases] : set nnet weights (images) and biases (vectors)\n");
+    }
+
+    if (matrix->matrix.Naxis[0] != nnet[0].Nnodes[L-1]) {
+      gprint (GP_ERR, "invalid weight image size for %s (Nx = %d vs %d)\n", argv[Narg + 0], (int) matrix->matrix.Naxis[0], nnet[0].Nnodes[L-1]);
+      gprint (GP_ERR, "USAGE: nnet set (nnet) [weights] [biases] ... [weights] [biases] : set nnet weights (images) and biases (vectors)\n");
+    }
+
+    if (matrix->matrix.Naxis[1] != nnet[0].Nnodes[L]) {
+      gprint (GP_ERR, "invalid weight image size for %s (Ny = %d vs %d)\n", argv[Narg + 0], (int) matrix->matrix.Naxis[1], nnet[0].Nnodes[L]);
+      gprint (GP_ERR, "USAGE: nnet set (nnet) [weights] [biases] ... [weights] [biases] : set nnet weights (images) and biases (vectors)\n");
+    }
+
+  }
+
+  for (int L = 1; L < nnet[0].Nlayer; L++) {
+
+    int Narg = 2*(L - 1) + 2;
+    matrix = SelectBuffer (argv[Narg + 0], OLDBUFFER, FALSE); // I've checked the argv entry above so I do not need to check again...
+    vector = SelectVector (argv[Narg + 1], OLDVECTOR, FALSE);
+
+    opihi_flt *vecvalue = vector[0].elements.Flt;
+    for (int i = 0; i < nnet[0].Nnodes[L]; i++) {
+      nnet[0].biases[L][i] = vecvalue[i];
+    }
+
+    float *matvalue = (float *) matrix[0].matrix.buffer;
+    for (int j = 0; j < nnet[0].Nnodes[L]; j++) {
+      for (int i = 0; i < nnet[0].Nnodes[L-1]; i++) {
+        int k = i + j*nnet[0].Nnodes[L-1];
+        nnet[0].weight[L][k] = matvalue[k];
+      }
+    }
+  
+  }
+
+  return TRUE;
+}
+
+int nnet_get (int argc, char **argv) {
+
+  Buffer *matrix;
+  Vector *vector;
+
+  if (argc < 5) {
+    gprint (GP_ERR, "USAGE: nnet get (nnet) [weights] [biases] ... [weights] [biases] : get nnet weights (images) and biases (vectors)\n");
+    return FALSE;
+  }
+
+  Nnet *nnet = FindNnet (argv[1]);
+  if (nnet == NULL) {
+    gprint (GP_ERR, "nnet %s not found, create it first\n", argv[1]);
+    return FALSE;
+  }
+
+  // compare argc and nnet[0].Nlayer 
+  if (argc - 2 != nnet[0].Nlayer * 2) {
+    gprint (GP_ERR, "ERROR: invalid number of arguments\n");
+    gprint (GP_ERR, "USAGE: nnet set (nnet) [weights] [biases] ... [weights] [biases] : set nnet weights (images) and biases (vectors)\n");
+    return FALSE;
+  }
+
+  // check for existence of each matrix & vector (and check sizes)
+  for (int L = 1; L < nnet[0].Nlayer; L++) {
+    int Narg = 2*(L - 1) + 2;
+    if ((matrix = SelectBuffer (argv[Narg + 0], ANYBUFFER, FALSE)) == NULL) {
+      gprint (GP_ERR, "unknown input image %s\n", argv[Narg + 0]);
+      gprint (GP_ERR, "USAGE: nnet set (nnet) [weights] [biases] ... [weights] [biases] : set nnet weights (images) and biases (vectors)\n");
+      return (FALSE);    
+    }
+    if ((vector = SelectVector (argv[Narg + 1], ANYVECTOR, FALSE)) == NULL) {
+      gprint (GP_ERR, "unknown input vector %s\n", argv[Narg + 1]);
+      gprint (GP_ERR, "USAGE: nnet set (nnet) [weights] [biases] ... [weights] [biases] : set nnet weights (images) and biases (vectors)\n");
+      return (FALSE);    
+    }
+  }
+
+  for (int L = 1; L < nnet[0].Nlayer; L++) {
+
+    int Narg = 2*(L - 1) + 2;
+    matrix = SelectBuffer (argv[Narg + 0], OLDBUFFER, FALSE); // I've checked the argv entry above so I do not need to check again...
+    vector = SelectVector (argv[Narg + 1], OLDVECTOR, FALSE);
+
+    ResetVector (vector, OPIHI_FLT, nnet[0].Nnodes[L]);
+    ResetBuffer (matrix, nnet[0].Nnodes[L-1], nnet[0].Nnodes[L], -32, 0.0, 1.0);
+
+    opihi_flt *vecvalue = vector[0].elements.Flt;
+    for (int i = 0; i < nnet[0].Nnodes[L]; i++) {
+      vecvalue[i] = nnet[0].biases[L][i];
+    }
+
+    float *matvalue = (float *) matrix[0].matrix.buffer;
+    for (int j = 0; j < nnet[0].Nnodes[L]; j++) {
+      for (int i = 0; i < nnet[0].Nnodes[L-1]; i++) {
+        int k = i + j*nnet[0].Nnodes[L-1];
+        matvalue[k] = nnet[0].weight[L][k];
+      }
+    }
+  
+  }
+
+  return TRUE;
+}
+