From acc765b3878a8ff3e28d5407f9db2eb32edbfa95 Mon Sep 17 00:00:00 2001 From: Rashad-CSU Date: Fri, 7 Mar 2025 09:24:38 -0700 Subject: [PATCH 1/2] Inclusion of metrics --- raps/stats.py | 18 +++++++++++++++--- scripts/plot_p-util_t.py | 3 ++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/raps/stats.py b/raps/stats.py index b067429..7ee1fb9 100644 --- a/raps/stats.py +++ b/raps/stats.py @@ -62,6 +62,8 @@ def get_job_stats(engine: Engine): min_wait_time, max_wait_time, sum_wait_time = sys.maxsize, -sys.maxsize - 1, 0 min_turnaround_time, max_turnaround_time, sum_turnaround_time = sys.maxsize, -sys.maxsize - 1, 0 + min_psf_partial_num, max_psf_partial_num, sum_psf_partial_num = sys.maxsize, -sys.maxsize - 1, 0 + min_psf_partial_den, max_psf_partial_den, sum_psf_partial_den = sys.maxsize, -sys.maxsize - 1, 0 min_awrt, max_awrt, sum_awrt = sys.maxsize, -sys.maxsize - 1, 0 @@ -90,14 +92,23 @@ def get_job_stats(engine: Engine): awrt = agg_node_hours * turnaround_time # Area Weighted Response Time min_awrt, max_awrt, sum_awrt = min_max_sum(awrt, min_awrt, max_awrt, sum_awrt) + + psf_partial_num = job_size * (turnaround_time**4 - wait_time**4) + psf_partial_den = job_size * (turnaround_time**3 - wait_time**3) + + min_psf_partial_num, max_psf_partial_num, sum_psf_partial_num = \ + min_max_sum(psf_partial_num, min_psf_partial_num, max_psf_partial_num, sum_psf_partial_num) + min_psf_partial_den, max_psf_partial_den, sum_psf_partial_den = \ + min_max_sum(psf_partial_den, min_psf_partial_den, max_psf_partial_den, sum_psf_partial_den) if len(engine.job_history_dict) != 0: avg_job_size = sum_job_size / len(engine.job_history_dict) avg_runtime = sum_runtime / len(engine.job_history_dict) - avg_agg_node_hours = sum_agg_node_hours / len(engine.job_history_dict) + avg_agg_node_hours = sum_agg_node_hours / len(engine.job_history_dict) avg_wait_time = sum_wait_time / len(engine.job_history_dict) avg_turnaround_time = sum_turnaround_time / len(engine.job_history_dict) - avg_awrt = sum_awrt / len(engine.job_history_dict) + avg_awrt = sum_awrt / sum_agg_node_hours + psf = (3*sum_psf_partial_num)/(4*sum_psf_partial_den) else: # Set these to -1 to indicate nothing ran min_job_size, max_job_size, avg_job_size = -1,-1,-1 @@ -131,6 +142,7 @@ def get_job_stats(engine: Engine): 'average_turnaround_time': avg_turnaround_time, 'min_area_weighted_response_time': min_awrt, 'max_area_weighted_response_time': max_awrt, - 'avg_area_weighted_response_time': avg_awrt + 'area_weighted_avg_response_time': avg_awrt, + 'priority_weighted_specific_response_time': psf } return job_stats diff --git a/scripts/plot_p-util_t.py b/scripts/plot_p-util_t.py index 0ac4eb3..55dc4c8 100644 --- a/scripts/plot_p-util_t.py +++ b/scripts/plot_p-util_t.py @@ -60,4 +60,5 @@ for i in [1]: plt.title(path) ax1.legend(loc='upper left') ax2.legend(loc='upper right') - plt.show() + # plt.show() + plt.savefig("test.png") -- GitLab From e99208000eb6b132b6d5a8f3f78a73939700c721 Mon Sep 17 00:00:00 2001 From: Matthias Maiterth Date: Fri, 7 Mar 2025 15:34:42 -0500 Subject: [PATCH 2/2] Fixed error in the case that no job completed. --- raps/stats.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/raps/stats.py b/raps/stats.py index 7ee1fb9..e8827d9 100644 --- a/raps/stats.py +++ b/raps/stats.py @@ -64,7 +64,6 @@ def get_job_stats(engine: Engine): min_turnaround_time, max_turnaround_time, sum_turnaround_time = sys.maxsize, -sys.maxsize - 1, 0 min_psf_partial_num, max_psf_partial_num, sum_psf_partial_num = sys.maxsize, -sys.maxsize - 1, 0 min_psf_partial_den, max_psf_partial_den, sum_psf_partial_den = sys.maxsize, -sys.maxsize - 1, 0 - min_awrt, max_awrt, sum_awrt = sys.maxsize, -sys.maxsize - 1, 0 # Information on Job-Mix @@ -90,9 +89,11 @@ def get_job_stats(engine: Engine): min_turnaround_time, max_turnaround_time, sum_turnaround_time = \ min_max_sum(turnaround_time, min_turnaround_time, max_turnaround_time, sum_turnaround_time) + # Area Weighted Average Response Time awrt = agg_node_hours * turnaround_time # Area Weighted Response Time min_awrt, max_awrt, sum_awrt = min_max_sum(awrt, min_awrt, max_awrt, sum_awrt) - + + # Priority Weighted Specific Response Time psf_partial_num = job_size * (turnaround_time**4 - wait_time**4) psf_partial_den = job_size * (turnaround_time**3 - wait_time**3) @@ -104,11 +105,11 @@ def get_job_stats(engine: Engine): if len(engine.job_history_dict) != 0: avg_job_size = sum_job_size / len(engine.job_history_dict) avg_runtime = sum_runtime / len(engine.job_history_dict) - avg_agg_node_hours = sum_agg_node_hours / len(engine.job_history_dict) + avg_agg_node_hours = sum_agg_node_hours / len(engine.job_history_dict) avg_wait_time = sum_wait_time / len(engine.job_history_dict) avg_turnaround_time = sum_turnaround_time / len(engine.job_history_dict) avg_awrt = sum_awrt / sum_agg_node_hours - psf = (3*sum_psf_partial_num)/(4*sum_psf_partial_den) + psf = (3 * sum_psf_partial_num) / (4 * sum_psf_partial_den) else: # Set these to -1 to indicate nothing ran min_job_size, max_job_size, avg_job_size = -1,-1,-1 @@ -117,6 +118,7 @@ def get_job_stats(engine: Engine): min_wait_time, max_wait_time, avg_wait_time = -1,-1,-1 min_turnaround_time, max_turnaround_time, avg_turnaround_time = -1,-1,-1 min_awrt, max_awrt, avg_awrt = -1,-1,-1 + psf = -1 job_stats = { 'jobs completed': engine.jobs_completed, -- GitLab