Skip to content

Compatibility: Fix NO_ARGS run #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndrewVu23 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Compatibility: Fix NO_ARGS run #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion util/job_launching/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def get_argfoldername(argpair: dict):
name = argpair.get("name", "")
if name != "":
return name
elif args == "":
elif args == "" or args is None:
return "NO_ARGS"
else:
foldername = re.sub(r"[^a-z^A-Z^0-9]", "_", str(args).strip())
Expand Down
20 changes: 11 additions & 9 deletions util/job_launching/run_simulations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,17 +376,19 @@ def _log_job(self, torque_out, benchmark, args, build_handle, kernel_name=None):
def find_benchmark_trace_dir(self, appargs_subdir):
"""Find the benchmark trace directory for the given appargs_subdir."""
benchmark_trace_dir = None
paths_to_try = (
[os.path.join(options.trace_dir, appargs_subdir, "traces")]
+ glob.glob(
os.path.join(
options.trace_dir, "**", "**", appargs_subdir, "traces"
subdirs = [appargs_subdir]
# 2.0.0/2.0.1 wrote empty-args runs to "None" instead of "NO_ARGS"
if os.path.basename(appargs_subdir) == "NO_ARGS":
subdirs.append(os.path.join(os.path.dirname(appargs_subdir), "None"))
paths_to_try = []
for subdir in subdirs:
paths_to_try += (
[os.path.join(options.trace_dir, subdir, "traces")]
+ glob.glob(
os.path.join(options.trace_dir, "**", "**", subdir, "traces")
)
+ glob.glob(os.path.join(options.trace_dir, "**", subdir, "traces"))
)
+ glob.glob(
os.path.join(options.trace_dir, "**", appargs_subdir, "traces")
)
)
for path in paths_to_try:
try:
benchmark_trace_dir = common.dir_option_test(
Expand Down
3 changes: 3 additions & 0 deletions util/plotting/plot-correlation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,9 @@ def find_hw_base_dirs(hw_dir):
# Construct appargs relative to the base_dir
rel_path = os.path.relpath(csv_dir, base_dir)
appargs = rel_path
# 2.0.0/2.0.1 wrote empty-args runs to "None" instead of "NO_ARGS"
if os.path.basename(appargs) == "None":
appargs = os.path.join(os.path.dirname(appargs), "NO_ARGS")
logger.log("Found CSVs in {0}, appargs={1}".format(csv_dir, appargs))
kdata = []
for csvf in csvs:
Expand Down