Merge branch 'release-0.4' into GH-232-multi-dataset

flairNLP · Nov 22, 2018 · ffa18f8 · ffa18f8
2 parents 4f96903 + d119332
commit ffa18f8
Show file tree

Hide file tree

Showing 12 changed files with 148 additions and 660 deletions.
diff --git a/flair/models/sequence_tagger_model.py b/flair/models/sequence_tagger_model.py
@@ -194,11 +194,6 @@ def load_from_file(cls, model_file):
             model = model.cuda()
         return model
 
-    def evaluation_metric(self) -> flair.nn.EvaluationMetric:
-        if self.tag_type in ['pos', 'upos']:
-            return flair.nn.EvaluationMetric.ACCURACY
-        return flair.nn.EvaluationMetric.F1_SCORE
-
     def forward_loss(self, sentences: Union[List[Sentence], Sentence]) -> torch.tensor:
         features, lengths, tags = self.forward(sentences)
         return self._calculate_loss(features, lengths, tags)

diff --git a/flair/models/text_classification_model.py b/flair/models/text_classification_model.py
@@ -105,9 +105,6 @@ def load_from_file(cls, model_file):
         model.eval()
         return model
 
-    def evaluation_metric(self) -> flair.nn.EvaluationMetric:
-        return flair.nn.EvaluationMetric.F1_SCORE
-
     def forward_loss(self, sentences: Union[List[Sentence], Sentence]) -> torch.tensor:
         scores = self.forward(sentences)
         return self._calculate_loss(scores, sentences)

diff --git a/flair/nn.py b/flair/nn.py
@@ -27,11 +27,6 @@ def predict(self, sentences: Union[List[Sentence], Sentence], mini_batch_size=32
         sentences."""
         pass
 
-    @abstractmethod
-    def evaluation_metric(self) -> EvaluationMetric:
-        """Should return a evaluation metric."""
-        pass
-
 
 class LockedDropout(torch.nn.Module):
     """

diff --git a/flair/trainers/__init__.py b/flair/trainers/__init__.py
@@ -1,3 +1 @@
-from .sequence_tagger_trainer import SequenceTaggerTrainer
-from .text_classification_trainer import TextClassifierTrainer
 from .trainer import ModelTrainer
diff --git a/flair/trainers/sequence_tagger_trainer.py b/flair/trainers/sequence_tagger_trainer.py