Skip to content

Potential fix for #180 #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Madrawn wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Potential fix for #180 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bb6ba7
opt_batch times 2 so assert doesn't fail
Dec 1, 2023
51c20f5
plug the unused text_minlen parameter
Dec 1, 2023
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
8 changes: 6 additions & 2 deletions models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ def get_batch_dim(self, min_batch, opt_batch, max_batch, static_batch):
return (opt_batch, opt_batch, opt_batch)
elif self.text_maxlen > 77 and not static_batch:
if self.text_optlen > 77:
return (min_batch, opt_batch, max_batch * 2)
return (min_batch, opt_batch * 2, max_batch * 2)
return (min_batch, opt_batch * 2, max_batch * 2)
else:
raise Exception("Uncovered case in get_batch_dim")
Expand Down Expand Up @@ -810,6 +810,7 @@ def __init__(
verbose=True,
fp16=False,
max_batch_size=16,
text_minlen=77,
text_maxlen=77,
text_optlen=77,
unet_dim=4,
Expand All @@ -828,6 +829,7 @@ def __init__(
)
self.unet_dim = unet_dim
self.controlnet = controlnet
self.text_minlen = text_minlen
self.text_optlen = text_optlen

def get_input_names(self):
Expand Down Expand Up @@ -896,7 +898,7 @@ def get_input_profile(
],
"timesteps": [(min_batch,), (opt_batch,), (max_batch,)],
"encoder_hidden_states": [
(min_batch, self.text_optlen, self.embedding_dim),
(min_batch, self.text_minlen, self.embedding_dim),
(opt_batch, self.text_optlen, self.embedding_dim),
(max_batch, self.text_maxlen, self.embedding_dim),
],
Expand Down Expand Up @@ -1034,6 +1036,7 @@ def make_OAIUNet(
device,
verbose,
max_batch_size,
text_minlen,
text_optlen,
text_maxlen,
controlnet=None,
Expand All @@ -1045,6 +1048,7 @@ def make_OAIUNet(
device=device,
verbose=verbose,
max_batch_size=max_batch_size,
text_minlen=text_minlen,
text_optlen=text_optlen,
text_maxlen=text_maxlen,
unet_dim=(9 if pipeline.is_inpaint() else 4),
Expand Down
1 change: 1 addition & 0 deletions ui_trt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ def export_unet_to_trt(
"cuda",
False,
batch_max,
min_textlen,
opt_textlen,
max_textlen,
controlnet,
Expand Down