Plot scripts updated.

plot_scripts/map_packages_colors_1v1.py

@@ -20,7 +20,7 @@ params = {'backend': 'ps',
           'legend.fontsize': 12,
           'xtick.labelsize': 14,
           'ytick.labelsize': 14,}
-#           'text.usetex': True}
+#          'text.usetex': True}
 #           'figure.figsize': fig_size}
 # plt.rc('text.latex', preamble=r'\usepackage{braket}')
 plt.rcParams.update(params)

plot_scripts/map_packages_colors_all.py

@@ -21,7 +21,7 @@ params = {'backend': 'ps',
           'ytick.labelsize': 14,}
 #           'text.usetex': True}
 #           'figure.figsize': fig_size}
-plt.rc('text.latex', preamble=r'\usepackage{braket}')
+# plt.rc('text.latex', preamble=r'\usepackage{braket}')
 plt.rcParams.update(params)
 
 cm = plt.get_cmap('tab20')

plot_scripts/map_packages_colors_mgpu.py

@@ -19,7 +19,7 @@ params = {'backend': 'ps',
           'legend.fontsize': 12,
           'xtick.labelsize': 14,
           'ytick.labelsize': 14,}
-#          'text.usetex': True}
+#           'text.usetex': True}
 #           'figure.figsize': fig_size}
 # plt.rc('text.latex', preamble=r'\usepackage{braket}')
 plt.rcParams.update(params)

plot_scripts/plot_display_1v1.py

@@ -3,7 +3,7 @@ import h5py
 import os
 
 import sys
-sys.path.append('/plot_scripts/')
+sys.path.append('/plot_scripts')
 from map_packages_colors_1v1 import *
 from plot_scripts_1v1 import *
 
@@ -101,7 +101,12 @@ def abs_time(t1, p1, p1_cc, p1_pr, t2, p2, p2_cc, p2_pr, N_end):
             # if save_flag == "Y":
             #     gen_settings(fig, ax, r"N (system size)", r"Time ($t_{package}$)", False, True, True, 10**-1, 10**5, "out", "perf_{}_{}_{}_{}_{}_{}_{}_{}.pdf".format(t1, p1, p1_cc, p1_pr, t2, p2, p2_cc, p2_pr))
             # else:
-            gen_settings(fig, ax, r"N (system size)", r"Time ($t_{package}$)", False, True, True, 10**-1, 10**5, "out", None)
+            if N_arr_t1[0] > N_arr_t2[0]:
+                N_arr = N_arr_t2
+            else:
+                N_arr = N_arr_t1
+
+            gen_settings(fig, ax, r"N (system size)", r"Time ($t_{package}$)", False, True, True, N_arr[0]-2, N_arr[-1], True, 10**-1, 10**5, "out", None)
     else:
         print(" Re-select the options as the requested option data is not available.")
 
@@ -191,7 +196,7 @@ def relative_time_wrt_pack(t1, p1, p1_cc, p1_pr, t2, p2, p2_cc, p2_pr, N_end):
             # if save_flag == "Y":
             #     gen_settings(fig, ax, r"N (system size)", r"Relative time - " + p2, False, True, True, 10**-1, 10**3, "out", "relative_perf_{}_{}_{}_{}_{}_{}_{}_{}.pdf".format(t1, p1, p1_cc, p1_pr, t2, p2, p2_cc, p2_pr))
             # else:
-            gen_settings(fig, ax, r"N (system size)", r"Relative time", False, True, True, 10**-1, 10**3, "out", None)
+            gen_settings(fig, ax, r"N (system size)", r"Relative time", False, True, True, N_arr[0]-2, N_arr[-1], True, 10**-1, 10**3, "out", None)
         else:
             if N_arr_t1[0] > N_arr_t2[0]:
                 dat_2 = dat_2[3:]
@@ -207,6 +212,6 @@ def relative_time_wrt_pack(t1, p1, p1_cc, p1_pr, t2, p2, p2_cc, p2_pr, N_end):
             # if save_flag == "Y":
             # gen_settings(fig, ax, r"N (system size)", r"Relative time", False, True, True, 10**-1, 10**3, "out", "relative_perf_{}_{}_{}_{}_{}_{}_{}_{}.pdf".format(t1, p1, p1_cc, p1_pr, t2, p2, p2_cc, p2_pr))
             # else:
-            gen_settings(fig, ax, r"N (system size)", r"Relative time", False, True, True, 10**-1, 10**3, "out", None)
+            gen_settings(fig, ax, r"N (system size)", r"Relative time", False, True, True, N_arr[0]-2, N_arr[-1], True, 10**-1, 10**3, "out", None)
 
 # relative_time_wrt_pack(task_1, package_1, p1_com_cap, p1_prec, task_2, package_2, p2_com_cap, p2_prec)

plot_scripts/plot_display_all.py

@@ -70,7 +70,7 @@ def abs_time(t, cc, pr, compare_pack, N_end):
     # if save_flag == "Y":
     #     gen_settings(fig, ax, r"N (system size)", r"Time ($t_{package}$)", False, True, True, 10**-1, 10**5, "out", "perf_{}_{}_{}_{}_{}_{}_{}_{}.pdf".format(t1, p1, p1_cc, p1_pr, t2, p2, p2_cc, p2_pr))
     # else:
-    gen_settings(fig, ax, r"N (system size)", r"Time ($t_{package}$)", False, True, True, 10**-1, 10**5, "out", None)
+    gen_settings(fig, ax, r"N (system size)", r"Time ($t_{package}$)", False, True, True, N_arr[0]-2, N_arr[-1], True, 10**-1, 10**5, "out", None)
     # else:
     #     print(" Re-select the options as the requested option data is not available.")
 
@@ -96,7 +96,8 @@ def abs_time(t, cc, pr, compare_pack, N_end):
                 h5f.close()
                 plot_comp_data_n_arr(N_arr, dat, main_dat, package+'_'+t+'_'+cc+'_'+pr)
 
-        gen_settings(fig, ax, r"N (system size)", r"Relative time", False, True, True, 10**-1, 10**3, "out", None)
+        # gen_settings(fig, ax, xlabel_str, ylabel_str, log_x_on, log_y_on, xlim_on, xlim_low, xlim_upp, ylim_on, ylim_low, ylim_upp, leg_loc, fn):
+        gen_settings(fig, ax, r"N (system size)", r"Relative time", False, True, True, N_arr[0]-2, N_arr[-1], True, 10**-1, 10**3, "out", None)
 
 # pkg_str = ['qiskit' , 'cirq', 'qsimcirq', 'pennylane', 'pennylane_l', 'qibo', 'qibojit', 'yao', 'quest', 'qulacs', 'intel_qs_cpp', 'projectq', 'svsim',  'hybridq', 'hiq', 'qcgpu', 'qrack_sch']
 

plot_scripts/plot_display_com_pack.py

@@ -121,7 +121,7 @@ def abs_time_pack(t1, t2, cc, pr, N_end):
     print(" Number of gates of Task 2: ", ng2)
 
     plot_comp_data_n_arr(N_arr, ng1, ng2, 'gate_count')
-    gen_settings(fig, ax, r"N (system size)", r"Task I/Task II ($t_{T1}/t_{T2}$)", False, False, True, -3, 25, "out", None)
+    gen_settings(fig, ax, r"N (system size)", r"Task I/Task II ($t_{T1}/t_{T2}$)", False, False, True, N_arr[0]-2, N_arr[-1], True, -3, 25, "out", None)
     # else:
     #     print(" Re-select the options as the requested option data is not available.")
 

plot_scripts/plot_display_mgpu.py

@@ -44,7 +44,7 @@ def abs_time(t, pr, n_gpu, compare_pack, N_end):
                 N_arr = range(12, N_end, 2)
             plot_abs_data_n_arr(N_arr, dat, package+'_'+t+'_'+'gpu_'+str(n_gpu)+'_'+pr)
 
-    gen_settings(fig, ax, r"N (system size)", r"Time ($t_{package}$)", False, True, True, 10**-1, 10**4, "out", None)
+    gen_settings(fig, ax, r"N (system size)", r"Time ($t_{package}$)", False, True, True, N_arr[0]-2, N_arr[-1], True, 10**-1, 10**4, "out", None)
     # else:
     #     print(" Re-select the options as the requested option data is not available.")
 
@@ -64,7 +64,7 @@ def abs_time(t, pr, n_gpu, compare_pack, N_end):
             h5f.close()
             plot_comp_data_n_arr(N_arr, dat, main_dat, package+'_'+t+'_'+'gpu_'+str(n_gpu)+'_'+pr)
 
-    gen_settings(fig, ax, r"N (system size)", r"Relative time", False, False, True, -1, 10, "out", None)
+    gen_settings(fig, ax, r"N (system size)", r"Relative time", False, False, True, N_arr[0]-2, N_arr[-1], True, -1, 10, "out", None)
 
 # abs_time("Heisenberg dynamics", "Single", 1, "cuquantum_qsimcirq", 36)
 
@@ -104,7 +104,7 @@ def abs_time_ngpus(t, pr, pack, compare_ngpu, N_end):
 
             plot_abs_data_n_arr(N_arr, dat, pack+'_'+t+'_'+'gpu_'+str(ngpu)+'_'+pr)
 
-    gen_settings(fig, ax, r"N (system size)", r"Time ($t_{package}$)", False, True, True, 10**-1, 10**4, "out", None)
+    gen_settings(fig, ax, r"N (system size)", r"Time ($t_{package}$)", False, True, True, N_arr[0]-2, N_arr[-1], True, 10**-1, 10**4, "out", None)
     # else:
     #     print(" Re-select the options as the requested option data is not available.")
 
@@ -124,6 +124,6 @@ def abs_time_ngpus(t, pr, pack, compare_ngpu, N_end):
             h5f.close()
             plot_comp_data_n_arr(N_arr, dat, main_dat, pack+'_'+t+'_'+'gpu_'+str(n_gpu)+'_'+pr)
 
-    gen_settings(fig, ax, r"N (system size)", r"Relative time", False, False, True, -1, 10, "out", None)
+    gen_settings(fig, ax, r"N (system size)", r"Relative time", False, False, True, N_arr[0]-2, N_arr[-1], True, -1, 10, "out", None)
 
 # abs_time_ngpus("Heisenberg dynamics", "Single", "cuquantum_qsimcirq", 8, 36)

plot_scripts/plot_scripts_1v1.py

@@ -32,7 +32,7 @@ def plot_comp_data_n_arr(n_arr, data_1, data_2, pack_str):
     else:
         plt.plot(n_arr, ratio_arr, linestyle='-', marker=symbol_dict[pack_str], label=label_dict[pack_str], color=color_dict[pack_str], markersize=5)
 
-def gen_settings(fig, ax, xlabel_str, ylabel_str, log_x_on, log_y_on, ylim_on, ylim_low, ylim_upp, leg_loc, fn):
+def gen_settings(fig, ax, xlabel_str, ylabel_str, log_x_on, log_y_on, xlim_on, xlim_low, xlim_upp, ylim_on, ylim_low, ylim_upp, leg_loc, fn):
 
     ax.tick_params(direction='in', which='both', bottom=True, top=True, left=True, right=True)
     # ax.xaxis.set_major_locator(MaxNLocator(integer=True))
@@ -45,6 +45,8 @@ def gen_settings(fig, ax, xlabel_str, ylabel_str, log_x_on, log_y_on, ylim_on, y
         ax.set_xscale('log')
     if log_y_on:
         ax.set_yscale('log')
+    if xlim_on == True:
+        plt.xlim([xlim_low, xlim_upp])
     if ylim_on == True:
         plt.ylim([ylim_low, ylim_upp])
     # plt.xlabel(r"N (system size)")

plot_scripts/plot_scripts_all.py

@@ -33,7 +33,7 @@ def plot_comp_data_n_arr(n_arr, data_1, data_2, pack_str):
         plt.plot(n_arr, ratio_arr, linestyle='-', marker=symbol_dict[pack_str], label=label_dict[pack_str], color=color_dict[pack_str], markersize=5)
 
 
-def gen_settings(fig, ax, xlabel_str, ylabel_str, log_x_on, log_y_on, ylim_on, ylim_low, ylim_upp, leg_loc, fn):
+def gen_settings(fig, ax, xlabel_str, ylabel_str, log_x_on, log_y_on, xlim_on, xlim_low, xlim_upp, ylim_on, ylim_low, ylim_upp, leg_loc, fn):
 
     ax.tick_params(direction='in', which='both', bottom=True, top=True, left=True, right=True)
     # ax.xaxis.set_major_locator(MaxNLocator(integer=True))
@@ -46,6 +46,8 @@ def gen_settings(fig, ax, xlabel_str, ylabel_str, log_x_on, log_y_on, ylim_on, y
         ax.set_xscale('log')
     if log_y_on:
         ax.set_yscale('log')
+    if xlim_on == True:
+        plt.xlim([xlim_low, xlim_upp])
     if ylim_on == True:
         plt.ylim([ylim_low, ylim_upp])
     # plt.xlabel(r"N (system size)")

plot_scripts/plot_scripts_mgpu.py

@@ -33,7 +33,7 @@ def plot_comp_data_n_arr(n_arr, data_1, data_2, pack_str):
         plt.plot(n_arr, ratio_arr, linestyle='-', marker=symbol_dict[pack_str], label=label_dict[pack_str], color=color_dict[pack_str], markersize=5)
 
 
-def gen_settings(fig, ax, xlabel_str, ylabel_str, log_x_on, log_y_on, ylim_on, ylim_low, ylim_upp, leg_loc, fn):
+def gen_settings(fig, ax, xlabel_str, ylabel_str, log_x_on, log_y_on, xlim_on, xlim_low, xlim_upp, ylim_on, ylim_low, ylim_upp, leg_loc, fn):
 
     ax.tick_params(direction='in', which='both', bottom=True, top=True, left=True, right=True)
     # ax.xaxis.set_major_locator(MaxNLocator(integer=True))
@@ -46,6 +46,8 @@ def gen_settings(fig, ax, xlabel_str, ylabel_str, log_x_on, log_y_on, ylim_on, y
         ax.set_xscale('log')
     if log_y_on:
         ax.set_yscale('log')
+    if xlim_on == True:
+        plt.xlim([xlim_low, xlim_upp])
     if ylim_on == True:
         plt.ylim([ylim_low, ylim_upp])
     # plt.xlabel(r"N (system size)")