github/DeepFaceLab
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLab.git synced 2025-08-24 15:16:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Luke Barr 2019-05-20 18:36:58 -05:00
commit 41a8acf383
3 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

60
models/ModelBase.py
View file

@ -74,8 +74,8 @@ class ModelBase(object):
self.options.pop('epoch') self.options.pop('epoch')
if self.iter != 0: if self.iter != 0:
self.options = model_data['options'] self.options = model_data['options']
self.loss_history = model_data['loss_history'] if 'loss_history' in model_data.keys() else [] self.loss_history = model_data.get('loss_history', [])
self.sample_for_preview = model_data['sample_for_preview'] if 'sample_for_preview' in model_data.keys() else None 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 ) 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,36 +178,34 @@ class ModelBase(object):
if not isinstance(generator, SampleGeneratorBase): if not isinstance(generator, SampleGeneratorBase):
raise ValueError('training data generator is not subclass of SampleGeneratorBase') raise ValueError('training data generator is not subclass of SampleGeneratorBase')
if (self.sample_for_preview is None) or (self.iter == 0): if self.sample_for_preview is None or choose_preview_history:
if choose_preview_history and io.is_support_windows():
if self.iter == 0: wnd_name = "[p] - next. [enter] - confirm."
if choose_preview_history and io.is_support_windows(): io.named_window(wnd_name)
wnd_name = "[p] - next. [enter] - confirm." io.capture_keys(wnd_name)
io.named_window(wnd_name) choosed = False
io.capture_keys(wnd_name) while not choosed:
choosed = False
while not choosed:
self.sample_for_preview = self.generate_next_sample()
preview = self.get_static_preview()
io.show_image( wnd_name, (preview*255).astype(np.uint8) )
while True:
key_events = io.get_key_events(wnd_name)
key, chr_key, ctrl_pressed, alt_pressed, shift_pressed = key_events[-1] if len(key_events) > 0 else (0,0,False,False,False)
if key == ord('\n') or key == ord('\r'):
choosed = True
break
elif key == ord('p'):
break
try:
io.process_messages(0.1)
except KeyboardInterrupt:
choosed = True
io.destroy_window(wnd_name)
else:
self.sample_for_preview = self.generate_next_sample() self.sample_for_preview = self.generate_next_sample()
preview = self.get_static_preview()
io.show_image( wnd_name, (preview*255).astype(np.uint8) )
while True:
key_events = io.get_key_events(wnd_name)
key, chr_key, ctrl_pressed, alt_pressed, shift_pressed = key_events[-1] if len(key_events) > 0 else (0,0,False,False,False)
if key == ord('\n') or key == ord('\r'):
choosed = True
break
elif key == ord('p'):
break
try:
io.process_messages(0.1)
except KeyboardInterrupt:
choosed = True
io.destroy_window(wnd_name)
else:
self.sample_for_preview = self.generate_next_sample()
model_summary_text = [] model_summary_text = []

1
requirements-cuda.txt
View file

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

1
requirements-opencl.txt
View file

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