From 094757784e646a36875c3aedfe1ba30709848439 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <daniel.friesel@uos.de>
Date: Wed, 10 Mar 2021 14:24:26 +0100
Subject: hardcode arg_support_enabled = True
---
lib/functions.py | 3 +--
lib/loader/__init__.py | 4 +---
lib/loader/energytrace.py | 4 +---
lib/loader/mimosa.py | 4 +---
lib/utils.py | 1 -
5 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/lib/functions.py b/lib/functions.py
index 4e0e8f7..7e4a999 100644
--- a/lib/functions.py
+++ b/lib/functions.py
@@ -12,7 +12,6 @@ import re
from scipy import optimize
from .utils import is_numeric
-arg_support_enabled = True
logger = logging.getLogger(__name__)
@@ -761,7 +760,7 @@ class analytic:
buf += " + regression_arg({:d})".format(arg_idx)
arg_idx += 1
for function_item in combination:
- if arg_support_enabled and is_numeric(function_item[0]):
+ if is_numeric(function_item[0]):
buf += " * {}".format(
analytic._fmap(
"function_arg", function_item[0], function_item[1]["best"]
diff --git a/lib/loader/__init__.py b/lib/loader/__init__.py
index 8ffed03..f0e176d 100644
--- a/lib/loader/__init__.py
+++ b/lib/loader/__init__.py
@@ -24,8 +24,6 @@ from .mimosa import MIMOSA
logger = logging.getLogger(__name__)
-arg_support_enabled = True
-
def _preprocess_mimosa(measurement):
setup = measurement["setup"]
@@ -169,7 +167,7 @@ class TimingData:
paramvalues.append(
soft_cast_int(log_entry["parameter"][paramkey])
)
- if arg_support_enabled and "args" in log_entry:
+ if "args" in log_entry:
paramvalues.extend(map(soft_cast_int, log_entry["args"]))
log_entry["offline_aggregates"]["param"].append(paramvalues)
diff --git a/lib/loader/energytrace.py b/lib/loader/energytrace.py
index b62432c..8fc2d0e 100644
--- a/lib/loader/energytrace.py
+++ b/lib/loader/energytrace.py
@@ -18,8 +18,6 @@ try:
except ImportError:
zbar_available = False
-arg_support_enabled = True
-
def _load_energytrace(data_string):
"""
@@ -131,7 +129,7 @@ class EnergyTrace:
# NB: Unscheduled transitions do not have an 'args' field set.
# However, they should only be caused by interrupts, and
# interrupts don't have args anyways.
- if arg_support_enabled and "args" in online_trace_part:
+ if "args" in online_trace_part:
paramvalues.extend(map(soft_cast_int, online_trace_part["args"]))
if "offline_aggregates" not in online_trace_part:
diff --git a/lib/loader/mimosa.py b/lib/loader/mimosa.py
index 2893e30..48feb66 100644
--- a/lib/loader/mimosa.py
+++ b/lib/loader/mimosa.py
@@ -10,8 +10,6 @@ from dfatool.utils import soft_cast_int
logger = logging.getLogger(__name__)
-arg_support_enabled = True
-
class MIMOSA:
"""
@@ -557,7 +555,7 @@ class MIMOSA:
# NB: Unscheduled transitions do not have an 'args' field set.
# However, they should only be caused by interrupts, and
# interrupts don't have args anyways.
- if arg_support_enabled and "args" in online_trace_part:
+ if "args" in online_trace_part:
paramvalues.extend(map(soft_cast_int, online_trace_part["args"]))
# TODO rename offline_aggregates to make it clear that this is what ends up in by_name / by_param and model.py
diff --git a/lib/utils.py b/lib/utils.py
index d3334c9..e39b329 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -6,7 +6,6 @@ import re
import logging
from sklearn.metrics import r2_score
-arg_support_enabled = True
logger = logging.getLogger(__name__)
--
cgit v1.2.3