Skip to content

Commit 1b7a746

Browse files
authored
Auto-format (#718)
1 parent 1ffa6dc commit 1b7a746

12 files changed

+167
-169
lines changed

model_analyzer/plots/simple_plot.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,8 @@ def plot_data_and_constraints(self, constraints):
143143

144144
for model_config_name, data in self._data.items():
145145
# Sort the data by x-axis
146-
x_data, y_data = (
147-
list(t)
148-
for t in zip(*sorted(zip(data['x_data'], data['y_data']))))
146+
x_data, y_data = (list(t) for t in zip(
147+
*sorted(zip(data['x_data'], data['y_data']))))
149148

150149
if self._monotonic:
151150
filtered_x, filtered_y = [x_data[0]], [y_data[0]]

model_analyzer/result/constraint_manager.py

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from model_analyzer.config.input.config_command_profile import ConfigCommandProfile
2525
from model_analyzer.config.input.config_command_report import ConfigCommandReport
2626

27+
2728
class ConstraintManager:
2829
"""
2930
Handles processing and applying
@@ -34,20 +35,21 @@ class ConstraintManager:
3435
config: ConfigCommandProfile or ConfigCommandReport
3536
"""
3637

37-
def __init__(self, config: Union[ConfigCommandProfile, ConfigCommandReport]) -> None:
38+
def __init__(
39+
self, config: Union[ConfigCommandProfile,
40+
ConfigCommandReport]) -> None:
3841
self._constraints = {}
3942

4043
if config:
4144
# Model constraints
4245
if "profile_models" in config.get_config():
4346
for model in config.profile_models:
44-
self._constraints[model.model_name()
45-
] = model.constraints()
47+
self._constraints[model.model_name()] = model.constraints()
4648

4749
# Global constraints
4850
if "constraints" in config.get_all_config():
49-
self._constraints[GLOBAL_CONSTRAINTS_KEY] = ModelConstraints(config.get_all_config()[
50-
"constraints"])
51+
self._constraints[GLOBAL_CONSTRAINTS_KEY] = ModelConstraints(
52+
config.get_all_config()["constraints"])
5153

5254
def get_constraints_for_all_models(self):
5355
"""
@@ -59,8 +61,8 @@ def get_constraints_for_all_models(self):
5961

6062
return self._constraints
6163

62-
def satisfies_constraints(self,
63-
run_config_measurement: 'RunConfigMeasurement') -> bool:
64+
def satisfies_constraints(
65+
self, run_config_measurement: 'RunConfigMeasurement') -> bool:
6466
"""
6567
Checks that the measurements, for every model, satisfy
6668
the provided list of constraints
@@ -77,18 +79,20 @@ def satisfies_constraints(self,
7779
"""
7880

7981
if self._constraints:
80-
for (model_name, model_metrics) in run_config_measurement.data().items():
82+
for (model_name,
83+
model_metrics) in run_config_measurement.data().items():
8184
for metric in model_metrics:
8285
if self._metric_matches_constraint(
8386
metric, self._constraints[model_name]):
8487
if self._get_failure_percentage(
85-
metric, self._constraints[model_name][metric.tag]) > 0:
88+
metric,
89+
self._constraints[model_name][metric.tag]) > 0:
8690
return False
8791

8892
return True
8993

90-
def constraint_failure_percentage(self,
91-
run_config_measurement: 'RunConfigMeasurement') -> float:
94+
def constraint_failure_percentage(
95+
self, run_config_measurement: 'RunConfigMeasurement') -> float:
9296
"""
9397
Additive percentage, for every measurement, in every model, of how much
9498
the RCM is failing the constraints by
@@ -100,7 +104,8 @@ def constraint_failure_percentage(self,
100104
failure_percentage: float = 0
101105

102106
if self._constraints:
103-
for (model_name, model_metrics) in run_config_measurement.data().items():
107+
for (model_name,
108+
model_metrics) in run_config_measurement.data().items():
104109
for metric in model_metrics:
105110
if self._metric_matches_constraint(
106111
metric, self._constraints[model_name]):
@@ -109,15 +114,15 @@ def constraint_failure_percentage(self,
109114

110115
return failure_percentage * 100
111116

112-
def _metric_matches_constraint(self,
113-
metric: Record, constraint: ModelConstraints) -> bool:
117+
def _metric_matches_constraint(self, metric: Record,
118+
constraint: ModelConstraints) -> bool:
114119
if constraint.has_metric(metric.tag):
115120
return True
116121
else:
117122
return False
118123

119-
def _get_failure_percentage(self, metric: Record, constraint: Dict[str,
120-
int]) -> float:
124+
def _get_failure_percentage(self, metric: Record,
125+
constraint: Dict[str, int]) -> float:
121126

122127
failure_percentage = 0
123128

model_analyzer/result/model_constraints.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self, constraints):
3030
self._constraints = {}
3131
if constraints:
3232
self._constraints = constraints
33-
33+
3434
def to_dict(self):
3535
"""
3636
Returns constraints dictionary
@@ -54,7 +54,7 @@ def has_metric(self, name):
5454
return True
5555
else:
5656
return False
57-
57+
5858
def __getitem__(self, name):
5959
"""
6060
To subscript constraints using metric name
@@ -70,8 +70,7 @@ def __getitem__(self, name):
7070
else:
7171
msg = f"'{name}' key not found in constraints"
7272
raise KeyError(msg)
73-
74-
73+
7574
def __bool__(self):
7675
"""
7776
To check if constraints are empty
@@ -80,7 +79,7 @@ def __bool__(self):
8079
return True
8180
else:
8281
return False
83-
82+
8483
def __eq__(self, other):
8584
"""
8685
To compare two ModelConstraints objects

model_analyzer/result/result_manager.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ def __init__(self, config: Union[ConfigCommandProfile, ConfigCommandReport],
6262
self._constraint_manager = constraint_manager
6363

6464
# Data structures for sorting results
65-
self._per_model_sorted_results: DefaultDict[str, SortedResults] = defaultdict(SortedResults)
65+
self._per_model_sorted_results: DefaultDict[
66+
str, SortedResults] = defaultdict(SortedResults)
6667
self._across_model_sorted_results: SortedResults = SortedResults()
6768

6869
if state_manager.starting_fresh_run():

model_analyzer/result/run_config_result.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def add_run_config_measurement(self, run_config_measurement):
110110
insort(self._measurements, run_config_measurement)
111111

112112
if self._constraint_manager.satisfies_constraints(
113-
run_config_measurement):
113+
run_config_measurement):
114114
insort(self._passing_measurements, run_config_measurement)
115115
else:
116116
insort(self._failing_measurements, run_config_measurement)

0 commit comments

Comments
 (0)