From 259eacc9b9c8a33dbde634c4212b8152a5b0e64a Mon Sep 17 00:00:00 2001 From: Ghazi Sarwat Syed Date: Mon, 4 Nov 2024 14:21:48 +0000 Subject: [PATCH 1/4] generator function fix Signed-off-by: Ghazi Sarwat Syed --- fmperf/utils/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fmperf/utils/constants.py b/fmperf/utils/constants.py index dbc4ed2..27a2cb5 100644 --- a/fmperf/utils/constants.py +++ b/fmperf/utils/constants.py @@ -2,4 +2,4 @@ REQUESTS_DIR = os.environ.get("REQUESTS_DIR", ".") REQUESTS_FILENAME = os.environ["REQUESTS_FILENAME"] -RESULTS_ALL_FILENAME = os.environ["RESULTS_ALL_FILENAME"] +RESULTS_ALL_FILENAME = os.environ.get("RESULTS_ALL_FILENAME",None) From 984f6e0acd8f4de7cb05e1ef19c170a6fabe5245 Mon Sep 17 00:00:00 2001 From: Ghazi Sarwat Syed Date: Mon, 4 Nov 2024 14:25:27 +0000 Subject: [PATCH 2/4] updated generator fix Signed-off-by: Ghazi Sarwat Syed --- fmperf/utils/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fmperf/utils/constants.py b/fmperf/utils/constants.py index 27a2cb5..1688484 100644 --- a/fmperf/utils/constants.py +++ b/fmperf/utils/constants.py @@ -2,4 +2,4 @@ REQUESTS_DIR = os.environ.get("REQUESTS_DIR", ".") REQUESTS_FILENAME = os.environ["REQUESTS_FILENAME"] -RESULTS_ALL_FILENAME = os.environ.get("RESULTS_ALL_FILENAME",None) +RESULTS_ALL_FILENAME = os.environ.get("RESULTS_ALL_FILENAME", None) From bb4b5269cbdf90b3f1452b1b1067a8ff05fefc85 Mon Sep 17 00:00:00 2001 From: Ghazi Sarwat Syed Date: Mon, 4 Nov 2024 14:56:12 +0000 Subject: [PATCH 3/4] ghs-evaulate fix Signed-off-by: Ghazi Sarwat Syed --- fmperf/Cluster.py | 4 ++-- fmperf/loadgen/run.py | 4 ++-- fmperf/utils/constants.py | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fmperf/Cluster.py b/fmperf/Cluster.py index c634058..c320695 100644 --- a/fmperf/Cluster.py +++ b/fmperf/Cluster.py @@ -248,7 +248,7 @@ def generate_workload( { "name": "fmaas-perf", "image": workload.image, - "imagePullPolicy": "IfNotPresent", + "imagePullPolicy": "Always", "env": workload.get_env(target, model, outfile), "command": ["/bin/bash", "-ce"], "args": workload.get_args(), @@ -402,7 +402,7 @@ def evaluate( "containers": [ { "name": "fmaas-perf", - "imagePullPolicy": "IfNotPresent", + "imagePullPolicy": "Always", "image": workload.spec.image, "env": env, "command": ["/bin/bash", "-ce"], diff --git a/fmperf/loadgen/run.py b/fmperf/loadgen/run.py index 37d452a..4e411af 100644 --- a/fmperf/loadgen/run.py +++ b/fmperf/loadgen/run.py @@ -12,12 +12,12 @@ from fmperf.utils import parse_results from datetime import datetime from .collect_energy import collect_metrics, summarize_energy -from fmperf.utils.constants import REQUESTS_DIR, REQUESTS_FILENAME, RESULTS_ALL_FILENAME +from fmperf.utils.constants import REQUESTS_DIR, REQUESTS_FILENAME, RESULTS_FILENAME def run(result_filename=None): if result_filename is None: - result_filename = RESULTS_ALL_FILENAME + result_filename = RESULTS_FILENAME def get_streaming_response_tgis(response): stop = False diff --git a/fmperf/utils/constants.py b/fmperf/utils/constants.py index 1688484..f82d9a3 100644 --- a/fmperf/utils/constants.py +++ b/fmperf/utils/constants.py @@ -3,3 +3,4 @@ REQUESTS_DIR = os.environ.get("REQUESTS_DIR", ".") REQUESTS_FILENAME = os.environ["REQUESTS_FILENAME"] RESULTS_ALL_FILENAME = os.environ.get("RESULTS_ALL_FILENAME", None) +RESULTS_FILENAME = os.environ.get("RESULTS_FILENAME", None) From ee00a7d21430db1a0cafec1985aa60553019aabf Mon Sep 17 00:00:00 2001 From: Ghazi Sarwat Syed Date: Mon, 4 Nov 2024 15:02:31 +0000 Subject: [PATCH 4/4] resolved lint Signed-off-by: Ghazi Sarwat Syed --- fmperf/utils/constants.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fmperf/utils/constants.py b/fmperf/utils/constants.py index 23f2b8a..f82d9a3 100644 --- a/fmperf/utils/constants.py +++ b/fmperf/utils/constants.py @@ -4,4 +4,3 @@ REQUESTS_FILENAME = os.environ["REQUESTS_FILENAME"] RESULTS_ALL_FILENAME = os.environ.get("RESULTS_ALL_FILENAME", None) RESULTS_FILENAME = os.environ.get("RESULTS_FILENAME", None) -