From 63c794b3d091e7df5eeaea62a5f414babc5bd3f4 Mon Sep 17 00:00:00 2001 From: iperov Date: Mon, 28 Jun 2021 18:26:54 +0400 Subject: [PATCH] rename dump_dflive to export_dfm --- main.py | 10 +++++----- mainscripts/{DumpDFLive.py => ExportDFM.py} | 2 +- models/Model_AMP/Model.py | 6 +++--- models/Model_SAEHD/Model.py | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) rename mainscripts/{DumpDFLive.py => ExportDFM.py} (95%) diff --git a/main.py b/main.py index 04337af..493c7ed 100644 --- a/main.py +++ b/main.py @@ -148,15 +148,15 @@ if __name__ == "__main__": p.add_argument('--execute-program', dest="execute_program", default=[], action='append', nargs='+') p.set_defaults (func=process_train) - def process_dumpdflive(arguments): + def process_exportdfm(arguments): osex.set_process_lowest_prio() - from mainscripts import DumpDFLive - DumpDFLive.main(model_class_name = arguments.model_name, saved_models_path = Path(arguments.model_dir)) + from mainscripts import ExportDFM + ExportDFM.main(model_class_name = arguments.model_name, saved_models_path = Path(arguments.model_dir)) - p = subparsers.add_parser( "dumpdflive", help="Dump model to use in DFLive.") + p = subparsers.add_parser( "exportdfm", help="Export model to use in DeepFaceLive.") p.add_argument('--model-dir', required=True, action=fixPathAction, dest="model_dir", help="Saved models dir.") p.add_argument('--model', required=True, dest="model_name", choices=pathex.get_all_dir_names_startswith ( Path(__file__).parent / 'models' , 'Model_'), help="Model class name.") - p.set_defaults (func=process_dumpdflive) + p.set_defaults (func=process_exportdfm) def process_merge(arguments): osex.set_process_lowest_prio() diff --git a/mainscripts/DumpDFLive.py b/mainscripts/ExportDFM.py similarity index 95% rename from mainscripts/DumpDFLive.py rename to mainscripts/ExportDFM.py index 704cf23..2b0f978 100644 --- a/mainscripts/DumpDFLive.py +++ b/mainscripts/ExportDFM.py @@ -19,4 +19,4 @@ def main(model_class_name, saved_models_path): is_training=False, saved_models_path=saved_models_path, cpu_only=True) - model.dump_dflive () + model.export_dfm () diff --git a/models/Model_AMP/Model.py b/models/Model_AMP/Model.py index fa093fe..b6732dc 100644 --- a/models/Model_AMP/Model.py +++ b/models/Model_AMP/Model.py @@ -638,10 +638,10 @@ class AMPModel(ModelBase): self.update_sample_for_preview(force_new=True) - def dump_dflive (self): - output_path=self.get_strpath_storage_for_file('model.dflive') + def export_dfm (self): + output_path=self.get_strpath_storage_for_file('model.dfm') - io.log_info(f'Dumping .dflive to {output_path}') + io.log_info(f'Dumping .dfm to {output_path}') tf = nn.tf with tf.device (nn.tf_default_device_name): diff --git a/models/Model_SAEHD/Model.py b/models/Model_SAEHD/Model.py index cc1f49a..7e548db 100644 --- a/models/Model_SAEHD/Model.py +++ b/models/Model_SAEHD/Model.py @@ -659,10 +659,10 @@ Examples: df, liae, df-d, df-ud, liae-ud, ... if self.pretrain_just_disabled: self.update_sample_for_preview(force_new=True) - def dump_dflive (self): - output_path=self.get_strpath_storage_for_file('model.dflive') + def export_dfm (self): + output_path=self.get_strpath_storage_for_file('model.dfm') - io.log_info(f'Dumping .dflive to {output_path}') + io.log_info(f'Dumping .dfm to {output_path}') tf = nn.tf nn.set_data_format('NCHW')