Merge remote-tracking branch 'upstream/master'

models/ModelBase.py

@@ -74,8 +74,8 @@ class ModelBase(object):
                 self.options.pop('epoch')
             if self.iter != 0:
                 self.options = model_data['options']
-                self.loss_history = model_data['loss_history'] if 'loss_history' in model_data.keys() else []
-                self.sample_for_preview = model_data['sample_for_preview']  if 'sample_for_preview' in model_data.keys() else None
+                self.loss_history = model_data.get('loss_history', [])
+                self.sample_for_preview = model_data.get('sample_for_preview', None)
 
         ask_override = self.is_training_mode and self.iter != 0 and io.input_in_time ("Press enter in 2 seconds to override model settings.", 5 if io.is_colab() else 2 )
 
@@ -178,9 +178,7 @@ class ModelBase(object):
                     if not isinstance(generator, SampleGeneratorBase):
                         raise ValueError('training data generator is not subclass of SampleGeneratorBase')
 
-            if (self.sample_for_preview is None) or (self.iter == 0):
-                
-                if self.iter == 0:
+            if self.sample_for_preview is None or choose_preview_history:                
                 if choose_preview_history and io.is_support_windows():
                     wnd_name = "[p] - next. [enter] - confirm."
                     io.named_window(wnd_name)

requirements-cuda.txt

@@ -3,6 +3,7 @@ h5py==2.9.0
 Keras==2.2.4
 opencv-python==4.0.0.21
 tensorflow-gpu==1.12.0
+plaidml==0.6.0
 plaidml-keras==0.5.0
 scikit-image
 tqdm

requirements-opencl.txt

@@ -3,6 +3,7 @@ h5py==2.9.0
 Keras==2.2.4
 opencv-python==4.0.0.21
 tensorflow==1.12.0
+plaidml==0.6.0
 plaidml-keras==0.5.0
 scikit-image
 tqdm