GH-48: Update eval method.

flairNLP · Sep 28, 2018 · 6b225f1 · 6b225f1
1 parent 03258f3
commit 6b225f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/flair/models/language_model.py b/flair/models/language_model.py
@@ -66,8 +66,6 @@ def forward(self, input, hidden, ordered_sequence_lengths=None):
         encoded = self.encoder(input)
         emb = self.drop(encoded)
 
-        self.rnn.flatten_parameters()
-
         output, hidden = self.rnn(emb, hidden)
 
         if self.proj is not None:

diff --git a/flair/trainers/text_classification_trainer.py b/flair/trainers/text_classification_trainer.py
@@ -209,7 +209,7 @@ def evaluate(self, sentences: List[Sentence], eval_class_metrics: bool = False,
                    range(0, len(sentences), mini_batch_size)]
 
         y_pred = []
-        y_true = convert_labels_to_one_hot([sentence.get_label_names() for sentence in sentences], self.label_dict)
+        y_true = []
 
         for batch in batches:
             scores = self.model.forward(batch)
@@ -218,11 +218,13 @@ def evaluate(self, sentences: List[Sentence], eval_class_metrics: bool = False,
 
             eval_loss += loss
 
+            y_true.extend([sentence.get_label_names() for sentence in batch])
             y_pred.extend([[label.value for label in sent_labels] for sent_labels in labels])
 
             if not embeddings_in_memory:
                 clear_embeddings(batch)
 
+        y_true = convert_labels_to_one_hot(y_true, self.label_dict)
         y_pred = convert_labels_to_one_hot(y_pred, self.label_dict)
 
         metrics = [calculate_micro_avg_metric(y_true, y_pred, self.label_dict)]