Commit 1569ae7c authored by Maiterth, Matthias's avatar Maiterth, Matthias
Browse files

Merge branch 'scheduling-metrics-rashad' into 'reschedule-dataloaders' 

Include Scheduling Metrics

See merge request !77
parents 06124697 e9920800

raps/stats.py

+17 −3
Original line number Diff line number Diff line
@@ -62,7 +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



    # Information on Job-Mix
@@ -88,16 +89,27 @@ 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)



        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_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
@@ -106,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,
@@ -131,6 +144,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

scripts/plot_p-util_t.py

+2 −1
Original line number Diff line number Diff line
@@ -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")