diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/__init__.py b/extensions-builtin/forge_legacy_preprocessors/annotator/lama/__init__.py deleted file mode 100644 index 6253d38b..00000000 --- a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/__init__.py +++ /dev/null @@ -1,58 +0,0 @@ -# https://github.com/advimman/lama - -import yaml -import torch -from omegaconf import OmegaConf -import numpy as np - -from einops import rearrange -import os -from modules import devices -from annotator.annotator_path import models_path -from annotator.lama.saicinpainting.training.trainers import load_checkpoint - - -class LamaInpainting: - model_dir = os.path.join(models_path, "lama") - - def __init__(self): - self.model = None - self.device = devices.get_device_for("controlnet") - - def load_model(self): - remote_model_path = "https://huggingface.co/lllyasviel/Annotators/resolve/main/ControlNetLama.pth" - modelpath = os.path.join(self.model_dir, "ControlNetLama.pth") - if not os.path.exists(modelpath): - from modules.modelloader import load_file_from_url - load_file_from_url(remote_model_path, model_dir=self.model_dir) - config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'config.yaml') - cfg = yaml.safe_load(open(config_path, 'rt')) - cfg = OmegaConf.create(cfg) - cfg.training_model.predict_only = True - cfg.visualizer.kind = 'noop' - self.model = load_checkpoint(cfg, os.path.abspath(modelpath), strict=False, map_location='cpu') - self.model = self.model.to(self.device) - self.model.eval() - - def unload_model(self): - if self.model is not None: - self.model.cpu() - - def __call__(self, input_image): - if self.model is None: - self.load_model() - self.model.to(self.device) - color = np.ascontiguousarray(input_image[:, :, 0:3]).astype(np.float32) / 255.0 - mask = np.ascontiguousarray(input_image[:, :, 3:4]).astype(np.float32) / 255.0 - with torch.no_grad(): - color = torch.from_numpy(color).float().to(self.device) - mask = torch.from_numpy(mask).float().to(self.device) - mask = (mask > 0.5).float() - color = color * (1 - mask) - image_feed = torch.cat([color, mask], dim=2) - image_feed = rearrange(image_feed, 'h w c -> 1 c h w') - result = self.model(image_feed)[0] - result = rearrange(result, 'c h w -> h w c') - result = result * mask + color * (1 - mask) - result *= 255.0 - return result.detach().cpu().numpy().clip(0, 255).astype(np.uint8) diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/__init__.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/__init__.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/__init__.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/__init__.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/__init__.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/__init__.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/__init__.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/__init__.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/data/__init__.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/data/__init__.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/data/__init__.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/data/__init__.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/data/masks.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/data/masks.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/data/masks.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/data/masks.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/__init__.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/__init__.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/__init__.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/__init__.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/adversarial.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/adversarial.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/adversarial.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/adversarial.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/constants.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/constants.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/constants.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/constants.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/distance_weighting.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/distance_weighting.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/distance_weighting.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/distance_weighting.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/feature_matching.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/feature_matching.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/feature_matching.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/feature_matching.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/perceptual.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/perceptual.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/perceptual.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/perceptual.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/segmentation.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/segmentation.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/segmentation.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/segmentation.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/style_loss.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/style_loss.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/losses/style_loss.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/losses/style_loss.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/__init__.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/__init__.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/__init__.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/__init__.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/base.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/base.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/base.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/base.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/depthwise_sep_conv.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/depthwise_sep_conv.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/depthwise_sep_conv.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/depthwise_sep_conv.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/fake_fakes.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/fake_fakes.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/fake_fakes.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/fake_fakes.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/ffc.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/ffc.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/ffc.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/ffc.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/multidilated_conv.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/multidilated_conv.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/multidilated_conv.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/multidilated_conv.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/multiscale.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/multiscale.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/multiscale.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/multiscale.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/pix2pixhd.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/pix2pixhd.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/pix2pixhd.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/pix2pixhd.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/spatial_transform.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/spatial_transform.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/spatial_transform.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/spatial_transform.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/squeeze_excitation.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/squeeze_excitation.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/modules/squeeze_excitation.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/modules/squeeze_excitation.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/trainers/__init__.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/trainers/__init__.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/trainers/__init__.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/trainers/__init__.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/trainers/base.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/trainers/base.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/trainers/base.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/trainers/base.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/trainers/default.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/trainers/default.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/trainers/default.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/trainers/default.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/visualizers/__init__.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/visualizers/__init__.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/visualizers/__init__.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/visualizers/__init__.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/visualizers/base.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/visualizers/base.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/visualizers/base.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/visualizers/base.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/visualizers/colors.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/visualizers/colors.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/visualizers/colors.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/visualizers/colors.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/visualizers/directory.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/visualizers/directory.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/visualizers/directory.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/visualizers/directory.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/visualizers/noop.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/visualizers/noop.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/training/visualizers/noop.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/training/visualizers/noop.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/utils.py b/extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/utils.py similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/saicinpainting/utils.py rename to extensions-builtin/forge_preprocessor_inpaint/annotator/lama/saicinpainting/utils.py diff --git a/extensions-builtin/forge_legacy_preprocessors/annotator/lama/config.yaml b/extensions-builtin/forge_preprocessor_inpaint/scripts/lama_config.yaml similarity index 100% rename from extensions-builtin/forge_legacy_preprocessors/annotator/lama/config.yaml rename to extensions-builtin/forge_preprocessor_inpaint/scripts/lama_config.yaml diff --git a/extensions-builtin/forge_preprocessor_inpaint/scripts/preprocessor_inpaint.py b/extensions-builtin/forge_preprocessor_inpaint/scripts/preprocessor_inpaint.py index 4fc6986f..b908cccb 100644 --- a/extensions-builtin/forge_preprocessor_inpaint/scripts/preprocessor_inpaint.py +++ b/extensions-builtin/forge_preprocessor_inpaint/scripts/preprocessor_inpaint.py @@ -1,10 +1,16 @@ +import os import cv2 import torch import numpy as np +import yaml +import einops +from omegaconf import OmegaConf from modules_forge.supported_preprocessor import Preprocessor, PreprocessorParameter -from modules_forge.shared import add_supported_preprocessor -from modules_forge.forge_util import numpy_to_pytorch +from modules_forge.forge_util import numpy_to_pytorch, resize_image_with_pad +from modules_forge.shared import preprocessor_dir, add_supported_preprocessor +from modules.modelloader import load_file_from_url +from annotator.lama.saicinpainting.training.trainers import load_checkpoint class PreprocessorInpaint(Preprocessor): @@ -74,6 +80,42 @@ class PreprocessorInpaintLama(PreprocessorInpaintOnly): super().__init__() self.name = 'inpaint_only+lama' + def load_model(self): + remote_model_path = "https://huggingface.co/lllyasviel/Annotators/resolve/main/ControlNetLama.pth" + model_path = load_file_from_url(remote_model_path, model_dir=preprocessor_dir) + config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lama_config.yaml') + cfg = yaml.safe_load(open(config_path, 'rt')) + cfg = OmegaConf.create(cfg) + cfg.training_model.predict_only = True + cfg.visualizer.kind = 'noop' + model = load_checkpoint(cfg, os.path.abspath(model_path), strict=False, map_location='cpu') + self.setup_model_patcher(model) + return + + def __call__(self, input_image, resolution, slider_1=None, slider_2=None, slider_3=None, **kwargs): + input_image, remove_pad = resize_image_with_pad(input_image, resolution) + + self.load_model() + + self.move_all_model_patchers_to_gpu() + + color = np.ascontiguousarray(input_image[:, :, 0:3]).astype(np.float32) / 255.0 + mask = np.ascontiguousarray(input_image[:, :, 3:4]).astype(np.float32) / 255.0 + with torch.no_grad(): + color = self.send_tensor_to_model_device(torch.from_numpy(color)) + mask = self.send_tensor_to_model_device(torch.from_numpy(mask)) + mask = (mask > 0.5).float() + color = color * (1 - mask) + image_feed = torch.cat([color, mask], dim=2) + image_feed = einops.rearrange(image_feed, 'h w c -> 1 c h w') + result = self.model_patcher.model(image_feed)[0] + result = einops.rearrange(result, 'c h w -> h w c') + result = result * mask + color * (1 - mask) + result *= 255.0 + result = result.detach().cpu().numpy().clip(0, 255).astype(np.uint8) + + return remove_pad(result) + add_supported_preprocessor(PreprocessorInpaint())