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

Timestamp:

Mar 16, 2018, 4:06:05 PM (8 years ago)

Author:

eugene

Message:

fix up the nnet code to match behavior of the python version

File:

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

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

@@ -62 +62 @@
   CreateNnetData (nnet, LargeWeightInit);
 
+  return TRUE;
+}
+
+int nnet_print (int argc, char **argv) {
+
+  if (argc != 2) {
+    gprint (GP_ERR, "USAGE: nnet print (nnet)\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;
+  }
+
+  PrintNnet (nnet);
   return TRUE;
 }
@@ -146 +163 @@
 }
 
+int nnet_read (int argc, char **argv) {
+
+  # define D_LINE 0x10000
+  char word[128];
+  char line[D_LINE];
+
+  if (argc < 3) {
+    gprint (GP_ERR, "USAGE: nnet read (nnet) (filename) : set nnet weights and biases based on a file\n");
+    gprint (GP_ERR, "the first line of the file specifies the number of layers, each layer in the network is written as a matrix of numbers (weights) and a vector\n");
+    return FALSE;
+  }
+
+  // open the file and read the number of layers
+  FILE *f = fopen (argv[2], "r");
+  if (f == NULL) {
+    gprint (GP_ERR, "USAGE: nnet read (nnet) (filename) : set nnet weights and biases based on a file\n");
+    gprint (GP_ERR, "file %s could not be opened\n", argv[2]);
+    return FALSE;
+  }
+
+  // read the number of layers
+  // NLAYER 3
+  int Nlayer;
+  scan_line_maxlen (f, line, D_LINE);
+  sscanf (line, "%127s %d", word, &Nlayer);
+  if (strcmp(word, "NLAYER")) {
+    gprint (GP_ERR, "warning: NLAYER keyword not found\n");
+  }
+
+  Nnet *nnet = CreateNnet (argv[1], Nlayer);
+
+  // read the number of nodes
+  // LAYERS 2 4 2
+  scan_line_maxlen (f, line, D_LINE);
+  char *tmpword = getword (line);
+  if (strcmp (tmpword, "LAYERS")) {
+    gprint (GP_ERR, "warning: LAYERS keyword not found\n");
+  }
+  FREE (tmpword);
+  for (int i = 0; i < Nlayer; i++) {
+    int Nnode;
+    int status = iparse (&Nnode, i + 2, line); // numbering is fields 1 2 3
+    if (!status) {
+      gprint (GP_ERR, "error: failed to find all Nnode values\n");
+      fclose (f);
+      DeleteNnet (nnet);
+      return FALSE;
+    }
+    nnet[0].Nnodes[i] = Nnode;
+  }
+
+  // this creates the data for each node and inits with gaussian weights
+  CreateNnetData (nnet, FALSE);
+
+  // read the weights and biases from the data file
+  for (int L = 1; L < nnet[0].Nlayer; L++) {
+    
+    char word1[128], word2[128], word3[128];
+    int Nx, Ny, layer;
+    scan_line_maxlen (f, line, D_LINE);
+    sscanf (line, "%127s %d %127s %d %127s %d", word1, &layer, word2, &Nx, word3, &Ny);
+    gprint (GP_ERR, "LAYER: %d, Nx: %d, Ny: %d\n", layer, Nx, Ny);
+
+    if (layer != L - 1) {
+      gprint (GP_ERR, "warning: expect layer = %d, got %d\n", L - 1, layer);
+    }
+    if (Nx != nnet[0].Nnodes[L - 1]) {
+      gprint (GP_ERR, "warning: expect Nx = %d, got %d\n", nnet[0].Nnodes[L - 1], Nx);
+    }
+    if (Ny != nnet[0].Nnodes[L]) {
+      gprint (GP_ERR, "warning: expect Ny = %d, got %d\n", nnet[0].Nnodes[L], Ny);
+    }
+
+    double value;
+    for (int j = 0; j < Ny; j++) {
+      scan_line_maxlen (f, line, D_LINE);
+      for (int i = 0; i < Nx; i++) {
+        int k = i + j*nnet[0].Nnodes[L-1];
+        int status = dparse (&value, i + 1, line);
+        if (!status) {
+          gprint (GP_ERR, "error: failed to read entry from a line (layer: %d, i: %d, j: %d)\n", layer, i, j);
+          fclose (f);
+          DeleteNnet (nnet);
+          return FALSE;
+        }
+        nnet[0].weight[L][k] = value;
+      }
+      dparse (&value, Nx + 1, line);
+      nnet[0].biases[L][j] = value;
+    }
+  }
+
+  return TRUE;
+}
+
 int nnet_get (int argc, char **argv) {