Rename field model_config to model_cfg in NIXLKVBench workload

Author: allkoow

src/cloudai/workloads/nixl_kvbench/nixl_kvbench.py

@@ -33,6 +33,9 @@ class NIXLKVBenchCmdArgs(CmdArgs):
     kvbench_script: str = "/workspace/nixl/benchmark/kvbench/main.py"
     python_executable: str = "python"
 
+    model_cfg: str | list[str] | None = None
+    """Path to model configuration file used by NIXL KVBench."""
+
     backend: str | list[str] | None = None
 
 
@@ -55,14 +58,15 @@ def installables(self) -> list[Installable]:
     @property
     def cmd_args_dict(self) -> dict[str, str | list[str]]:
         return self.cmd_args.model_dump(
+            by_alias=True,
             exclude={
                 "kvbench_script",
                 "python_executable",
                 "etcd_path",
                 "wait_etcd_for",
                 "docker_image_url",
                 "command",
-            }
+            },
         )
 
     def was_run_successful(self, tr: TestRun) -> JobStatusResult:

src/cloudai/workloads/nixl_kvbench/slurm_command_gen_strategy.py

@@ -66,8 +66,14 @@ def gen_kvbench_command(self) -> list[str]:
             f"{self.tdef.cmd_args.kvbench_script}",
             self.tdef.cmd_args.command,
         ]
+
         for k, v in self.test_run.test.cmd_args_dict.items():
-            command.append(f"--{k} {v}")
+            if v is None:
+                continue
+
+            key = "model_config" if k == "model_cfg" else k
+
+            command.append(f"--{key} {v}")
 
         command.append("--etcd_endpoints http://$NIXL_ETCD_ENDPOINTS")
 

tests/slurm_command_gen_strategy/test_nixl_kvbench_command_gen.py

@@ -67,3 +67,35 @@ def test_gen_kvbench_ucx(kvbench_tr: TestRun, slurm_system: SlurmSystem):
         "--op_type READ",
         "--etcd_endpoints http://$NIXL_ETCD_ENDPOINTS",
     ]
+
+
+def test_gen_kvbench_model_cfg_maps_to_model_config(kvbench_tr: TestRun, slurm_system: SlurmSystem):
+    kvbench_tr.test.cmd_args = NIXLKVBenchCmdArgs.model_validate(
+        {
+            "docker_image_url": "docker://image/url",
+            "model_cfg": "./cfg.yaml",
+        }
+    )
+    cmd_gen = NIXLKVBenchSlurmCommandGenStrategy(slurm_system, kvbench_tr)
+    cmd = cmd_gen.gen_kvbench_command()
+
+    # Ensure the alias 'model_cfg' is mapped to '--model_config'
+    assert "--model_config ./cfg.yaml" in cmd
+    assert not any(arg.startswith("--model_cfg ") for arg in cmd)
+
+
+def test_gen_kvbench_omits_none_values(kvbench_tr: TestRun, slurm_system: SlurmSystem):
+    kvbench_tr.test.cmd_args = NIXLKVBenchCmdArgs.model_validate(
+        {
+            "docker_image_url": "docker://image/url",
+            "model": "./model.yaml",
+            "op_type": None,
+            "source": None,
+        }
+    )
+    cmd_gen = NIXLKVBenchSlurmCommandGenStrategy(slurm_system, kvbench_tr)
+    cmd = cmd_gen.gen_kvbench_command()
+
+    # Ensure None-valued args are omitted entirely
+    assert not any(arg.startswith("--op_type ") for arg in cmd)
+    assert not any(arg.startswith("--source ") for arg in cmd)