Skip to content

Commit 80b82f1

Browse files
isamu-isozakirlouf
authored andcommitted
Exllamav2_filter
Fix comment Fixed precommit issues Removed text Basic draft done Passed local test Fixed tests+precommit Revert change for pyairports Fixed precommit Wrap up Remove | for union Attempt changing to List Fixed for 3.8 Adding exllamav2 to optional dependency Fixed model Changed to fork Fix format Changed order Skip exllamav2 tests Attempt fixing coverage Attempt fix coverage Remove flash-attn requirement Fixed fixture tests Removed lora Passed coverage Added back transformers install Fixed per review Made coverage 100%
1 parent 4bf1470 commit 80b82f1

File tree

8 files changed

+641
-193
lines changed

8 files changed

+641
-193
lines changed

outlines/generate/fsm.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44

55
from outlines.fsm.guide import RegexGuide
66
from outlines.generate.api import (
7-
SequenceGenerator,
87
SequenceGeneratorAdapter,
98
VisionSequenceGeneratorAdapter,
109
)
11-
from outlines.models import ExLlamaV2Model, TransformersVision
10+
from outlines.models import TransformersVision
1211
from outlines.samplers import Sampler, multinomial
1312

1413

@@ -30,13 +29,3 @@ def fsm_vision(model, fsm: interegular.fsm.FSM, sampler: Sampler = multinomial()
3029
guide = RegexGuide.from_interegular_fsm(fsm, model.tokenizer)
3130
logits_processor = GuideLogitsProcessor(tokenizer=model.tokenizer, guide=guide)
3231
return VisionSequenceGeneratorAdapter(model, logits_processor, sampler)
33-
34-
35-
@fsm.register(ExLlamaV2Model)
36-
def fsm_exllamav2(
37-
model, fsm: interegular.fsm.FSM, sampler: Sampler = multinomial()
38-
) -> SequenceGenerator:
39-
fsm = RegexGuide.from_interegular_fsm(fsm, model.tokenizer)
40-
device = model.device
41-
generator = SequenceGenerator(fsm, model, sampler, device)
42-
return generator

outlines/generate/regex.py

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
from functools import singledispatch
22

3-
from outlines.fsm.guide import RegexGuide
43
from outlines.generate.api import (
5-
SequenceGenerator,
64
SequenceGeneratorAdapter,
75
VisionSequenceGeneratorAdapter,
86
)
9-
from outlines.models import ExLlamaV2Model, OpenAI, TransformersVision
7+
from outlines.models import OpenAI, TransformersVision
108
from outlines.samplers import Sampler, multinomial
119

1210

@@ -49,20 +47,6 @@ def regex_vision(
4947
return VisionSequenceGeneratorAdapter(model, logits_processor, sampler)
5048

5149

52-
@regex.register(ExLlamaV2Model)
53-
def regex_exllamav2(
54-
model,
55-
regex_str: str,
56-
sampler: Sampler = multinomial(),
57-
) -> SequenceGenerator:
58-
fsm = RegexGuide(regex_str, model.tokenizer)
59-
60-
device = model.device
61-
generator = SequenceGenerator(fsm, model, sampler, device)
62-
63-
return generator
64-
65-
6650
@regex.register(OpenAI)
6751
def regex_openai(
6852
model: OpenAI,

outlines/generate/text.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
from functools import singledispatch
22

3-
from outlines.fsm.guide import StopAtEOSGuide
43
from outlines.generate.api import (
5-
SequenceGenerator,
64
SequenceGeneratorAdapter,
75
VisionSequenceGeneratorAdapter,
86
)
9-
from outlines.models import ExLlamaV2Model, OpenAI, TransformersVision
7+
from outlines.models import OpenAI, TransformersVision
108
from outlines.samplers import Sampler, multinomial
119

1210

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

3836

39-
@text.register(ExLlamaV2Model)
40-
def text_exllamav2(model, sampler: Sampler = multinomial()) -> SequenceGenerator:
41-
fsm = StopAtEOSGuide(model.tokenizer)
42-
device = model.device
43-
return SequenceGenerator(fsm, model, sampler, device)
44-
45-
4637
@text.register(TransformersVision)
4738
def text_vision(model, sampler: Sampler = multinomial()):
4839
return VisionSequenceGeneratorAdapter(model, None, sampler)

0 commit comments

Comments
 (0)