Merge pull request #33 from will1792/more_options

Add new option `echeck`, `fcheck`, and `stddev`
MDIL-SNU · Oct 11, 2018 · 0900e23 · 0900e23
2 parents 07eee02 + 68b69dd
commit 0900e23
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/simple_nn/_version.py b/simple_nn/_version.py
@@ -1 +1 @@
-__version__ = "0.4.6"
+__version__ = "0.5.0"
diff --git a/simple_nn/models/neural_network.py b/simple_nn/models/neural_network.py
@@ -53,6 +53,9 @@ def __init__(self):
                                       'intra_op_parallelism_threads': 0,
                                       'print_structure_rmse': False,
                                       'cache': False,
+                                      'stddev': 0.3,
+                                      'echeck': True,
+                                      'fcheck': True,
                                   }
                               }
         self.inputs = dict()
@@ -93,10 +96,11 @@ def _make_model(self):
         else:
             dtype = tf.float32
 
+        # TODO: input validation for stddev.
         dense_basic_setting = {
             'dtype': dtype,
-            'kernel_initializer': tf.initializers.truncated_normal(stddev=0.3, dtype=dtype),
-            'bias_initializer': tf.initializers.truncated_normal(stddev=0.3, dtype=dtype)
+            'kernel_initializer': tf.initializers.truncated_normal(stddev=self.inputs['stddev'], dtype=dtype),
+            'bias_initializer': tf.initializers.truncated_normal(stddev=self.inputs['stddev'], dtype=dtype)
         }
         dense_last_setting = copy.deepcopy(dense_basic_setting)
 
@@ -637,8 +641,9 @@ def train(self, user_optimizer=None, user_atomic_weights_function=None):
 
                     # Temp saving
                     #if (epoch+1) % self.inputs['save_interval'] == 0:
-                        if save_stack > self.inputs['save_interval'] and prev_eloss > eloss and \
-                           ((prev_floss > floss) or floss == 0.):
+                        if save_stack > self.inputs['save_interval'] and \
+                            (prev_eloss > eloss or not self.inputs['echeck']) and \
+                            (prev_floss > floss or not self.inputs['fcheck'] or floss == 0.):
                             temp_time = timeit.default_timer()
                             self._save(sess, saver)
                             prev_eloss = eloss