clean up

Author: chibu

src/automation/tasks/base_task.py

@@ -8,7 +8,7 @@
 class BaseTask():
 
     #base_packages = ["git+https://github.com/neuralmagic/research.git"]
-    base_packages = ["git+https://github.com/neuralmagic/research.git@update_guidellm"]
+    #base_packages = ["git+https://github.com/neuralmagic/research.git@update_guidellm"]
 
     def __init__(
         self,
@@ -19,6 +19,7 @@ def __init__(
         packages: Optional[Sequence[str]]=None,
         task_type: str="training",
     ):
+        base_packages = [f"git+https://github.com/neuralmagic/research.git@{branch}"]
 
         if packages is not None:
             packages = list(set(packages + self.base_packages))

src/automation/tasks/guidellm.py

@@ -5,16 +5,10 @@
 
 DEFAULT_SERVER_WAIT_TIME = 600 # 600 seconds = 10 minutes
 GUIDELLM_PACKAGE = "git+https://github.com/neuralmagic/guidellm.git"
-#GUIDELLM_PACKAGE = "git+https://github.com/neuralmagic/guidellm.git@clearml-guidellm"
-#GUIDELLM_PACKAGE = "git+https://github.com/neuralmagic/guidellm.git@clearml-guidellm#egg=guidellm"
-#GUIDELLM_PACKAGE = "git+https://github.com/neuralmagic/guidellm.git@main#egg=guidellm[dev]"
 
 class GuideLLMTask(BaseTask):
 
     guidellm_packages = [
-        #"build>=1.0.0",
-        #"setuptools>=61.0",
-        #"setuptools-git-versioning>=2.0,<3",
         "vllm",
         GUIDELLM_PACKAGE,
         "hf_xet",

src/automation/tasks/scripts/guidellm_script.py

@@ -88,7 +88,6 @@ def clean_hocon_value(v):
     import json
     import asyncio
     from pathlib import Path
-    #from guidellm.benchmark import benchmark_generative_text
     from guidellm.benchmark.output import GenerativeBenchmarksReport
     from guidellm.benchmark.entrypoints import benchmark_generative_text, benchmark_with_scenario
     from guidellm.benchmark.scenario import GenerativeTextScenario, get_builtin_scenarios
@@ -100,41 +99,10 @@ def clean_hocon_value(v):
     print("[DEBUG] Calling benchmark_generative_text with:")
     print(json.dumps(guidellm_args, indent=2))
 
-    #GenerativeBenchmarksReport()
     executable_path = os.path.dirname(sys.executable)
     vllm_path = os.path.join(executable_path, "vllm")
     print(f"The vllm path is: {vllm_path}")
 
-
-    #default_scenario = get_builtin_scenarios()[0]
-    #current_scenario = GenerativeTextScenario.from_builtin(default_scenario, dict(guidellm_args))
-
-    #from pathlib import Path
-    #filepath = Path(os.path.join(".", "src", "automation", "standards", "benchmarking", "chat.json"))
-    #current_scenario = GenerativeTextScenario.from_file(filepath, dict(guidellm_args))
-
-    #import time 
-    #time.sleep(300)
-    """
-    current_scenario = GenerativeTextScenario
-    print(current_scenario.model_fields["target"])
-    print(current_scenario.model_fields["model"])
-    overlap_keys = current_scenario.model_fields.keys() & dict(guidellm_args)
-    #overlap_keys = ["model"]
-    for element  in overlap_keys:
-        #print(element)
-        element_field_info = current_scenario.model_fields[element]
-        element_field_info.default = guidellm_args[element]
-        current_scenario.model_fields[element] = element_field_info
-        #print(element_field_info.annotation)
-    print(overlap_keys)
-
-    print(current_scenario.model_fields["target"])
-    print(current_scenario.model_fields["model"])
-
-    current_scenario = GenerativeTextScenario
-    """
-
     try:
         asyncio.run(
             benchmark_with_scenario(