Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions models/diffusion_networks.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,16 @@ def define_G(

elif G_netG == "vit_vid":
variant = getattr(opt, "G_vit_variant", "")
if variant and variant not in JiTVid_VARIANT_CONFIGS:
if variant.startswith("JiT-"):
alias = f"JiTVid-{variant[len('JiT-'):]}"
if alias in JiTVid_VARIANT_CONFIGS:
variant = alias
if variant not in JiTVid_VARIANT_CONFIGS:
raise ValueError(
f"Unknown G_vit_variant '{variant}'. "
f"Valid: {sorted(JiTVid_VARIANT_CONFIGS.keys())}"
)
base = JiTVid_VARIANT_CONFIGS.get(variant, {})
cfg = {
"depth": getattr(opt, "G_vit_depth", base.get("depth", 12)),
Expand Down
2 changes: 1 addition & 1 deletion options/common_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ def initialize(self, parser):
"--G_vit_variant",
type=str,
default="JiT-B/16",
help="Selects the ViT backbone when --G_netG vit",
help="Selects the ViT backbone when --G_netG vit (use JiT-*) or vit_vid (use JiTVid-*)",
)
parser.add_argument(
"--G_vit_disable_bottleneck",
Expand Down
2 changes: 1 addition & 1 deletion scripts/gen_single_image_diffusion.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def load_model(
if opt.model_type in ["cm", "cm_gan", "sc", "b2b"]:
opt.alg_palette_sampling_method = sampling_method
opt.alg_diffusion_cond_embed_dim = 256
model = diffusion_networks.define_G(**vars(opt))
model = diffusion_networks.define_G(opt=opt, **vars(opt))
model.eval()

# handle old models
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def load_model(
if opt.model_type in ["cm", "cm_gan", "b2b"]:
opt.alg_palette_sampling_method = sampling_method
opt.alg_diffusion_cond_embed_dim = 256
model = diffusion_networks.define_G(**vars(opt))
model = diffusion_networks.define_G(opt=opt, **vars(opt))
model.eval()

# handle old models
Expand Down
Loading