Merge branch 'main' into ghs-tests

.env.example

@@ -25,6 +25,9 @@ REQUESTS_FILENAME=sample_requests.json
 # results file
 RESULTS_FILENAME=results.json
 
+# filename for combined results
+RESULTS_ALL_FILENAME=results_all.json
+
 # number of virtual users
 NUM_USERS=1
 

fmperf/WorkloadSpecs.py

@@ -65,7 +65,6 @@ def __init__(
 
         super().__init__(1, image, pvc_name, overwrite)
 
-
     @classmethod
     def from_yaml(cls, file: str):
         return super().from_yaml(file)
@@ -103,6 +102,7 @@ def get_env(
         ]
         return env
 
+
 class HeterogeneousWorkloadSpec(WorkloadSpec):
     def __init__(
         self,

fmperf/__init__.py

@@ -1,3 +1,7 @@
 from fmperf.ModelSpecs import TGISModelSpec, vLLMModelSpec
 from fmperf.Cluster import Cluster, WorkloadSpec, DeployedModel
-from fmperf.WorkloadSpecs import HeterogeneousWorkloadSpec, HomogeneousWorkloadSpec, RealisticWorkloadSpec
+from fmperf.WorkloadSpecs import (
+    HeterogeneousWorkloadSpec,
+    HomogeneousWorkloadSpec,
+    RealisticWorkloadSpec,
+)

fmperf/loadgen/sweep.py

@@ -21,3 +21,8 @@
     results.extend(tmp["results"])
 
     parse_results(results, print_df=True)
+
+outfile = f"/requests/{os.environ['RESULTS_ALL_FILENAME']}"
+print(f">> writing all results to file: {outfile}")
+with open(outfile, "w") as f:
+    json.dump(results, f)