Changeset 40642 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

Mar 18, 2019, 5:02:59 PM (7 years ago)

Author:

eugene

Message:

cleanup opihi sort functions; add deimos fitobj function

Location:

trunk/Ohana/src/opihi/cmd.data

Files:

• nnet_train.c (modified) (3 diffs)
• sort.c (modified) (2 diffs)

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

@@ -3 +3 @@
 // these are local only
 float nnet_sigmoid (float value);
-void  nnet_sortseq (float *X, int *Y, int N);
 int   nnet_onelayer (Nnet *nnet, int L);
 void  nnet_reset_Nabla (Nnet *nnet);
@@ -191 +190 @@
     // generate a random sequence : used to select random mini batches
     for (int i = 0; i < Ntrial; i++) { seq[i] = i; rnd[i] = drand48(); }
-    nnet_sortseq (rnd, seq, Ntrial);
+    sort_float_index (rnd, seq, Ntrial);
 
     int Npass = Ntrial / Nmini;
@@ -514 +513 @@
   return 1.0 / (1.0 + exp(-value));
 }
-
-void nnet_sortseq (float *X, int *Y, int N) {
-
-# define SWAPFUNC(A,B){ float ftmp; int itmp;   \
-    ftmp = X[A]; X[A] = X[B]; X[B] = ftmp;      \
-    itmp = Y[A]; Y[A] = Y[B]; Y[B] = itmp;      \
-  }
-# define COMPARE(A,B)(X[A] < X[B])
-
-  OHANA_SORT (N, COMPARE, SWAPFUNC);
-
-# undef SWAPFUNC
-# undef COMPARE
-
-}
-

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

@@ -1 +1 @@
 # include "data.h"
-
-void fsortindex (opihi_flt *X, int *IDX, int N) {
-
-# define SWAPFUNC(A,B){ opihi_flt tmp; int itmp;        \
-  tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
-  itmp = IDX[A]; IDX[A] = IDX[B]; IDX[B] = itmp; \
-}
-
-// # define COMPARE(A,B)(X[A] < X[B])
-# define COMPARE(A,B)((!isfinite(X[A]) && isfinite(X[B])) || (X[A] < X[B]))
-
-  OHANA_SORT (N, COMPARE, SWAPFUNC);
-
-# undef SWAPFUNC
-# undef COMPARE
-
-}
-
-void isortindex (opihi_int *X, int *IDX, int N) {
-
-# define SWAPFUNC(A,B){ opihi_int tmp; int itmp;        \
-  tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
-  itmp = IDX[A]; IDX[A] = IDX[B]; IDX[B] = itmp; \
-}
-
-# define COMPARE(A,B)(X[A] < X[B])
-// # define COMPARE(A,B)((!isfinite(X[A]) && isfinite(X[B])) || (X[A] < X[B]))
-
-  OHANA_SORT (N, COMPARE, SWAPFUNC);
-
-# undef SWAPFUNC
-# undef COMPARE
-
-}
 
 // XXX add an option to NOT sort, but return an index instead?
@@ -78 +44 @@
   /* sort key & index */
   if (vec[0][0].type == OPIHI_FLT) {
-    fsortindex (vec[0][0].elements.Flt, index, Nval);
+    sort_opihi_flt_index (vec[0][0].elements.Flt, index, Nval);
   } else {
-    isortindex (vec[0][0].elements.Int, index, Nval);
+    sort_int_index (vec[0][0].elements.Int, index, Nval);
   }