Merge branch 'main' of github.com:tanganke/fusion_bench

tanganke · Nov 1, 2024 · a7a33af · a7a33af
2 parents b7fb0a7 + bd62831
commit a7a33af
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/fusion_bench/method/adamerging/task_wise_adamerging.py b/fusion_bench/method/adamerging/task_wise_adamerging.py
@@ -5,6 +5,7 @@
 import lightning as L
 import numpy as np
 import torch
+import torch.nn as nn
 from omegaconf import DictConfig
 from torch import Tensor
 from torch.utils.data import DataLoader

diff --git a/fusion_bench/taskpool/clip_vision/taskpool.py b/fusion_bench/taskpool/clip_vision/taskpool.py
@@ -288,17 +288,18 @@ def evaluate(self, model: Union[CLIPVisionModel, CLIPVisionTransformer]):
             self.on_task_evaluation_end()
 
         # calculate the average accuracy and loss
-        report["average"] = {}
-        accuracies = [
-            value["accuracy"] for key, value in report.items() if "accuracy" in value
-        ]
-        if len(accuracies) > 0:
-            average_accuracy = sum(accuracies) / len(accuracies)
-            report["accuracy"] = average_accuracy
-        losses = [value["loss"] for key, value in report.items() if "loss" in value]
-        if len(losses) > 0:
-            average_loss = sum(losses) / len(losses)
-            report["loss"] = average_loss
+        if "average" not in report:
+            report["average"] = {}
+            accuracies = [
+                value["accuracy"] for key, value in report.items() if "accuracy" in value
+            ]
+            if len(accuracies) > 0:
+                average_accuracy = sum(accuracies) / len(accuracies)
+                report["average"]["accuracy"] = average_accuracy
+            losses = [value["loss"] for key, value in report.items() if "loss" in value]
+            if len(losses) > 0:
+                average_loss = sum(losses) / len(losses)
+                report["average"]["loss"] = average_loss
 
         log.info(f"Evaluation Result: {report}")
         if self.fabric.is_global_zero and len(self.fabric._loggers) > 0: