diff --git a/core/interact/no_interact_dict.py b/core/interact/no_interact_dict.py index 38d612e..2bdd3bd 100644 --- a/core/interact/no_interact_dict.py +++ b/core/interact/no_interact_dict.py @@ -44,6 +44,7 @@ dictionary = { 'Choose image degrade by bicubic rescale power' : '0', 'Degrade color power of final image' : '0', 'Color transfer to predicted face' : 'rct', + 'Override' : 'True', } cmd = 'mkdir DeepFaceLab_Linux/workspace/interact' os.system(cmd) diff --git a/mainscripts/Trainer.py b/mainscripts/Trainer.py index 8c543c4..ea1eff5 100644 --- a/mainscripts/Trainer.py +++ b/mainscripts/Trainer.py @@ -84,15 +84,15 @@ def trainerThread (s2c, c2s, e, if model.get_target_iter() != 0: if is_reached_goal: -# answer_filename = 'workspace/interact/interact_dict.pkl' -# if os.path.exists(answer_filename): -# with open(answer_filename, 'rb') as file: -# parameters = pickle.load(file) -# if parameters['NoInteractiveMode']: -# print("Entro 1") -# model_save() -# os._exit(1) -# else: + answer_filename = 'workspace/interact/interact_dict.pkl' + if os.path.exists(answer_filename): + with open(answer_filename, 'rb') as file: + parameters = pickle.load(file) + if parameters['NoInteractiveMode']: + print("Entro 1") + model_save() + os._exit(1) + else: io.log_info('Model already trained to target iteration. You can use preview.') else: io.log_info('Starting. Target iteration: %d. Press "Enter" to stop training and save model.' % ( model.get_target_iter() ) ) @@ -173,14 +173,14 @@ def trainerThread (s2c, c2s, e, model_save() is_reached_goal = True io.log_info ('You can use preview now.') - #answer_filename = 'workspace/interact/interact_dict.pkl' - #if os.path.exists(answer_filename): - # with open(answer_filename, 'rb') as file: - # parameters = pickle.load(file) - # if parameters['NoInteractiveMode']: - # print("Entro 2 ") - # model_save() - # os._exit(1) + answer_filename = 'workspace/interact/interact_dict.pkl' + if os.path.exists(answer_filename): + with open(answer_filename, 'rb') as file: + parameters = pickle.load(file) + if parameters['NoInteractiveMode']: + print("Entro 2 ") + model_save() + os._exit(1) need_save = False while time.time() - last_save_time >= save_interval_min*60: diff --git a/models/ModelBase.py b/models/ModelBase.py index 6f785cc..b8b38d3 100644 --- a/models/ModelBase.py +++ b/models/ModelBase.py @@ -299,21 +299,21 @@ class ModelBase(object): cmd = "pwd" print("Dentro ask_target_iter: \n\n") os.system(cmd) - #answer_filename = 'workspace/interact/interact_dict.pkl' - #if os.path.exists(answer_filename): - # with open(answer_filename, 'rb') as file: - # parameters = pickle.load(file) - # if parameters['NoInteractiveMode']: - # default_target_iter = self.load_or_def_option('target_iter', default_value + 10000) - # print("\n\n\n\nDefault target iteration: \n\n\n", default_target_iter) - # self.options['target_iter'] = max(0, default_target_iter + 10000) - # print("TARGET ITERATION: " + str(self.options['target_iter'])) - # else: - # 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)) - #else: - 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)) + answer_filename = 'workspace/interact/interact_dict.pkl' + if os.path.exists(answer_filename): + with open(answer_filename, 'rb') as file: + parameters = pickle.load(file) + if parameters['NoInteractiveMode']: + default_target_iter = self.load_or_def_option('target_iter', default_value + 10000) + print("\n\n\n\nDefault target iteration: \n\n\n", default_target_iter) + self.options['target_iter'] = max(0, default_target_iter + 10000) + print("TARGET ITERATION: " + str(self.options['target_iter'])) + else: + 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)) + else: + 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)) def ask_random_flip(self): default_random_flip = self.load_or_def_option('random_flip', True)