From 04eaa831ea5845499676cf32a5d67537730d23a5 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Fri, 21 Feb 2025 10:06:07 +0100 Subject: [PATCH] Rename to resume_path only --- embedding_converter/README.md | 2 +- embedding_converter/config.ini | 2 +- embedding_converter/src/dataset.py | 1 - embedding_converter/src/training.py | 6 +++--- embedding_converter/src/types.py | 2 +- face_swapper/README.md | 2 +- face_swapper/config.ini | 2 +- face_swapper/src/training.py | 6 +++--- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/embedding_converter/README.md b/embedding_converter/README.md index 4b71e5b..36aa0a5 100644 --- a/embedding_converter/README.md +++ b/embedding_converter/README.md @@ -53,7 +53,7 @@ max_epochs = 4096 [training.output] directory_path = .outputs file_pattern = arcface_converter_simswap_{epoch}_{step} -resume_file_path = .outputs/last.ckpt +resume_path = .outputs/last.ckpt ``` ``` diff --git a/embedding_converter/config.ini b/embedding_converter/config.ini index 88e01a1..5388075 100644 --- a/embedding_converter/config.ini +++ b/embedding_converter/config.ini @@ -17,7 +17,7 @@ max_epochs = [training.output] directory_path = file_pattern = -resume_file_path = +resume_path = [exporting] directory_path = diff --git a/embedding_converter/src/dataset.py b/embedding_converter/src/dataset.py index f165fa0..3d61aea 100644 --- a/embedding_converter/src/dataset.py +++ b/embedding_converter/src/dataset.py @@ -3,7 +3,6 @@ import random import cv2 from torch import Tensor - from torch.utils.data import Dataset from torchvision import transforms diff --git a/embedding_converter/src/training.py b/embedding_converter/src/training.py index 2fa7e1a..6c1aba6 100644 --- a/embedding_converter/src/training.py +++ b/embedding_converter/src/training.py @@ -119,7 +119,7 @@ def create_trainer() -> Trainer: def train() -> None: dataset_file_pattern = CONFIG.get('training.dataset', 'file_pattern') - resume_file_path = CONFIG.get('training.output', 'resume_file_path') + output_resume_path = CONFIG.get('training.output', 'resume_path') dataset = DynamicDataset(dataset_file_pattern) training_loader, validation_loader = create_loaders(dataset) @@ -128,7 +128,7 @@ def train() -> None: tuner = Tuner(trainer) tuner.lr_find(embedding_converter_trainer, training_loader, validation_loader) - if os.path.exists(resume_file_path): - trainer.fit(embedding_converter_trainer, training_loader, validation_loader, ckpt_path = resume_file_path) + if os.path.exists(output_resume_path): + trainer.fit(embedding_converter_trainer, training_loader, validation_loader, ckpt_path = output_resume_path) else: trainer.fit(embedding_converter_trainer, training_loader, validation_loader) diff --git a/embedding_converter/src/types.py b/embedding_converter/src/types.py index 7513a43..d9d4ee9 100644 --- a/embedding_converter/src/types.py +++ b/embedding_converter/src/types.py @@ -1,4 +1,4 @@ -from typing import Any, Dict, TypeAlias +from typing import Any, TypeAlias from numpy.typing import NDArray from torch import Tensor diff --git a/face_swapper/README.md b/face_swapper/README.md index 486ab6f..2270858 100644 --- a/face_swapper/README.md +++ b/face_swapper/README.md @@ -84,7 +84,7 @@ preview_frequency = 250 [training.output] directory_path = .outputs file_pattern = face-swapper_{epoch}_{step} -resume_file_path = .outputs/last.ckpt +resume_path = .outputs/last.ckpt ``` ``` diff --git a/face_swapper/config.ini b/face_swapper/config.ini index 10f875f..6b835fe 100644 --- a/face_swapper/config.ini +++ b/face_swapper/config.ini @@ -42,7 +42,7 @@ preview_frequency = [training.output] directory_path = file_pattern = -resume_file_path = +resume_path = [exporting] directory_path = diff --git a/face_swapper/src/training.py b/face_swapper/src/training.py index 35a24de..0a33709 100644 --- a/face_swapper/src/training.py +++ b/face_swapper/src/training.py @@ -129,7 +129,7 @@ def train() -> None: same_person_probability = CONFIG.getfloat('preparing.dataset', 'same_person_probability') batch_size = CONFIG.getint('training.loader', 'batch_size') num_workers = CONFIG.getint('training.loader', 'num_workers') - resume_file_path = CONFIG.get('training.output', 'resume_file_path') + output_resume_path = CONFIG.get('training.output', 'resume_path') dataset = DataLoader(dataset_path, dataset_image_pattern, dataset_directory_pattern, same_person_probability) training_loader = TorchDataLoader(dataset, batch_size = batch_size, shuffle = True, num_workers = num_workers, drop_last = True, pin_memory = True, persistent_workers = True) @@ -137,7 +137,7 @@ def train() -> None: face_swapper_trainer = FaceSwapperTrainer() trainer = create_trainer() - if os.path.isfile(resume_file_path): - trainer.fit(face_swapper_trainer, training_loader, validation_loader, ckpt_path = resume_file_path) + if os.path.isfile(output_resume_path): + trainer.fit(face_swapper_trainer, training_loader, validation_loader, ckpt_path = output_resume_path) else: trainer.fit(face_swapper_trainer, training_loader, validation_loader)