Skip to content

Avoid importing tensorflow when importing evaluate #135

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

Merged
lvwerra merged 5 commits into from
Jul 18, 2022
Merged

Avoid importing tensorflow when importing evaluate #135

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77ef609
avoid loading TFPreTrainedModel to check model's type
NouamaneTazi Jun 12, 2022
38174b0
fix compute() for user-defined models
NouamaneTazi Jun 13, 2022
d6954f0
avoid importing `transformers.TFPreTrainedModel` unless necessary
NouamaneTazi Jun 30, 2022
14af63c
Merge remote-tracking branch 'origin/main' into pr/NouamaneTazi/135
NouamaneTazi Jul 15, 2022
4720a26
remove unused imports and small refactor
NouamaneTazi Jul 15, 2022
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
29 changes: 12 additions & 17 deletions src/evaluate/evaluator/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,8 @@
SCIPY_AVAILABLE = False

try:
from transformers import (
FeatureExtractionMixin,
Pipeline,
PreTrainedModel,
PreTrainedTokenizer,
PreTrainedTokenizerBase,
TFPreTrainedModel,
pipeline,
)
import transformers
from transformers import FeatureExtractionMixin, pipeline

TRANSFORMERS_AVAILABLE = True
except ImportError:
Expand Down Expand Up @@ -121,10 +114,12 @@ def predictions_processor(self, *args, **kwargs):

def compute(
self,
model_or_pipeline: Union[str, "Pipeline", Callable, "PreTrainedModel", "TFPreTrainedModel"] = None,
model_or_pipeline: Union[
str, "Pipeline", Callable, "PreTrainedModel", "TFPreTrainedModel" # noqa: F821
] = None,
data: Union[str, Dataset] = None,
metric: Union[str, EvaluationModule] = None,
tokenizer: Optional[Union[str, "PreTrainedTokenizer"]] = None,
tokenizer: Optional[Union[str, "PreTrainedTokenizer"]] = None, # noqa: F821
feature_extractor: Optional[Union[str, "FeatureExtractionMixin"]] = None,
strategy: Literal["simple", "bootstrap"] = "simple",
confidence_level: float = 0.95,
Expand Down Expand Up @@ -198,9 +193,9 @@ def prepare_data(self, data: Union[str, Dataset], input_column: str, label_colum

def prepare_pipeline(
self,
model_or_pipeline: Union[str, "Pipeline", Callable, "PreTrainedModel", "TFPreTrainedModel"],
tokenizer: Union["PreTrainedTokenizerBase", "FeatureExtractionMixin"] = None,
feature_extractor: Union["PreTrainedTokenizerBase", "FeatureExtractionMixin"] = None,
model_or_pipeline: Union[str, "Pipeline", Callable, "PreTrainedModel", "TFPreTrainedModel"], # noqa: F821
tokenizer: Union["PreTrainedTokenizerBase", "FeatureExtractionMixin"] = None, # noqa: F821
feature_extractor: Union["PreTrainedTokenizerBase", "FeatureExtractionMixin"] = None, # noqa: F821
):
"""
Prepare pipeline.
Expand All @@ -220,9 +215,9 @@ def prepare_pipeline(
The initialized pipeline.
"""
if (
isinstance(model_or_pipeline, PreTrainedModel)
or isinstance(model_or_pipeline, TFPreTrainedModel)
or isinstance(model_or_pipeline, str)
isinstance(model_or_pipeline, str)
or isinstance(model_or_pipeline, transformers.PreTrainedModel)
or isinstance(model_or_pipeline, transformers.TFPreTrainedModel)
):
pipe = pipeline(
self.task, model=model_or_pipeline, tokenizer=tokenizer, feature_extractor=feature_extractor
Expand Down