Merge e31f060 into 8f3cea9

conbench · Aug 14, 2021 · 96f1f85 · 96f1f85
2 parents 8f3cea9 + e31f060
commit 96f1f85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/conbench/machine_info.py b/conbench/machine_info.py
@@ -18,13 +18,6 @@ def _sysctl(stat):
     "memory_bytes",
 ]
 
-BYTES = [
-    "memory_bytes",
-    "cpu_l1d_cache_bytes",
-    "cpu_l1i_cache_bytes",
-    "cpu_l2_cache_bytes",
-    "cpu_l3_cache_bytes",
-]
 
 COMMANDS = {
     "kernel_name": ["uname", "-r"],
@@ -39,6 +32,7 @@ def _sysctl(stat):
     "memory_bytes": _sysctl("hw.memsize"),
 }
 
+
 LSCPU_MAPPING = {
     "cpu_frequency_max_hz": "CPU max MHz",
     "cpu_l1d_cache_bytes": "L1d cache",
@@ -121,8 +115,7 @@ def machine_info(host_name):
         except ValueError:
             info[key] = 0
 
-    for key in BYTES:
-        info[key] = _round_memory(int(info[key]))
+    info["memory_bytes"] = _round_memory(int(info["memory_bytes"]))
 
     for key in info:
         info[key] = str(info[key])

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="conbench",
-    version="1.4.0",
+    version="1.5.0",
     description="Continuous Benchmarking (CB) Framework",
     long_description=long_description,
     long_description_content_type="text/markdown",