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

Simplify embedding model support and loading #569

Merged
merged 2 commits into from
Jul 31, 2023
Merged

Simplify embedding model support and loading #569

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d285822
Simplify embedding model support and loading
joshdevins Jul 26, 2023
a5c5269
Cleanup formatting, force a rebuild
joshdevins Jul 26, 2023
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
39 changes: 19 additions & 20 deletions eland/ml/pytorch/transformers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,22 +294,19 @@ def __init__(self, model: PreTrainedModel, output_key: str = DEFAULT_OUTPUT_KEY)
def from_pretrained(
model_id: str, output_key: str = DEFAULT_OUTPUT_KEY
) -> Optional[Any]:
if model_id.startswith("sentence-transformers/"):
model = AutoModel.from_pretrained(model_id, torchscript=True)
if isinstance(
model.config,
(
transformers.MPNetConfig,
transformers.XLMRobertaConfig,
transformers.RobertaConfig,
transformers.BartConfig,
),
):
return _TwoParameterSentenceTransformerWrapper(model, output_key)
else:
return _SentenceTransformerWrapper(model, output_key)
model = AutoModel.from_pretrained(model_id, torchscript=True)
if isinstance(
model.config,
(
transformers.MPNetConfig,
transformers.XLMRobertaConfig,
transformers.RobertaConfig,
transformers.BartConfig,
),
):
return _TwoParameterSentenceTransformerWrapper(model, output_key)
else:
return None
return _SentenceTransformerWrapper(model, output_key)

def _remove_pooling_layer(self) -> None:
"""
Expand Down Expand Up @@ -790,12 +787,10 @@ def _create_traceable_model(self) -> TraceableModel:
return _TraceableTextClassificationModel(self._tokenizer, model)

elif self._task_type == "text_embedding":
model = _SentenceTransformerWrapperModule.from_pretrained(self._model_id)
if not model:
model = _DPREncoderWrapper.from_pretrained(self._model_id)
model = _DPREncoderWrapper.from_pretrained(self._model_id)
if not model:
model = transformers.AutoModel.from_pretrained(
self._model_id, torchscript=True
model = _SentenceTransformerWrapperModule.from_pretrained(
self._model_id
)
return _TraceableTextEmbeddingModel(self._tokenizer, model)

Expand All @@ -805,20 +800,24 @@ def _create_traceable_model(self) -> TraceableModel:
)
model = _DistilBertWrapper.try_wrapping(model)
return _TraceableZeroShotClassificationModel(self._tokenizer, model)

elif self._task_type == "question_answering":
model = _QuestionAnsweringWrapperModule.from_pretrained(self._model_id)
return _TraceableQuestionAnsweringModel(self._tokenizer, model)

elif self._task_type == "text_similarity":
model = transformers.AutoModelForSequenceClassification.from_pretrained(
self._model_id, torchscript=True
)
model = _DistilBertWrapper.try_wrapping(model)
return _TraceableTextSimilarityModel(self._tokenizer, model)

elif self._task_type == "pass_through":
model = transformers.AutoModel.from_pretrained(
self._model_id, torchscript=True
)
return _TraceablePassThroughModel(self._tokenizer, model)

else:
raise TypeError(
f"Unknown task type {self._task_type}, must be one of: {SUPPORTED_TASK_TYPES_NAMES}"
Expand Down