From 0e3c3f5dbf13c52080ceb131fddf7241c4d8fa91 Mon Sep 17 00:00:00 2001 From: Rohan138 Date: Tue, 17 Jun 2025 14:33:00 -0500 Subject: [PATCH 1/4] use normpath --- src/madengine/tools/discover_models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/madengine/tools/discover_models.py b/src/madengine/tools/discover_models.py index 64110471..63d049d8 100644 --- a/src/madengine/tools/discover_models.py +++ b/src/madengine/tools/discover_models.py @@ -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"]) @@ -160,8 +160,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) From 2fb9a70b9c8f74ea09d91984b92b1825ce2069be Mon Sep 17 00:00:00 2001 From: Rohan138 Date: Tue, 17 Jun 2025 15:21:29 -0500 Subject: [PATCH 2/4] parse with -- and = --- src/madengine/tools/discover_models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/madengine/tools/discover_models.py b/src/madengine/tools/discover_models.py index 63d049d8..d6776740 100644 --- a/src/madengine/tools/discover_models.py +++ b/src/madengine/tools/discover_models.py @@ -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 = "" From 0c5e334244245cab4577ce961f8a51f85664b0a8 Mon Sep 17 00:00:00 2001 From: Rohan138 Date: Tue, 17 Jun 2025 17:43:22 -0500 Subject: [PATCH 3/4] Update test to match -- and = --- tests/test_discover.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_discover.py b/tests/test_discover.py index 0319977b..d0643985 100644 --- a/tests/test_discover.py +++ b/tests/test_discover.py @@ -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.") From 17f0afcf6ae5fdf70f5c1ce43703be89ef24f806 Mon Sep 17 00:00:00 2001 From: Rohan138 Date: Thu, 19 Jun 2025 14:32:49 -0500 Subject: [PATCH 4/4] fix dummy3 symlinks --- .../dummy/scripts/dummy3/docker/dummy.ubuntu.amd.Dockerfile | 0 .../dummy/scripts/dummy3/docker/dummy.ubuntu.nvidia.Dockerfile | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 120000 tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.amd.Dockerfile mode change 100644 => 120000 tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.nvidia.Dockerfile diff --git a/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.amd.Dockerfile b/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.amd.Dockerfile deleted file mode 100644 index 5a66c4ec..00000000 --- a/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.amd.Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../docker/dummy.ubuntu.amd.Dockerfile \ No newline at end of file diff --git a/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.amd.Dockerfile b/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.amd.Dockerfile new file mode 120000 index 00000000..5a66c4ec --- /dev/null +++ b/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.amd.Dockerfile @@ -0,0 +1 @@ +../../../docker/dummy.ubuntu.amd.Dockerfile \ No newline at end of file diff --git a/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.nvidia.Dockerfile b/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.nvidia.Dockerfile deleted file mode 100644 index 01029ed7..00000000 --- a/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.nvidia.Dockerfile +++ /dev/null @@ -1 +0,0 @@ -../../../docker/dummy.ubuntu.nvidia.Dockerfile \ No newline at end of file diff --git a/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.nvidia.Dockerfile b/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.nvidia.Dockerfile new file mode 120000 index 00000000..01029ed7 --- /dev/null +++ b/tests/fixtures/dummy/scripts/dummy3/docker/dummy.ubuntu.nvidia.Dockerfile @@ -0,0 +1 @@ +../../../docker/dummy.ubuntu.nvidia.Dockerfile \ No newline at end of file