From 38e0d558c5a413f5b83496500562cc0570f54ec3 Mon Sep 17 00:00:00 2001 From: Rizwana Begum Date: Tue, 5 May 2015 23:45:04 -0400 Subject: [PATCH] fixed script issues --- figures/energy_perf_bar.py | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------ figures/plots/496/energy_perf_bar/energy_bar_normalized_0.0_0_0.pdf | Bin 118108 -> 0 bytes figures/plots/496/energy_perf_bar/energy_bar_normalized_1.0_0_0.pdf | Bin 118105 -> 0 bytes figures/plots/496/energy_perf_bar/energy_bar_normalized_1_0_0.pdf | Bin 116544 -> 0 bytes figures/plots/496/energy_perf_bar/energy_bar_normalized_5.0_0_0.pdf | Bin 118111 -> 0 bytes figures/plots/496/energy_perf_bar/energy_perf_bar_1.3.pdf | Bin 119673 -> 0 bytes figures/plots/496/energy_perf_bar/performance_bar_normalized_0.0_0_0.pdf | Bin 118175 -> 0 bytes figures/plots/496/energy_perf_bar/performance_bar_normalized_1.0_0_0.pdf | Bin 118182 -> 0 bytes figures/plots/496/energy_perf_bar/performance_bar_normalized_5.0_0_0.pdf | Bin 118174 -> 0 bytes 9 files changed, 54 insertions(+), 24 deletions(-) delete mode 100644 figures/plots/496/energy_perf_bar/energy_bar_normalized_1_0_0.pdf diff --git a/figures/energy_perf_bar.py b/figures/energy_perf_bar.py index 3738684..f82aa91 100644 --- a/figures/energy_perf_bar.py +++ b/figures/energy_perf_bar.py @@ -10,13 +10,13 @@ from sets import Set from common import * -def get_energy(frontiers_data, cpu_freq, mem_freq, sample, bmark): +def get_energy(frontiers_data, cpu_freq, mem_freq, sample): for point in frontiers_data["data"][sample]: if point["cpu_freq"] == cpu_freq: if point["mem_freq"] == mem_freq: return point["energy"] -def get_performance(frontiers_data, cpu_freq, mem_freq, sample, bmark): +def get_performance(frontiers_data, cpu_freq, mem_freq, sample): for point in frontiers_data["data"][sample]: if point["cpu_freq"] == cpu_freq: if point["mem_freq"] == mem_freq: @@ -90,9 +90,9 @@ def plot_energy_perf_bar(args, threshold_list, budget): current_sample = -1 length = 1 lengths = [] - prev_tr_sample = 0 energy = 0 performance = 0 + idx = 0 while index < len( samplepoints ): current_sample = samplepoints[index] @@ -116,18 +116,32 @@ def plot_energy_perf_bar(args, threshold_list, budget): elif point[0] == optimal_point[0]: if point[1] > optimal_point[1]: optimal_point = point +# done = 0 +# idx = prev_tr_sample+1 +# while done == 0: +# energy += get_energy(frontiers_data, optimal_point[0], optimal_point[1], idx, bmark) +# performance += get_performance(frontiers_data, optimal_point[0], optimal_point[1], idx, bmark) +# if idx == samplepoints[index-1]: +# done = 1 +# else: +# idx += 1 +# +# prev_tr_sample = samplepoints[index-1] +############ done = 0 - idx = prev_tr_sample+1 - while done == 0: - energy += get_energy(frontiers_data, optimal_point[0], optimal_point[1], idx, bmark) - performance += get_performance(frontiers_data, optimal_point[0], optimal_point[1], idx, bmark) - if idx == samplepoints[index-1]: - done = 1 - else: - idx += 1 - - prev_tr_sample = samplepoints[index-1] - + #print samplepoints[-1] + while done == 0 or idx == samplepoints[-1]: + #print idx + energy += get_energy(frontiers_data,optimal_point[0], optimal_point[1], idx) + performance += get_performance(frontiers_data,optimal_point[0], optimal_point[1], idx) + if index < len(samplepoints): + if idx == samplepoints[index]-2: + done = 1 + else: + if idx == samplepoints[-2]: + done = 1 + idx += 1 +############ # When there are no common points, transition if (len(common_points) == 0): settings_available = current_settings #all current settings are now available @@ -320,6 +334,7 @@ def plot_abs_energy_time_bar(args, budget_list, cluster_thresh, perf_cost, energ prev_tr_sample = 0 energy = 0 performance = 0 + idx = 0 while index < len( samplepoints ): current_sample = samplepoints[index] @@ -343,17 +358,32 @@ def plot_abs_energy_time_bar(args, budget_list, cluster_thresh, perf_cost, energ elif point[0] == optimal_point[0]: if point[1] > optimal_point[1]: optimal_point = point +# done = 0 +# idx = prev_tr_sample+1 +# while done == 0: +# energy += get_energy(frontiers_data, optimal_point[0], optimal_point[1], idx, bmark) +# performance += get_performance(frontiers_data, optimal_point[0], optimal_point[1], idx, bmark) +# if idx == samplepoints[index-1]: +# done = 1 +# else: +# idx += 1 +# +# prev_tr_sample = samplepoints[index-1] +############ done = 0 - idx = prev_tr_sample+1 - while done == 0: - energy += get_energy(frontiers_data, optimal_point[0], optimal_point[1], idx, bmark) - performance += get_performance(frontiers_data, optimal_point[0], optimal_point[1], idx, bmark) - if idx == samplepoints[index-1]: - done = 1 - else: - idx += 1 - - prev_tr_sample = samplepoints[index-1] + #print samplepoints[-1] + while done == 0 or idx == samplepoints[-1]: + #print idx + energy += get_energy(frontiers_data,optimal_point[0], optimal_point[1], idx) + performance += get_performance(frontiers_data,optimal_point[0], optimal_point[1], idx) + if index < len(samplepoints): + if idx == samplepoints[index]-2: + done = 1 + else: + if idx == samplepoints[-2]: + done = 1 + idx += 1 +############ # When there are no common points, transition if (len(common_points) == 0): diff --git a/figures/plots/496/energy_perf_bar/energy_bar_normalized_0.0_0_0.pdf b/figures/plots/496/energy_perf_bar/energy_bar_normalized_0.0_0_0.pdf index 00c5def..19dea3f 100644 Binary files a/figures/plots/496/energy_perf_bar/energy_bar_normalized_0.0_0_0.pdf and b/figures/plots/496/energy_perf_bar/energy_bar_normalized_0.0_0_0.pdf differ diff --git a/figures/plots/496/energy_perf_bar/energy_bar_normalized_1.0_0_0.pdf b/figures/plots/496/energy_perf_bar/energy_bar_normalized_1.0_0_0.pdf index 3015d5d..f96e687 100644 Binary files a/figures/plots/496/energy_perf_bar/energy_bar_normalized_1.0_0_0.pdf and b/figures/plots/496/energy_perf_bar/energy_bar_normalized_1.0_0_0.pdf differ diff --git a/figures/plots/496/energy_perf_bar/energy_bar_normalized_1_0_0.pdf b/figures/plots/496/energy_perf_bar/energy_bar_normalized_1_0_0.pdf deleted file mode 100644 index f87c5de..0000000 Binary files a/figures/plots/496/energy_perf_bar/energy_bar_normalized_1_0_0.pdf and /dev/null differ diff --git a/figures/plots/496/energy_perf_bar/energy_bar_normalized_5.0_0_0.pdf b/figures/plots/496/energy_perf_bar/energy_bar_normalized_5.0_0_0.pdf index af59d82..129b957 100644 Binary files a/figures/plots/496/energy_perf_bar/energy_bar_normalized_5.0_0_0.pdf and b/figures/plots/496/energy_perf_bar/energy_bar_normalized_5.0_0_0.pdf differ diff --git a/figures/plots/496/energy_perf_bar/energy_perf_bar_1.3.pdf b/figures/plots/496/energy_perf_bar/energy_perf_bar_1.3.pdf index 88effa4..930438f 100644 Binary files a/figures/plots/496/energy_perf_bar/energy_perf_bar_1.3.pdf and b/figures/plots/496/energy_perf_bar/energy_perf_bar_1.3.pdf differ diff --git a/figures/plots/496/energy_perf_bar/performance_bar_normalized_0.0_0_0.pdf b/figures/plots/496/energy_perf_bar/performance_bar_normalized_0.0_0_0.pdf index 2e7130f..bce5748 100644 Binary files a/figures/plots/496/energy_perf_bar/performance_bar_normalized_0.0_0_0.pdf and b/figures/plots/496/energy_perf_bar/performance_bar_normalized_0.0_0_0.pdf differ diff --git a/figures/plots/496/energy_perf_bar/performance_bar_normalized_1.0_0_0.pdf b/figures/plots/496/energy_perf_bar/performance_bar_normalized_1.0_0_0.pdf index 5086baa..b588c6e 100644 Binary files a/figures/plots/496/energy_perf_bar/performance_bar_normalized_1.0_0_0.pdf and b/figures/plots/496/energy_perf_bar/performance_bar_normalized_1.0_0_0.pdf differ diff --git a/figures/plots/496/energy_perf_bar/performance_bar_normalized_5.0_0_0.pdf b/figures/plots/496/energy_perf_bar/performance_bar_normalized_5.0_0_0.pdf index 4a614da..e883d3f 100644 Binary files a/figures/plots/496/energy_perf_bar/performance_bar_normalized_5.0_0_0.pdf and b/figures/plots/496/energy_perf_bar/performance_bar_normalized_5.0_0_0.pdf differ -- libgit2 0.22.2