Skip to content

WIP: add back better_transformer without version check #641

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
wirthual wants to merge 8 commits into
base: main
Choose a base branch
from
Open

WIP: add back better_transformer without version check #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d79a90c
add better_transformer clone
wirthual Aug 29, 2025
732cebc
lock latest version
wirthual Sep 5, 2025
98b2bb3
change model suport for newer colpali engine
wirthual Sep 5, 2025
1903e9c
ignore type check for kwargs cases
wirthual Sep 5, 2025
caf378c
Merge branch 'main' into better_transformer_clone
michaelfeil Sep 5, 2025
30fb7e2
Merge branch 'main' into better_transformer_clone
wirthual Oct 30, 2025
ec63333
add bettertransformer from pypi
wirthual Nov 14, 2025
30c14a7
update version of better_transformer
wirthual Nov 14, 2025
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
2 changes: 1 addition & 1 deletion libs/infinity_emb/infinity_emb/transformer/acceleration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from infinity_emb.primitives import Device

if CHECK_OPTIMUM.is_available:
Copy link
Contributor

@greptile-apps greptile-apps bot Aug 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: CHECK_OPTIMUM.is_available may not correctly detect the new better_transformer package since it checks for 'optimum' module availability.

from optimum.bettertransformer import ( # type: ignore[import-untyped]
from better_transformer import ( # type: ignore[import-untyped]
BetterTransformer,
BetterTransformerManager,
)
Expand Down
2 changes: 1 addition & 1 deletion libs/infinity_emb/infinity_emb/transformer/classifier/optimum.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def __init__(self, *, engine_args: EngineArgs):
def encode_pre(self, sentences: list[str]):
return sentences

def encode_core(self, sentences: list[str]) -> dict:
def encode_core(self, sentences: list[str]) -> list[dict]:
outputs = self._pipe(sentences)
return outputs

Expand Down
2 changes: 1 addition & 1 deletion libs/infinity_emb/infinity_emb/transformer/classifier/torch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def __init__(

if engine_args.compile:
logger.info("using torch.compile(dynamic=True)")
self._pipe.model = torch.compile(self._pipe.model, dynamic=True)
self._pipe.model = torch.compile(self._pipe.model, dynamic=True) #type:ignore

self._infinity_tokenizer = AutoTokenizer.from_pretrained(
engine_args.model_name_or_path,
Expand Down
12 changes: 6 additions & 6 deletions libs/infinity_emb/infinity_emb/transformer/vision/torch_vision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def __init__(self, *, engine_args: "EngineArgs"):
revision=engine_args.revision,
trust_remote_code=engine_args.trust_remote_code,
)
config = AutoConfig.from_pretrained(**base_config)
config = AutoConfig.from_pretrained(**base_config) #type: ignore
self.is_colipali = config.architectures[0] in IMAGE_COL_MODELS
self.mock_image = Image.new("RGB", (128, 128), color="black")

Expand All @@ -60,8 +60,8 @@ def __init__(self, *, engine_args: "EngineArgs"):
if self.is_colipali:
CHECK_COLPALI_ENGINE.mark_required()
from colpali_engine.models import ( # type: ignore
ColIdefics2,
ColIdefics2Processor,
ColIdefics3,
ColIdefics3Processor,
ColPali,
ColPaliProcessor,
ColQwen2,
Expand All @@ -75,13 +75,13 @@ def __init__(self, *, engine_args: "EngineArgs"):
"ColPali": ColPali,
"ColQwen2": ColQwen2,
# "ColQwen2_5": ColQwen2_5,
"ColIdefics2": ColIdefics2,
"ColIdefics3": ColIdefics3,
}[config.architectures[0]]
processor_cls = {
"ColPali": ColPaliProcessor,
"ColQwen2": ColQwen2Processor,
# "ColQwen2_5": ColQwen2_5_Processor,
"ColIdefics2": ColIdefics2Processor,
"ColIdefics3": ColIdefics3Processor,
}[config.architectures[0]]

self.model = model_cls.from_pretrained(
Expand All @@ -93,7 +93,7 @@ def __init__(self, *, engine_args: "EngineArgs"):
)
else:
self.model = AutoModel.from_pretrained(
**extra_model_args
**extra_model_args #type:ignore
# attn_implementation="eager" if engine_args.bettertransformer else None,
)

Expand Down
Loading