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.

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

Exllamav2 Integration #1010

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open
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
13 changes: 1 addition & 12 deletions outlines/generate/fsm.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@

from outlines.fsm.guide import RegexGuide
from outlines.generate.api import (
SequenceGenerator,
SequenceGeneratorAdapter,
VisionSequenceGeneratorAdapter,
)
from outlines.models import ExLlamaV2Model, TransformersVision
from outlines.models import TransformersVision
from outlines.samplers import Sampler, multinomial


Expand All @@ -30,13 +29,3 @@ def fsm_vision(model, fsm: interegular.fsm.FSM, sampler: Sampler = multinomial()
fsm = RegexGuide.from_interegular_fsm(fsm, model.tokenizer)
logits_processor = FSMLogitsProcessor(tokenizer=model.tokenizer, fsm=fsm)
return VisionSequenceGeneratorAdapter(model, logits_processor, sampler)


@fsm.register(ExLlamaV2Model)
def fsm_exllamav2(
model, fsm: interegular.fsm.FSM, sampler: Sampler = multinomial()
) -> SequenceGenerator:
fsm = RegexGuide.from_interegular_fsm(fsm, model.tokenizer)
device = model.device
generator = SequenceGenerator(fsm, model, sampler, device)
return generator
18 changes: 1 addition & 17 deletions outlines/generate/regex.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
from functools import singledispatch

from outlines.fsm.guide import RegexGuide
from outlines.generate.api import (
SequenceGenerator,
SequenceGeneratorAdapter,
VisionSequenceGeneratorAdapter,
)
from outlines.models import ExLlamaV2Model, OpenAI, TransformersVision
from outlines.models import OpenAI, TransformersVision
from outlines.samplers import Sampler, multinomial


Expand Down Expand Up @@ -49,20 +47,6 @@ def regex_vision(
return VisionSequenceGeneratorAdapter(model, logits_processor, sampler)


@regex.register(ExLlamaV2Model)
def regex_exllamav2(
model,
regex_str: str,
sampler: Sampler = multinomial(),
) -> SequenceGenerator:
fsm = RegexGuide(regex_str, model.tokenizer)

device = model.device
generator = SequenceGenerator(fsm, model, sampler, device)

return generator


@regex.register(OpenAI)
def regex_openai(
model: OpenAI,
Expand Down
11 changes: 1 addition & 10 deletions outlines/generate/text.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
from functools import singledispatch

from outlines.fsm.guide import StopAtEOSGuide
from outlines.generate.api import (
SequenceGenerator,
SequenceGeneratorAdapter,
VisionSequenceGeneratorAdapter,
)
from outlines.models import ExLlamaV2Model, OpenAI, TransformersVision
from outlines.models import OpenAI, TransformersVision
from outlines.samplers import Sampler, multinomial


Expand Down Expand Up @@ -36,13 +34,6 @@ def text(model, sampler: Sampler = multinomial()) -> SequenceGeneratorAdapter:
return SequenceGeneratorAdapter(model, None, sampler)


@text.register(ExLlamaV2Model)
def text_exllamav2(model, sampler: Sampler = multinomial()) -> SequenceGenerator:
fsm = StopAtEOSGuide(model.tokenizer)
device = model.device
return SequenceGenerator(fsm, model, sampler, device)


@text.register(TransformersVision)
def text_vision(model, sampler: Sampler = multinomial()):
return VisionSequenceGeneratorAdapter(model, None, sampler)
Expand Down
Loading
Loading