From 2719c0c74fa1cba0601ba23bd074df54c8a77511 Mon Sep 17 00:00:00 2001 From: Simon Schwitanski <schwitanski@itc.rwth-aachen.de> Date: Tue, 6 Aug 2024 10:53:05 +0200 Subject: [PATCH] Rename MBIutils imports to MBButils --- MBB.py | 6 +++--- scripts/LaTeXutils.py | 2 +- scripts/tools/aislinn.py | 2 +- scripts/tools/civl.py | 2 +- scripts/tools/hermes.py | 2 +- scripts/tools/isp.py | 2 +- scripts/tools/itac.py | 2 +- scripts/tools/mpi_checker.py | 2 +- scripts/tools/mpisv.py | 2 +- scripts/tools/must.py | 2 +- scripts/tools/parcoach.py | 2 +- scripts/tools/simgrid.py | 2 +- scripts/tools/smpi.py | 2 +- scripts/tools/smpivg.py | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/MBB.py b/MBB.py index 705c4d6d6..f60ba9342 100755 --- a/MBB.py +++ b/MBB.py @@ -23,14 +23,14 @@ import matplotlib as mpl import matplotlib.pyplot as plt import matplotlib.patches as mpatches -from scripts.MBIutils import categorize +from scripts.MBButils import categorize mpl.rcParams['hatch.linewidth'] = 4.5 # hatch linewidth # Add our lib directory to the PYTHONPATH, and load our utilitary libraries sys.path.append(f'{os.path.dirname(os.path.abspath(__file__))}/scripts') -from MBIutils import * +from MBButils import * from LaTeXutils import * # Plots need big dependancy like numpy and matplotlib, so just ignore @@ -147,7 +147,7 @@ def cmd_gencodes(level): subprocess.run(f'tar -xf real_world_data.csv.tar.gz', shell=True, check=True) dir = "scripts/" os.chdir(dir) - subprocess.run(f'PYTHONPATH=../ python3 main.py --generator_dir errors --level {level} --real_world_data ../output.csv', shell=True, check=True) + subprocess.run(f'PYTHONPATH=../ python3 main.py --generator_dir errors --level {level} --real_world_data ../output.csv --remove_previous_generation_results', shell=True, check=True) else: raise Exception("Cannot find the generators. Please report that bug.") os.chdir(here) diff --git a/scripts/LaTeXutils.py b/scripts/LaTeXutils.py index 1715461ad..65a3d64c6 100644 --- a/scripts/LaTeXutils.py +++ b/scripts/LaTeXutils.py @@ -1,7 +1,7 @@ # Copyright 2022. The MBI project. All rights reserved. # This program is free software; you can redistribute it and/or modify it under the terms of the license (GNU GPL). -from MBIutils import * +from MBButils import * possible_features=['P2P!basic', 'P2P!nonblocking', 'P2P!persistent', 'COLL!basic', 'COLL!nonblocking', 'COLL!persistent', 'COLL!tools', 'RMA'] possible_characterization=["Lacking", "Yes"] diff --git a/scripts/tools/aislinn.py b/scripts/tools/aislinn.py index ae76700a8..7b0e7c7ef 100644 --- a/scripts/tools/aislinn.py +++ b/scripts/tools/aislinn.py @@ -1,7 +1,7 @@ import re import os import sys -from MBIutils import * +from MBButils import * class Tool(AbstractTool): def identify(self): diff --git a/scripts/tools/civl.py b/scripts/tools/civl.py index 8491ebb86..cd62e7d25 100644 --- a/scripts/tools/civl.py +++ b/scripts/tools/civl.py @@ -1,6 +1,6 @@ import re import os -from MBIutils import * +from MBButils import * class Tool(AbstractTool): def identify(self): diff --git a/scripts/tools/hermes.py b/scripts/tools/hermes.py index 9e08a0996..e86b8295b 100644 --- a/scripts/tools/hermes.py +++ b/scripts/tools/hermes.py @@ -3,7 +3,7 @@ import os import sys import tempfile import shutil -from MBIutils import * +from MBButils import * class Tool(AbstractTool): def identify(self): diff --git a/scripts/tools/isp.py b/scripts/tools/isp.py index 0025c18c9..5d10d7e81 100644 --- a/scripts/tools/isp.py +++ b/scripts/tools/isp.py @@ -1,6 +1,6 @@ import re import os -from MBIutils import * +from MBButils import * class Tool(AbstractTool): def identify(self): diff --git a/scripts/tools/itac.py b/scripts/tools/itac.py index 9ad631581..58a14b25d 100644 --- a/scripts/tools/itac.py +++ b/scripts/tools/itac.py @@ -2,7 +2,7 @@ import re import os import distutils.spawn -from MBIutils import * +from MBButils import * class Tool(AbstractTool): diff --git a/scripts/tools/mpi_checker.py b/scripts/tools/mpi_checker.py index a6fbb4207..8fee7622f 100644 --- a/scripts/tools/mpi_checker.py +++ b/scripts/tools/mpi_checker.py @@ -1,6 +1,6 @@ import re import os -from MBIutils import * +from MBButils import * class Tool(AbstractTool): def identify(self): diff --git a/scripts/tools/mpisv.py b/scripts/tools/mpisv.py index c00103e47..d8f795c24 100644 --- a/scripts/tools/mpisv.py +++ b/scripts/tools/mpisv.py @@ -1,7 +1,7 @@ import re import os import sys -from MBIutils import * +from MBButils import * class Tool(AbstractTool): def identify(self): diff --git a/scripts/tools/must.py b/scripts/tools/must.py index 3c6848f41..54d571528 100644 --- a/scripts/tools/must.py +++ b/scripts/tools/must.py @@ -3,7 +3,7 @@ import os import tempfile import shutil import json -from MBIutils import * +from MBButils import * def must_filter(line, process): diff --git a/scripts/tools/parcoach.py b/scripts/tools/parcoach.py index 0a1b1ec1c..a40049f7e 100644 --- a/scripts/tools/parcoach.py +++ b/scripts/tools/parcoach.py @@ -1,6 +1,6 @@ import re import os -from MBIutils import * +from MBButils import * class Tool(AbstractTool): def identify(self): diff --git a/scripts/tools/simgrid.py b/scripts/tools/simgrid.py index 3617407f3..87ddfe366 100644 --- a/scripts/tools/simgrid.py +++ b/scripts/tools/simgrid.py @@ -4,7 +4,7 @@ import re import os import tempfile -from MBIutils import * +from MBButils import * class Tool(AbstractTool): name_ext = "" diff --git a/scripts/tools/smpi.py b/scripts/tools/smpi.py index 794428891..5c26250ae 100644 --- a/scripts/tools/smpi.py +++ b/scripts/tools/smpi.py @@ -1,7 +1,7 @@ import re import os import tools.simgrid -from MBIutils import * +from MBButils import * class Tool(tools.simgrid.Tool): def identify(self): diff --git a/scripts/tools/smpivg.py b/scripts/tools/smpivg.py index 18064d764..d1b5c56a1 100644 --- a/scripts/tools/smpivg.py +++ b/scripts/tools/smpivg.py @@ -2,7 +2,7 @@ import re import os import tools.smpi import subprocess -from MBIutils import * +from MBButils import * class Tool(tools.smpi.Tool): def identify(self): -- GitLab