control top_k value

This commit is contained in:
Brett Kuprel 2022-07-05 17:23:05 -04:00
parent d64acb484c
commit 89a125b4b9
4 changed files with 13 additions and 6 deletions

8
cog.yaml vendored
View File

@ -1,13 +1,13 @@
build: build:
cuda: "11.5.1" cuda: "11.0"
gpu: true gpu: true
python_version: "3.10" python_version: "3.8"
system_packages: system_packages:
- "libgl1-mesa-glx" - "libgl1-mesa-glx"
- "libglib2.0-0" - "libglib2.0-0"
python_packages: python_packages:
- "min-dalle==0.2.27" - "min-dalle==0.2.28"
run: run:
- pip install torch==1.12.0+cu116 -f https://download.pytorch.org/whl/torch_stable.html - pip install torch==1.10.0+cu113 -f https://download.pytorch.org/whl/torch_stable.html
predict: "replicate_predictor.py:ReplicatePredictor" predict: "replicate_predictor.py:ReplicatePredictor"

View File

@ -165,6 +165,7 @@ class MinDalle:
seed: int, seed: int,
grid_size: int, grid_size: int,
log2_mid_count: int, log2_mid_count: int,
log2_k: int = 6,
log2_supercondition_factor: int = 3, log2_supercondition_factor: int = 3,
is_verbose: bool = False is_verbose: bool = False
) -> Iterator[Image.Image]: ) -> Iterator[Image.Image]:
@ -202,6 +203,7 @@ class MinDalle:
print('sampling row {} of {}'.format(row_index + 1, row_count)) print('sampling row {} of {}'.format(row_index + 1, row_count))
attention_state, image_tokens = self.decoder.decode_row( attention_state, image_tokens = self.decoder.decode_row(
row_index, row_index,
log2_k,
log2_supercondition_factor, log2_supercondition_factor,
encoder_state, encoder_state,
attention_mask, attention_mask,
@ -219,6 +221,7 @@ class MinDalle:
text: str, text: str,
seed: int = -1, seed: int = -1,
grid_size: int = 1, grid_size: int = 1,
log2_k: int = 6,
log2_supercondition_factor: int = 3, log2_supercondition_factor: int = 3,
is_verbose: bool = False is_verbose: bool = False
) -> Image.Image: ) -> Image.Image:
@ -228,6 +231,7 @@ class MinDalle:
seed, seed,
grid_size, grid_size,
log2_mid_count, log2_mid_count,
log2_k,
log2_supercondition_factor, log2_supercondition_factor,
is_verbose is_verbose
) )

View File

@ -140,6 +140,7 @@ class DalleBartDecoder(nn.Module):
def decode_step( def decode_step(
self, self,
log2_k: int,
log2_supercondition_factor: int, log2_supercondition_factor: int,
attention_mask: BoolTensor, attention_mask: BoolTensor,
encoder_state: FloatTensor, encoder_state: FloatTensor,
@ -170,7 +171,7 @@ class DalleBartDecoder(nn.Module):
logits[image_count:, -1] * a logits[image_count:, -1] * a
) )
top_logits, _ = logits.topk(50, dim=-1) top_logits, _ = logits.topk(2 ** log2_k, dim=-1)
probs = torch.where( probs = torch.where(
logits < top_logits[:, [-1]], logits < top_logits[:, [-1]],
self.zero_prob, self.zero_prob,
@ -182,6 +183,7 @@ class DalleBartDecoder(nn.Module):
def decode_row( def decode_row(
self, self,
row_index: int, row_index: int,
log2_k: int,
log2_supercondition_factor: int, log2_supercondition_factor: int,
encoder_state: FloatTensor, encoder_state: FloatTensor,
attention_mask: BoolTensor, attention_mask: BoolTensor,
@ -191,6 +193,7 @@ class DalleBartDecoder(nn.Module):
for col_index in range(16): for col_index in range(16):
i = 16 * row_index + col_index i = 16 * row_index + col_index
probs, attention_state = self.decode_step( probs, attention_state = self.decode_step(
log2_k = log2_k,
log2_supercondition_factor = log2_supercondition_factor, log2_supercondition_factor = log2_supercondition_factor,
attention_mask = attention_mask, attention_mask = attention_mask,
encoder_state = encoder_state, encoder_state = encoder_state,

View File

@ -5,7 +5,7 @@ setuptools.setup(
name='min-dalle', name='min-dalle',
description = 'min(DALL·E)', description = 'min(DALL·E)',
long_description=(Path(__file__).parent / "README.rst").read_text(), long_description=(Path(__file__).parent / "README.rst").read_text(),
version='0.2.27', version='0.2.28',
author='Brett Kuprel', author='Brett Kuprel',
author_email='brkuprel@gmail.com', author_email='brkuprel@gmail.com',
url='https://github.com/kuprel/min-dalle', url='https://github.com/kuprel/min-dalle',