monster/Qwen-Image-Layered-MRP-MLX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

controlnet files: revert the refactoring done in #77

Browse Source
This commit is contained in:
Anthony Wu 2024-10-20 01:06:02 -07:00
parent 6201a93d4a
commit 1160d4e8b2
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mflux/controlnet/controlnet_util.py
View File

@ -17,6 +17,13 @@ class ControlnetUtil:
image_to_canny = np.concatenate([image_to_canny, image_to_canny, image_to_canny], axis=2) image_to_canny = np.concatenate([image_to_canny, image_to_canny, image_to_canny], axis=2)
return PIL.Image.fromarray(image_to_canny) return PIL.Image.fromarray(image_to_canny)
@staticmethod
def scale_image(height: int, width: int, img: PIL.Image) -> PIL.Image:
if height != img.height or width != img.width:
log.warning(f"Control image has different dimensions than the model. Resizing to {width}x{height}")
img = img.resize((width, height), PIL.Image.LANCZOS)
return img
@staticmethod @staticmethod
def save_canny_image(control_image: PIL.Image, path: str): def save_canny_image(control_image: PIL.Image, path: str):
from mflux import ImageUtil from mflux import ImageUtil

2
src/mflux/controlnet/flux_controlnet.py
View File

@ -131,7 +131,7 @@ class Flux1Controlnet:
# Embed the controlnet reference image # Embed the controlnet reference image
control_image = ImageUtil.load_image(controlnet_image_path) control_image = ImageUtil.load_image(controlnet_image_path)
control_image = ImageUtil.scale_to_dimensions(control_image, config.height, config.width) control_image = ControlnetUtil.scale_image(config.height, config.width, control_image)
control_image = ControlnetUtil.preprocess_canny(control_image) control_image = ControlnetUtil.preprocess_canny(control_image)
if controlnet_save_canny: if controlnet_save_canny:
ControlnetUtil.save_canny_image(control_image, output) ControlnetUtil.save_canny_image(control_image, output)