Merge branch 'main' into kind-setup-related-updates

fmperf-project · Oct 31, 2024 · 73a7c85 · 73a7c85
2 parents b0210b6 + 97b23e0
commit 73a7c85
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/fmperf/loadgen/run.py b/fmperf/loadgen/run.py
@@ -15,7 +15,10 @@
 from fmperf.utils.constants import REQUESTS_DIR, REQUESTS_FILENAME, RESULTS_ALL_FILENAME
 
 
-def run():
+def run(result_filename=None):
+    if result_filename is None:
+        result_filename = RESULTS_ALL_FILENAME
+
     def get_streaming_response_tgis(response):
         stop = False
         generated_tokens = 0
@@ -73,7 +76,7 @@ def get_streaming_response_vllm(response):
         yield None, 0, time.time_ns(), False, StopIteration()
 
     infile = os.path.join(REQUESTS_DIR, REQUESTS_FILENAME)
-    outfile = os.path.join(REQUESTS_DIR, RESULTS_FILENAME)
+    outfile = os.path.join(REQUESTS_DIR, result_filename)
     target = os.environ["TARGET"]
     api_url = os.environ["URL"]
     num_users = int(os.environ["NUM_USERS"])

diff --git a/fmperf/loadgen/sweep.py b/fmperf/loadgen/sweep.py
@@ -10,11 +10,12 @@
 
 for u in users:
     os.environ["NUM_USERS"] = str(u)
-    os.environ["RESULTS_FILENAME"] = "result_sweep_u%d.json" % (u)
 
-    run()
+    result_filename = "result_sweep_u%d.json" % (u)
 
-    filename = os.path.join(REQUESTS_DIR, "requests/result_sweep_u%d.json" % (u))
+    run(result_filename)
+
+    filename = os.path.join(REQUESTS_DIR, result_filename)
 
     with open(filename, "rb") as f:
         tmp = json.load(f)
@@ -23,7 +24,7 @@
 
     parse_results(results, print_df=True)
 
-outfile = os.path.point(REQUESTS_DIR, RESULTS_ALL_FILENAME)
+outfile = os.path.join(REQUESTS_DIR, RESULTS_ALL_FILENAME)
 print(f">> writing all results to file: {outfile}")
 with open(outfile, "w") as f:
     json.dump(results, f)