fixed script issues

Rizwana Begum
1 parent ad31d16f
Showing 9 changed files with 54 additions and 24 deletions
figures/energy_perf_bar.py
figures/plots/496/energy_perf_bar/energy_bar_normalized_0.0_0_0.pdf
figures/plots/496/energy_perf_bar/energy_bar_normalized_1.0_0_0.pdf
figures/plots/496/energy_perf_bar/energy_bar_normalized_1_0_0.pdf
figures/plots/496/energy_perf_bar/energy_bar_normalized_5.0_0_0.pdf
figures/plots/496/energy_perf_bar/energy_perf_bar_1.3.pdf
figures/plots/496/energy_perf_bar/performance_bar_normalized_0.0_0_0.pdf
figures/plots/496/energy_perf_bar/performance_bar_normalized_1.0_0_0.pdf
figures/plots/496/energy_perf_bar/performance_bar_normalized_5.0_0_0.pdf
@@ -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):