From 989a81c751a7bccdc583c38f1460b6a9c185c712 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Wed, 5 Feb 2025 19:08:50 +0100 Subject: [PATCH] Mixed bag of cleanups --- .flake8 | 4 ++-- arcface_converter/src/preparing.py | 3 +-- arcface_converter/src/training.py | 4 ++-- face_swapper/src/data_loader.py | 4 ++-- face_swapper/src/discriminator.py | 2 +- face_swapper/src/generator.py | 2 +- face_swapper/src/helper.py | 2 +- face_swapper/src/inferencing.py | 6 +++--- face_swapper/src/training.py | 10 +++++----- 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.flake8 b/.flake8 index 400be93..8a4f145 100644 --- a/.flake8 +++ b/.flake8 @@ -1,6 +1,6 @@ [flake8] -select = E3, E4, F, I1, I2 +select = E22, E23, E24, E27, E3, E4, E7, F, I1, I2 plugins = flake8-import-order -application_import_names = arcface_converter +application_import_names = arcface_converter, face_swapper import-order-style = pycharm per-file-ignores = preparing.py:E402 diff --git a/arcface_converter/src/preparing.py b/arcface_converter/src/preparing.py index 36a88a7..92676d7 100644 --- a/arcface_converter/src/preparing.py +++ b/arcface_converter/src/preparing.py @@ -4,13 +4,12 @@ from os.path import isfile from typing import List import numpy - numpy.bool = numpy.bool_ from mxnet.io import ImageRecordIter from onnxruntime import InferenceSession from tqdm import tqdm -from types import Embedding, EmbeddingPairs, VisionFrame +from .types import Embedding, EmbeddingPairs, VisionFrame CONFIG = configparser.ConfigParser() CONFIG.read('config.ini') diff --git a/arcface_converter/src/training.py b/arcface_converter/src/training.py index 2f5cb74..07f8e4d 100644 --- a/arcface_converter/src/training.py +++ b/arcface_converter/src/training.py @@ -10,8 +10,8 @@ from pytorch_lightning.tuner.tuning import Tuner from torch import Tensor from torch.utils.data import DataLoader, Dataset, TensorDataset, random_split -from networks.arcface_converter import ArcFaceConverter -from types import Batch, Loader +from .networks.arcface_converter import ArcFaceConverter +from .types import Batch, Loader CONFIG = configparser.ConfigParser() CONFIG.read('config.ini') diff --git a/face_swapper/src/data_loader.py b/face_swapper/src/data_loader.py index d648bdd..c7a5c6c 100644 --- a/face_swapper/src/data_loader.py +++ b/face_swapper/src/data_loader.py @@ -7,8 +7,8 @@ import torch import torchvision.transforms as transforms from torch.utils.data import TensorDataset -from helper import read_image -from types import Batch, ImagePathList, ImagePathSet +from .helper import read_image +from .types import Batch, ImagePathList, ImagePathSet class DataLoaderVGG(TensorDataset): diff --git a/face_swapper/src/discriminator.py b/face_swapper/src/discriminator.py index 47c8967..8d1a2ab 100644 --- a/face_swapper/src/discriminator.py +++ b/face_swapper/src/discriminator.py @@ -6,7 +6,7 @@ import torch.nn import torch.nn as nn from torch import Tensor -from types import DiscriminatorOutputs +from .types import DiscriminatorOutputs class NLayerDiscriminator(nn.Module): diff --git a/face_swapper/src/generator.py b/face_swapper/src/generator.py index db312ab..12f82e6 100644 --- a/face_swapper/src/generator.py +++ b/face_swapper/src/generator.py @@ -4,7 +4,7 @@ import torch import torch.nn as nn from torch import Tensor -from types import SourceEmbedding, TargetAttributes, VisionTensor +from .types import SourceEmbedding, TargetAttributes, VisionTensor class AdaptiveEmbeddingIntegrationNetwork(nn.Module): diff --git a/face_swapper/src/helper.py b/face_swapper/src/helper.py index b8a93c6..c9fce5f 100644 --- a/face_swapper/src/helper.py +++ b/face_swapper/src/helper.py @@ -4,7 +4,7 @@ import cv2 import numpy import torch -from types import IdEmbedder, IdEmbedding, Padding, Tensor, VisionFrame, VisionTensor +from .types import IdEmbedder, IdEmbedding, Padding, Tensor, VisionFrame, VisionTensor def is_windows() -> bool: diff --git a/face_swapper/src/inferencing.py b/face_swapper/src/inferencing.py index 8284f37..570c277 100644 --- a/face_swapper/src/inferencing.py +++ b/face_swapper/src/inferencing.py @@ -3,9 +3,9 @@ import configparser import cv2 import torch -from generator import AdaptiveEmbeddingIntegrationNetwork -from helper import calc_id_embedding, convert_to_vision_frame, convert_to_vision_tensor, read_image -from types import Generator, IdEmbedder, VisionFrame +from .generator import AdaptiveEmbeddingIntegrationNetwork +from .helper import calc_id_embedding, convert_to_vision_frame, convert_to_vision_tensor, read_image +from .types import Generator, IdEmbedder, VisionFrame CONFIG = configparser.ConfigParser() CONFIG.read('config.ini') diff --git a/face_swapper/src/training.py b/face_swapper/src/training.py index 1c218f7..e6ad370 100644 --- a/face_swapper/src/training.py +++ b/face_swapper/src/training.py @@ -12,11 +12,11 @@ from pytorch_msssim import ssim from torch import Tensor from torch.utils.data import DataLoader -from data_loader import DataLoaderVGG -from discriminator import MultiscaleDiscriminator -from generator import AdaptiveEmbeddingIntegrationNetwork -from helper import calc_id_embedding, hinge_fake_loss, hinge_real_loss -from types import Batch, DiscriminatorLossSet, DiscriminatorOutputs, FaceLandmark203, GeneratorLossSet, LossTensor, SourceEmbedding, SwapAttributes, TargetAttributes, VisionTensor +from .data_loader import DataLoaderVGG +from .discriminator import MultiscaleDiscriminator +from .generator import AdaptiveEmbeddingIntegrationNetwork +from .helper import calc_id_embedding, hinge_fake_loss, hinge_real_loss +from .types import Batch, DiscriminatorLossSet, DiscriminatorOutputs, FaceLandmark203, GeneratorLossSet, LossTensor, SourceEmbedding, SwapAttributes, TargetAttributes, VisionTensor CONFIG = configparser.ConfigParser() CONFIG.read('config.ini')