Skip to content
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

Jump to bottom

Fixed Speculative Generator #75

Merged
merged 1 commit into from
Sep 30, 2023
Merged

Fixed Speculative Generator #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions exllamav2/generator/speculative.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def generate_simple(self, prompt: str, gen_settings: ExLlamaV2Sampler.Settings,

logits = self.draft_model.forward(predict_ids[:, -1:], self.draft_cache).float().cpu()
past = torch.cat((self.sequence_ids[:, :-1], predict_ids), dim = 1)
token, prob = ExLlamaV2Sampler.sample(logits, draft_settings, past, randoms[i])
token, prob, _ = ExLlamaV2Sampler.sample(logits, draft_settings, past, randoms[i], self.tokenizer)
predict_ids = torch.cat([predict_ids, token], dim = 1)
used_predict_len += 1
if prob < self.prob_threshold: break
Expand All @@ -91,7 +91,7 @@ def generate_simple(self, prompt: str, gen_settings: ExLlamaV2Sampler.Settings,
tokens = 0
while True:

token, _ = ExLlamaV2Sampler.sample(logits[:, tokens : tokens + 1, :], gen_settings, self.sequence_ids, randoms[tokens])
token, _, _ = ExLlamaV2Sampler.sample(logits[:, tokens : tokens + 1, :], gen_settings, self.sequence_ids, randoms[tokens], self.tokenizer)
self.sequence_ids = torch.cat([self.sequence_ids, token], dim = 1)
tokens += 1
if tokens == used_predict_len or token != predict_ids[:, tokens]: break
Expand All @@ -101,7 +101,7 @@ def generate_simple(self, prompt: str, gen_settings: ExLlamaV2Sampler.Settings,

if tokens == used_predict_len and token == predict_ids[:, tokens]:

token, _ = ExLlamaV2Sampler.sample(logits[:, tokens : tokens + 1, :], gen_settings, self.sequence_ids, randoms[tokens])
token, _, _ = ExLlamaV2Sampler.sample(logits[:, tokens : tokens + 1, :], gen_settings, self.sequence_ids, randoms[tokens], self.tokenizer)
self.sequence_ids = torch.cat([self.sequence_ids, token], dim = 1)
tokens += 1
self.draft_model.forward(self.sequence_ids[:, -1:], self.draft_cache, preprocess_only = True)
Expand Down