aboutsummaryrefslogtreecommitdiff
path: root/merge.py
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fl.fischer@fau.de>2020-07-13 17:17:20 +0200
committerFlorian Fischer <florian.fl.fischer@fau.de>2020-07-13 17:17:20 +0200
commit0825b2b53406bb4acf9d3857a1f846efa845877e (patch)
tree72b43dcaf0c3d7d0b9f7028553c2bf71f8a4b3df /merge.py
parent20eb9d1661c058476f80728b92956a76f035a27d (diff)
downloadallocbench-0825b2b53406bb4acf9d3857a1f846efa845877e.tar.gz
allocbench-0825b2b53406bb4acf9d3857a1f846efa845877e.zip
[refactoring] fix or ignore many pylint hints
* Add missing docstrings * Remove unused imports * fix line-to-long * fix some typos * ignore global-statement * ignore wrong-import-order for scripts under /scripts
Diffstat (limited to 'merge.py')
-rwxr-xr-xmerge.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/merge.py b/merge.py
index 185183f..51dd774 100755
--- a/merge.py
+++ b/merge.py
@@ -28,11 +28,16 @@ from allocbench.util import print_license_and_exit
def load_file(filename):
+ """Load a json file"""
with open(filename, "r") as json_file:
return json.load(json_file)
def main():
+ """Merge the two allocbench benchmark results
+
+ For each benchmark result included in both result directories all
+ missing allocators in the first results are copied from the second."""
if "--license" in sys.argv:
print_license_and_exit()