update generated image annotations
This commit is contained in:
parent
dee452b3bb
commit
a2900c3b13
@ -33,4 +33,4 @@ class ConfigControlnet(Config):
|
|||||||
controlnet_strength: float = 1.0,
|
controlnet_strength: float = 1.0,
|
||||||
):
|
):
|
||||||
super().__init__(num_inference_steps, width, height, guidance)
|
super().__init__(num_inference_steps, width, height, guidance)
|
||||||
self.controlnet_conditioning_scale = controlnet_strength
|
self.controlnet_strength = controlnet_strength
|
||||||
|
|||||||
@ -37,7 +37,7 @@ class RuntimeConfig:
|
|||||||
return self.model_config.num_train_steps
|
return self.model_config.num_train_steps
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def controlnet_conditioning_scale(self) -> float:
|
def controlnet_strength(self) -> float:
|
||||||
if isinstance(self.config, ConfigControlnet):
|
if isinstance(self.config, ConfigControlnet):
|
||||||
return self.config.controlnet_strength
|
return self.config.controlnet_strength
|
||||||
else:
|
else:
|
||||||
|
|||||||
0
src/mflux/controlnet/__init__.py
Normal file
0
src/mflux/controlnet/__init__.py
Normal file
@ -268,7 +268,7 @@ class TransformerControlnet(nn.Module):
|
|||||||
time_step = mx.broadcast_to(time_step, (1,)).astype(config.precision)
|
time_step = mx.broadcast_to(time_step, (1,)).astype(config.precision)
|
||||||
hidden_states = self.x_embedder(hidden_states)
|
hidden_states = self.x_embedder(hidden_states)
|
||||||
hidden_states = hidden_states + self.controlnet_x_embedder(controlnet_cond)
|
hidden_states = hidden_states + self.controlnet_x_embedder(controlnet_cond)
|
||||||
conditioning_scale = config.config.controlnet_conditioning_scale
|
conditioning_scale = config.config.controlnet_strength
|
||||||
|
|
||||||
guidance = mx.broadcast_to(config.guidance * config.num_train_steps, (1,)).astype(config.precision)
|
guidance = mx.broadcast_to(config.guidance * config.num_train_steps, (1,)).astype(config.precision)
|
||||||
text_embeddings = self.time_text_embed.forward(time_step, pooled_prompt_embeds, guidance)
|
text_embeddings = self.time_text_embed.forward(time_step, pooled_prompt_embeds, guidance)
|
||||||
|
|||||||
@ -26,6 +26,7 @@ class GeneratedImage:
|
|||||||
generation_time: float,
|
generation_time: float,
|
||||||
lora_paths: list[str],
|
lora_paths: list[str],
|
||||||
lora_scales: list[float],
|
lora_scales: list[float],
|
||||||
|
controlnet_strength: float | None = None,
|
||||||
):
|
):
|
||||||
self.image = image
|
self.image = image
|
||||||
self.model_config = model_config
|
self.model_config = model_config
|
||||||
@ -38,6 +39,7 @@ class GeneratedImage:
|
|||||||
self.generation_time = generation_time
|
self.generation_time = generation_time
|
||||||
self.lora_paths = lora_paths
|
self.lora_paths = lora_paths
|
||||||
self.lora_scales = lora_scales
|
self.lora_scales = lora_scales
|
||||||
|
self.controlnet_strength = controlnet_strength
|
||||||
|
|
||||||
def save(self, path: str, export_json_metadata: bool = False) -> None:
|
def save(self, path: str, export_json_metadata: bool = False) -> None:
|
||||||
file_path = Path(path)
|
file_path = Path(path)
|
||||||
@ -123,4 +125,5 @@ class GeneratedImage:
|
|||||||
'lora_paths': ', '.join(self.lora_paths) if self.lora_paths else '',
|
'lora_paths': ', '.join(self.lora_paths) if self.lora_paths else '',
|
||||||
'lora_scales': ', '.join([f"{scale:.2f}" for scale in self.lora_scales]) if self.lora_scales else '',
|
'lora_scales': ', '.join([f"{scale:.2f}" for scale in self.lora_scales]) if self.lora_scales else '',
|
||||||
'prompt': self.prompt,
|
'prompt': self.prompt,
|
||||||
|
'controlnet_strength': "None" if self.controlnet_strength is None else f"{self.controlnet_strength:.2f}",
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,6 +3,7 @@ from PIL import Image
|
|||||||
import mlx.core as mx
|
import mlx.core as mx
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
|
||||||
|
from mflux.config.config import ConfigControlnet
|
||||||
from mflux.config.runtime_config import RuntimeConfig
|
from mflux.config.runtime_config import RuntimeConfig
|
||||||
from mflux.post_processing.image import GeneratedImage
|
from mflux.post_processing.image import GeneratedImage
|
||||||
|
|
||||||
@ -35,6 +36,7 @@ class ImageUtil:
|
|||||||
generation_time=generation_time,
|
generation_time=generation_time,
|
||||||
lora_paths=lora_paths,
|
lora_paths=lora_paths,
|
||||||
lora_scales=lora_scales,
|
lora_scales=lora_scales,
|
||||||
|
controlnet_strength=config.controlnet_strength if isinstance(config.config, ConfigControlnet) else None,
|
||||||
)
|
)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user