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

added photos for thesis

Browse source
This commit is contained in:
leno3003 2022-04-01 15:27:23 +02:00
parent 1c249838c1
commit cc02b0c324
4 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
core/interact/interact.py
View file

@ -221,15 +221,11 @@ class InteractBase(object):
return ar return ar
def get_default_answer(self, answer_key): def get_default_answer(self, answer_key):
#f = open("/home/deepfake/interact.txt", "a")
#f.write(answer_key + "\n")
#f.close()
if answer_key in self.default_answers: if answer_key in self.default_answers:
return self.default_answers[answer_key] return self.default_answers[answer_key]
return None return None
def input(self, s, answer_key): def input(self, s, answer_key):
print(s)
ans = self.get_default_answer(answer_key) ans = self.get_default_answer(answer_key)
if ans is not None: if ans is not None:
return ans return ans
@ -284,7 +280,6 @@ class InteractBase(object):
answer_key = answer_key if answer_key is not None else s answer_key = answer_key if answer_key is not None else s
if show_default_value: if show_default_value:
if len(s) != 0: if len(s) != 0:
s_base = s
s = f"[{default_value}] {s}" s = f"[{default_value}] {s}"
else: else:
s = f"[{default_value}]" s = f"[{default_value}]"
@ -423,6 +418,9 @@ class InteractBase(object):
sq.put (False) sq.put (False)
def input_in_time (self, str, max_time_sec, answer_key=None): def input_in_time (self, str, max_time_sec, answer_key=None):
answer_key = answer_key if answer_key is not None else s
if self.get_default_answer(answer_key) is not None:
return self.get_default_answer(answer_key)
sq = multiprocessing.Queue() sq = multiprocessing.Queue()
p = multiprocessing.Process(target=self.input_process, args=( sys.stdin.fileno(), sq, str)) p = multiprocessing.Process(target=self.input_process, args=( sys.stdin.fileno(), sq, str))
p.daemon = True p.daemon = True
@ -431,9 +429,6 @@ class InteractBase(object):
inp = False inp = False
while True: while True:
if 'Override' in self.default_answers:
inp = True
break
if not sq.empty(): if not sq.empty():
inp = sq.get() inp = sq.get()
break break

2
core/interact/no_interact_dict.py
View file

@ -47,7 +47,7 @@ dictionary = {
'Choose image degrade by bicubic rescale power' : '0', 'Choose image degrade by bicubic rescale power' : '0',
'Degrade color power of final image' : '0', 'Degrade color power of final image' : '0',
'Color transfer to predicted face' : 'rct', 'Color transfer to predicted face' : 'rct',
'Override' : 'y', 'Press enter in 2 seconds to override model settings.' : 'y',
} }
cmd = 'mkdir DeepFaceLab_Linux/workspace/interact' cmd = 'mkdir DeepFaceLab_Linux/workspace/interact'
os.system(cmd) os.system(cmd)

10
mainscripts/Trainer.py
View file

@ -85,10 +85,7 @@ def trainerThread (s2c, c2s, e,
if model.get_target_iter() != 0: if model.get_target_iter() != 0:
if is_reached_goal: if is_reached_goal:
io.log_info('Model already trained to target iteration. You can use preview.') io.log_info('Model already trained to target iteration. You can use preview.')
if os.path.exists(answer_filename): if io.get_default_answer('NoInteractiveMode') is not None:
with open(answer_filename, 'rb') as file:
parameters = pickle.load(file)
if parameters['NoInteractiveMode']:
model_save() model_save()
os._exit(0) os._exit(0)
else: else:
@ -170,10 +167,7 @@ def trainerThread (s2c, c2s, e,
model_save() model_save()
is_reached_goal = True is_reached_goal = True
io.log_info ('You can use preview now.') io.log_info ('You can use preview now.')
if os.path.exists(answer_filename): if io.get_default_answer('NoInteractiveMode') is not None:
with open(answer_filename, 'rb') as file:
parameters = pickle.load(file)
if parameters['NoInteractiveMode']:
model_save() model_save()
os._exit(0) os._exit(0)
need_save = False need_save = False

7
models/ModelBase.py
View file

@ -296,15 +296,12 @@ class ModelBase(object):
def ask_target_iter(self, default_value=0): def ask_target_iter(self, default_value=0):
answer_filename = 'workspace/interact/interact_dict.pkl' answer_filename = 'workspace/interact/interact_dict.pkl'
if os.path.exists(answer_filename): if io.get_default_answer('NoInteractiveMode') is not None:
with open(answer_filename, 'rb') as file:
parameters = pickle.load(file)
if parameters['NoInteractiveMode']:
print("Entro in ask_target_iter") print("Entro in ask_target_iter")
default_target_iter = self.load_or_def_option('target_iter', default_value + 10000) default_target_iter = self.load_or_def_option('target_iter', default_value + 10000)
self.options['target_iter'] = max(0, default_target_iter + 10000) self.options['target_iter'] = max(0, default_target_iter + 10000)
print("TARGET ITERATION: " + str(self.options['target_iter'])) print("TARGET ITERATION: " + str(self.options['target_iter']))
else: else:
default_target_iter = self.load_or_def_option('target_iter', default_value) default_target_iter = self.load_or_def_option('target_iter', default_value)
self.options['target_iter'] = max(0, io.input_int("Target iteration", default_target_iter)) self.options['target_iter'] = max(0, io.input_int("Target iteration", default_target_iter))
else: else: