sjf with bug

blinkbear · Oct 22, 2024 · 776baba · 776baba
1 parent 317c4ee
commit 776baba
Show file tree

Hide file tree

Showing 6 changed files with 195 additions and 240 deletions.
diff --git a/benchmarks/1_serving_benchmark.sh b/benchmarks/1_serving_benchmark.sh
@@ -27,9 +27,9 @@ result_dir="${pwd}/result"
 declare -a scheduler_swap_policies
 # scheduler_swap_policies[0]="tfittradeoff partial"
 # scheduler_swap_policies[1]="fcfs full"
-scheduler_swap_policies[2]="las full"
+# scheduler_swap_policies[2]="las full"
 # scheduler_swap_policies[1]="tfittradeoff full"
-# scheduler_swap_policies[2]="sjf full"
+scheduler_swap_policies[2]="sjf full"
 # scheduler_swap_policies[3]="sjmlfq full"
 # scheduler_swap_policies[3]="infer partial"
 # scheduler_swap_policies[4]="inferpreempt full"

diff --git a/benchmarks/backend_request_func.py b/benchmarks/backend_request_func.py
@@ -225,24 +225,16 @@ async def async_request_openai_completions(
     policy: str,
     request_func_input: RequestFuncInput,
     pbar: Optional[tqdm] = None,
+    data=None,
 ) -> RequestFuncOutput:
     api_url = request_func_input.api_url
     assert api_url.endswith(
         "v1/completions"
     ), "OpenAI Completions API URL must end with 'v1/completions'."
 
-
-
-
     async with aiohttp.ClientSession(timeout=AIOHTTP_TIMEOUT) as session:
         assert not request_func_input.use_beam_search
         if policy in ["sjf"]:
-            file_path = get_json_file()
-            if file_path:
-                with open(file_path, 'r', encoding="utf-8") as file:
-                    data = json.load(file)
-            else:
-                raise FileNotFoundError("JSON file not found for sjf")
             payload = {
                 "model": request_func_input.model,
                 "prompt": request_func_input.prompt,