From b5e8804cd47ac2778741716911f3231501abea5e Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Sat, 30 Mar 2024 11:36:22 -0700 Subject: [PATCH] stdlib: Remove 'Vector' group subclass This was not used and easily confused with the other 'Vector' in PyStats. Change-Id: I9294bb0ae04db0537c87a5f50ce023fc83d587b8 --- src/python/m5/ext/pystats/group.py | 22 +--------------------- src/python/m5/ext/pystats/jsonloader.py | 5 +---- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/python/m5/ext/pystats/group.py b/src/python/m5/ext/pystats/group.py index bc292c9d0b..5b2e760b32 100644 --- a/src/python/m5/ext/pystats/group.py +++ b/src/python/m5/ext/pystats/group.py @@ -27,16 +27,12 @@ from typing import ( Dict, List, - Mapping, Optional, Union, ) from .abstract_stat import AbstractStat -from .statistic import ( - Scalar, - Statistic, -) +from .statistic import Statistic from .timeconversion import TimeConversion @@ -66,19 +62,3 @@ class Group(AbstractStat): for key, value in kwargs.items(): setattr(self, key, value) - - -class Vector(Group): - """ - The Vector class is used to store vector information. However, in gem5 - Vectors, in practise, hold information that is more like a dictionary of - Scalar Values. This class may change, and may be merged into Group in - accordance to decisions made in relation to - https://gem5.atlassian.net/browse/GEM5-867. - """ - - def __init__(self, scalar_map: Mapping[str, Scalar]): - super().__init__(type="Vector", time_conversion=None, **scalar_map) - - def _repr_name(self) -> str: - return "Vector" diff --git a/src/python/m5/ext/pystats/jsonloader.py b/src/python/m5/ext/pystats/jsonloader.py index dfd9da38de..6c0f07585f 100644 --- a/src/python/m5/ext/pystats/jsonloader.py +++ b/src/python/m5/ext/pystats/jsonloader.py @@ -31,10 +31,7 @@ from typing import ( Union, ) -from .group import ( - Group, - Vector, -) +from .group import Group from .simstat import SimStat from .statistic import ( Distribution,