Skip to content

Use normpath and improve override argument parsing in madengine discover #7

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

Merged
gargrahul merged 5 commits into from
Jun 19, 2025
Merged

Use normpath and improve override argument parsing in madengine discover #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e3c3f5
use normpath
Rohan138 Jun 17, 2025
2fb9a70
parse with -- and =
Rohan138 Jun 17, 2025
0c5e334
Update test to match -- and =
Rohan138 Jun 17, 2025
17f0afc
fix dummy3 symlinks
Rohan138 Jun 19, 2025
99a49f7
Merge branch 'main' into use_normpath
gargrahul Jun 19, 2025
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
13 changes: 7 additions & 6 deletions src/madengine/tools/discover_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ def discover_models(self) -> None:
# Update model name using backslash-separated path
model_dict["name"] = dirname + '/' + model_dict["name"]
# Update relative path for dockerfile and scripts
model_dict["dockerfile"] = os.path.join("scripts", dirname, model_dict["dockerfile"])
model_dict["scripts"] = os.path.join("scripts", dirname, model_dict["scripts"])
model_dict["dockerfile"] = os.path.normpath(os.path.join("scripts", dirname, model_dict["dockerfile"]))
model_dict["scripts"] = os.path.normpath(os.path.join("scripts", dirname, model_dict["scripts"]))
self.models.append(model_dict)
self.model_list.append(model_dict["name"])

Expand Down Expand Up @@ -144,8 +144,9 @@ def select_models(self) -> None:
# of the tags are extra args to be passed into the model script.
if len(tag_list) > 1:
extra_args = [tag_ for tag_ in tag_list[1:]]
extra_args = " ".join(extra_args)
extra_args = " " + extra_args
extra_args = [tag_.strip().replace("=", " ") for tag_ in extra_args]
extra_args = " --".join(extra_args)
extra_args = " --" + extra_args
else:
extra_args = ""

Expand All @@ -160,8 +161,8 @@ def select_models(self) -> None:
custom_model.update_model()
# Update relative path for dockerfile and scripts
dirname = custom_model.name.split("/")[0]
custom_model.dockerfile = os.path.join("scripts", dirname, custom_model.dockerfile)
custom_model.scripts = os.path.join("scripts", dirname, custom_model.scripts)
custom_model.dockerfile = os.path.normpath(os.path.join("scripts", dirname, custom_model.dockerfile))
custom_model.scripts = os.path.normpath(os.path.join("scripts", dirname, custom_model.scripts))
model_dict = custom_model.to_dict()
model_dict["args"] = model_dict["args"] + extra_args
tag_models.append(model_dict)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_discover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def test_additional_args(self, global_data, clean_test_temp_files):
with open(os.path.join(BASE_DIR, "perf.csv"), "r") as csv_file:
csv_reader = csv.DictReader(csv_file)
for row in csv_reader:
if row["model"] == "dummy2/model2" and row["status"] == "SUCCESS" and "batch-size=32" in row["args"]:
if row["model"] == "dummy2/model2" and row["status"] == "SUCCESS" and "--batch-size 32" in row["args"]:
success = True
if not success:
pytest.fail("dummy2/model2:batch-size=32 did not run successfully.")
Expand Down