aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--allocbench/benchmarks/dj_trace.py2
-rw-r--r--allocbench/benchmarks/lld.py2
-rw-r--r--allocbench/benchmarks/rdtsc.py2
-rw-r--r--allocbench/globalvars.py8
-rw-r--r--allocbench/plots.py5
5 files changed, 10 insertions, 9 deletions
diff --git a/allocbench/benchmarks/dj_trace.py b/allocbench/benchmarks/dj_trace.py
index 80b81ff..da822d7 100644
--- a/allocbench/benchmarks/dj_trace.py
+++ b/allocbench/benchmarks/dj_trace.py
@@ -22,8 +22,8 @@ import numpy as np
from allocbench.artifact import ArchiveArtifact
from allocbench.benchmark import Benchmark
-from allocbench.globalvars import SUMMARY_FILE_EXT
import allocbench.plots as abplt
+from allocbench.plots import SUMMARY_FILE_EXT
COMMA_SEP_NUMBER_RE = "(?:\\d*(?:,\\d*)?)*"
RSS_RE = f"(?P<rss>{COMMA_SEP_NUMBER_RE})"
diff --git a/allocbench/benchmarks/lld.py b/allocbench/benchmarks/lld.py
index f1797dc..93cd36e 100644
--- a/allocbench/benchmarks/lld.py
+++ b/allocbench/benchmarks/lld.py
@@ -207,7 +207,7 @@ from allocbench.artifact import ArchiveArtifact
from allocbench.benchmark import Benchmark
import allocbench.facter as facter
import allocbench.plots
-from allocbench.globalvars import SUMMARY_FILE_EXT
+from allocbench.plots import SUMMARY_FILE_EXT
class BenchmarkLld(Benchmark):
diff --git a/allocbench/benchmarks/rdtsc.py b/allocbench/benchmarks/rdtsc.py
index 4414d49..7a870c7 100644
--- a/allocbench/benchmarks/rdtsc.py
+++ b/allocbench/benchmarks/rdtsc.py
@@ -26,8 +26,8 @@ import numpy as np
import matplotlib.pyplot as plt
from allocbench.benchmark import Benchmark
-from allocbench.globalvars import SUMMARY_FILE_EXT
import allocbench.plots
+from allocbench.plots import SUMMARY_FILE_EXT
class BenchmarkRdtsc(Benchmark):
diff --git a/allocbench/globalvars.py b/allocbench/globalvars.py
index f282b03..154a15b 100644
--- a/allocbench/globalvars.py
+++ b/allocbench/globalvars.py
@@ -23,10 +23,8 @@ BENCHMARKS: List of available benchmarks
from typing import Dict
-VERBOSITY = 0
-
-ALLOCATORS = {}
+from allocbench.allocator import Allocator
-SUMMARY_FILE_EXT = "svg"
+VERBOSITY = 0
-LATEX_CUSTOM_PREAMBLE = ""
+ALLOCATORS: Dict[str, Allocator] = {}
diff --git a/allocbench/plots.py b/allocbench/plots.py
index f172355..c93c42e 100644
--- a/allocbench/plots.py
+++ b/allocbench/plots.py
@@ -31,12 +31,15 @@ import numpy as np
import scipy.stats
import allocbench.facter as facter
-from allocbench.globalvars import SUMMARY_FILE_EXT, LATEX_CUSTOM_PREAMBLE
from allocbench.util import print_debug, print_warn
# This is useful when evaluating strings in the plot functions. str(np.NaN) == "nan"
nan = np.NaN # pylint: disable=invalid-name
+SUMMARY_FILE_EXT = "svg"
+
+LATEX_CUSTOM_PREAMBLE = ""
+
DEFAULT_PLOT_OPTIONS = {
'plot': {
'marker': '.',