Changeset 40376

Timestamp:

Mar 26, 2018, 12:54:01 PM (8 years ago)

Author:

eugene

Message:

add jdtolst function; add nnet write function

Location:

trunk/Ohana/src/opihi

Files:

• cmd.astro/Makefile (modified) (1 diff)
• cmd.astro/init.c (modified) (2 diffs)
• cmd.astro/jdtolst.c (added)
• cmd.data/nnet.c (modified) (2 diffs)
• cmd.data/nnet_commands.c (modified) (1 diff)
• cmd.data/test/nnet.sh (modified) (1 diff)
• include/data.h (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.astro/Makefile

@@ -82 +82 @@
 $(SRC)/wcs.$(ARCH).o         \
 $(SRC)/imsub.$(ARCH).o             \
+$(SRC)/jdtolst.$(ARCH).o                   \
 $(SRC)/imfit.$(ARCH).o             \
 $(SRC)/imfit-fgauss.$(ARCH).o      \

trunk/Ohana/src/opihi/cmd.astro/init.c

@@ -33 +33 @@
 int imfit                   PROTO((int, char **));
 int imsub                   PROTO((int, char **));
+int jdtolst                 PROTO((int, char **));
 int medianmap               PROTO((int, char **));
 int galsectors              PROTO((int, char **));
@@ -103 +104 @@
   {1, "imfit",       imfit,        "fit function"},
   {1, "imsub",       imsub,        "subtract function"},
+  {1, "jdtolst",     jdtolst,      "JD to LST conversion"},
   {1, "medianmap",   medianmap,    "small median image"},
   {1, "mkgauss",     mkgauss,      "generate a 2-D gaussian centered in image"},

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

@@ -9 +9 @@
   {1, "get",      nnet_get,      "get nnet node values"},
   {1, "read",     nnet_read,     "read nnet values from a file"},
-// {1, "write",    nnet_write,    "write nnet values to a file"},
+  {1, "write",    nnet_write,    "write nnet values to a file"},
   {1, "train",    nnet_train,    "train nnet on a set of data"},
   {1, "apply",    nnet_apply,    "apply nnet to a set of data"},
@@ -27 +27 @@
     gprint (GP_ERR, "    nnet get    (nnet) [weights] [biases] ... [weights] [biases] : get nnet weights (images) and biases (vectors)\n");
     gprint (GP_ERR, "    nnet read   (nnet) (filename) : set nnet weights and biases using a data file\n");
+    gprint (GP_ERR, "    nnet write  (nnet) (filename) : save nnet weights and biases to a data file\n");
     gprint (GP_ERR, "    nnet train  (nnet) [input] [input] ... [output] [output] ... : train nnet on data from a set of vectors\n");
     gprint (GP_ERR, "    nnet apply  (nnet) [input] [input] ... [output] [output] ... : apply nnet to input data and generate output\n");

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

@@ -258 +258 @@
 }
 
+int nnet_write (int argc, char **argv) {
+
+  if (argc < 3) {
+    gprint (GP_ERR, "USAGE: nnet write (nnet) (filename) : save nnet weights and biases to a file\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;
+  }
+
+  // open the file and read the number of layers
+  FILE *f = fopen (argv[2], "w");
+  if (f == NULL) {
+    gprint (GP_ERR, "USAGE: nnet write (nnet) (filename) : save nnet weights and biases to a file\n");
+    gprint (GP_ERR, "file %s could not be opened\n", argv[2]);
+    return FALSE;
+  }
+
+  // write the number of layers
+  // NLAYER 3
+  fprintf (f, "NLAYER %d\n", nnet->Nlayer);
+
+  // write the number of nodes for each layer
+  // LAYERS 2 4 2
+  fprintf (f, "LAYERS");
+  for (int i = 0; i < nnet->Nlayer; i++) {
+    fprintf (f, " %d", nnet->Nnodes[i]);
+  }
+  fprintf (f, "\n");
+
+  // read the weights and biases from the data file
+  for (int L = 1; L < nnet[0].Nlayer; L++) {
+    
+    fprintf (f, "LAYER %d NX %d NY %d\n", L - 1, nnet->Nnodes[L-1], nnet->Nnodes[L]);
+
+    for (int j = 0; j < nnet->Nnodes[L]; j++) {
+      for (int i = 0; i < nnet->Nnodes[L-1]; i++) {
+        int k = i + j*nnet[0].Nnodes[L-1];
+        fprintf (f, "%f ", nnet[0].weight[L][k]);
+      }
+      fprintf (f, "%f\n", nnet[0].biases[L][j]);
+    }
+  }
+  fclose (f);
+
+  return TRUE;
+}
+
 int nnet_get (int argc, char **argv) {
 

trunk/Ohana/src/opihi/cmd.data/test/nnet.sh

@@ +1 @@
+
+macro test.io
+
+  nnet create t1 2 3 2
+  
+  # biases:
+  vlist v1 -0.2 0.0 0.2
+  vlist v2 -0.3 0.3
+
+  # weights
+  mcreate m1 2 3
+  m1[0][0] =  0.2
+  m1[1][0] = -0.2
+  m1[0][1] = -0.6
+  m1[1][1] =  0.5
+  m1[0][2] = -0.2
+  m1[1][2] =  0.2
+
+  mcreate m2 3 2
+  m2[0][0] = -0.6
+  m2[1][0] = -0.4
+  m2[2][0] = -0.5
+
+  m2[0][1] = -0.2
+  m2[1][1] = -0.5
+  m2[2][1] =  0.1
+
+  # set weights and biases
+  nnet set t1 m1 v1 m2 v2
+
+  nnet write t1 test.nnet.dat
+  nnet read t2 test.nnet.dat
+
+  nnet get t2 M1 V1 M2 V2
+
+  set dM1 = M1 - m1
+  set dM2 = M2 - m2
+  set dV1 = V1 - v1
+  set dV2 = V2 - v2
+
+  stat dM1
+  stat dM2
+ 
+  vstat dV1
+  vstat dV2
+end
 
 macro test.python

trunk/Ohana/src/opihi/include/data.h

@@ -278 +278 @@
 int nnet_get (int argc, char **argv);
 int nnet_read (int argc, char **argv);
+int nnet_write (int argc, char **argv);
 int nnet_print (int argc, char **argv);