Clean validator (#144)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
This commit is contained in:
Laughing
2023-01-05 21:14:01 +08:00
committed by GitHub
parent 46cb657b64
commit 19334ebb16
9 changed files with 88 additions and 74 deletions

View File

@ -4,10 +4,15 @@ import torch
from ultralytics.yolo.data import build_classification_dataloader
from ultralytics.yolo.engine.validator import BaseValidator
from ultralytics.yolo.utils import DEFAULT_CONFIG
from ultralytics.yolo.utils.metrics import ClassifyMetrics
class ClassificationValidator(BaseValidator):
def __init__(self, dataloader=None, save_dir=None, pbar=None, logger=None, args=None):
super().__init__(dataloader, save_dir, pbar, logger, args)
self.metrics = ClassifyMetrics()
def init_metrics(self, model):
self.correct = torch.tensor([], device=next(model.parameters()).device)
@ -23,17 +28,12 @@ class ClassificationValidator(BaseValidator):
self.correct = torch.cat((self.correct, correct_in_batch))
def get_stats(self):
acc = torch.stack((self.correct[:, 0], self.correct.max(1).values), dim=1) # (top1, top5) accuracy
top1, top5 = acc.mean(0).tolist()
return {"top1": top1, "top5": top5, "fitness": top5}
self.metrics.process(self.correct)
return self.metrics.results_dict
def get_dataloader(self, dataset_path, batch_size):
return build_classification_dataloader(path=dataset_path, imgsz=self.args.imgsz, batch_size=batch_size)
@property
def metric_keys(self):
return ["top1", "top5"]
@hydra.main(version_base=None, config_path=str(DEFAULT_CONFIG.parent), config_name=DEFAULT_CONFIG.name)
def val(cfg):