iqm-benchmarks 2.29__py3-none-any.whl → 2.31__py3-none-any.whl

iqm/benchmarks/compressive_gst/gst_analysis.py

@@ -316,9 +316,7 @@ def generate_unit_rank_gate_results(
         bootstrap_pauli_coeffs = np.zeros((len(X_array), dataset.attrs["num_gates"], dataset.attrs["pdim"] ** 2))
         for i, X_ in enumerate(X_array):
             X_std, _, _ = compatibility.pp2std(X_, E_array[i], rho_array[i])
-            U_opt_ = reporting.phase_opt(
-                np.array([change_basis(X_std[j], "pp", "std") for j in range(dataset.attrs["num_gates"])]), K_target
-            )
+            U_opt_ = reporting.phase_opt(X_std, K_target)
             pauli_coeffs_ = reporting.compute_sparsest_Pauli_Hamiltonian(U_opt_)
             bootstrap_pauli_coeffs[i, :, :] = pauli_coeffs_
         pauli_coeffs_low, pauli_coeffs_high = np.nanpercentile(bootstrap_pauli_coeffs, [2.5, 97.5], axis=0)

iqm/benchmarks/quantum_volume/clops.py

@@ -66,8 +66,8 @@ def plot_times(clops_data: xr.Dataset, observations: Dict[int, Dict[str, Dict[st
     """
     # Define the keys for different categories of times
     job_keys = ["submit_total", "compile_total", "execution_total"]
-    user_keys = ["user_submit_total", "user_retrieve_total", "assign_parameters_total"]
     total_keys = ["job_total"]
+    user_keys = ["user_retrieve_total", "user_submit_total", "assign_parameters_total", "time_transpile"]
 
     # Define variables for dataset values
     qubits = clops_data.attrs["qubits"]
@@ -95,14 +95,10 @@ def plot_times(clops_data: xr.Dataset, observations: Dict[int, Dict[str, Dict[st
 
     fig_name = f"{num_qubits}_qubits_{tuple(qubits)}"
 
-    # Plot total CLOPS time
-    x_t = ax1.bar(4 * sep, clops_time, barsize, zorder=0, label="clops time", color=(colors[-1], alpha), edgecolor="k")
-    ax1.bar_label(x_t, fmt=f"clops time: {clops_time:.2f}", fontsize=fontsize)
-
     # Plot user keys
     for i, (key, cumulative_value) in enumerate(zip(user_keys, np.cumsum([all_data[k] for k in user_keys]))):
         x = ax1.bar(
-            3 * sep,
+            4 * sep,
             cumulative_value,
             barsize,
             zorder=1 - i / 10,
@@ -112,6 +108,10 @@ def plot_times(clops_data: xr.Dataset, observations: Dict[int, Dict[str, Dict[st
         )
         ax1.bar_label(x, fmt=f"{key.replace('_total', ' ').replace('_', ' ')}: {all_data[key]:.2f}", fontsize=fontsize)
 
+    # Plot total CLOPS time
+    x_t = ax1.bar(3 * sep, clops_time, barsize, zorder=0, color=(colors[-1], alpha), edgecolor="k")
+    ax1.bar_label(x_t, fmt=f"CLOPS time: {clops_time:.2f}", fontsize=fontsize)
+
     # Plot total keys
     for i, (key, cumulative_value) in enumerate(zip(total_keys, np.cumsum([all_data[k] for k in total_keys]))):
         x = ax1.bar(
@@ -139,13 +139,13 @@ def plot_times(clops_data: xr.Dataset, observations: Dict[int, Dict[str, Dict[st
     ax2.spines["bottom"].set_visible(False)
 
     # Set axis labels and limits
-    ax1.set_ylabel("Total CLOPS time (seconds)")
-    ax2.set_ylabel("Total CLOPS time (%)")
-    ax1.set_ylim(-0.2, clops_time + 1)
+    ax1.set_ylabel("Total CLOPS experiment time (seconds)")
+    ax2.set_ylabel("Total CLOPS experiment time (%)")
+    ax1.set_ylim(-0.2, clops_time + all_data["assign_parameters_total"] + all_data["time_transpile"] + 1)
     ax2.set_ylim(-0.2, 100)
 
     # Set x-ticks and labels
-    time_types = ["Remote (components)", "Remote (total)", "Wall-time (components)", "Wall-time (total)"]
+    time_types = ["Remote (components)", "Remote (total)", "Wall-time (CLOPS)", "Wall-time (all components)"]
     ax1.set_xticks([i * sep + 1 for i in range(4)], time_types, fontsize=fontsize)
 
     # Set plot title
@@ -671,7 +671,7 @@ class CLOPSBenchmark(Benchmark):
 
         dataset.attrs.update(
             {
-                "clops_time": end_clops_timer - start_clops_timer,
+                "clops_time": end_clops_timer - start_clops_timer - sum(all_times_parameter_assign.values()),
                 "all_times_parameter_assign": all_times_parameter_assign,
                 "all_times_submit": all_times_submit,
                 "all_times_retrieve": all_times_retrieve,

{iqm_benchmarks-2.29.dist-info → iqm_benchmarks-2.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iqm-benchmarks
-Version: 2.29
+Version: 2.31
 Summary: A package for implementation of Quantum Characterization, Verification and Validation (QCVV) techniques on IQM's hardware at gate level abstraction
 Author-email: IQM Finland Oy <developers@meetiqm.com>, Adrian Auer <adrian.auer@meetiqm.com>, Raphael Brieger <raphael.brieger@meetiqm.com>, Alessio Calzona <alessio.calzona@meetiqm.com>, Pedro Figueroa Romero <pedro.romero@meetiqm.com>, Amin Hosseinkhani <amin.hosseinkhani@meetiqm.com>, Miikka Koistinen <miikka@meetiqm.com>, Nadia Milazzo <nadia.milazzo@meetiqm.com>, Vicente Pina Canelles <vicente.pina@meetiqm.com>, Aniket Rath <aniket.rath@meetiqm.com>, Jami Rönkkö <jami@meetiqm.com>, Stefan Seegerer <stefan.seegerer@meetiqm.com>
 Project-URL: Homepage, https://github.com/iqm-finland/iqm-benchmarks

{iqm_benchmarks-2.29.dist-info → iqm_benchmarks-2.31.dist-info}/RECORD

@@ -9,14 +9,14 @@ iqm/benchmarks/utils_plots.py,sha256=gNeGf5bnZjvKGGSglCFLonbG3oOd_z30mCx66__cbEY
 iqm/benchmarks/utils_shadows.py,sha256=e77PV_uaAO5m_woox9lAzompKAvFeDJ-0AKJrNJ7NFg,9728
 iqm/benchmarks/compressive_gst/__init__.py,sha256=LneifgYXtcwo2jcXo7GdUEHL6_peipukShhkrdaTRCA,929
 iqm/benchmarks/compressive_gst/compressive_gst.py,sha256=2kiRttog4jR-vtMHu847GTFe5qL_i_uYr_4WMGqt9Ww,25653
-iqm/benchmarks/compressive_gst/gst_analysis.py,sha256=jA1MaXIyPBwxbN36mTjn_jKaRO5-NdoG0YV-RaujU3s,36450
+iqm/benchmarks/compressive_gst/gst_analysis.py,sha256=y4Yk9v1N9DP91MieXTMIASzjoFlg2pCzkm4LhvEYi0k,36335
 iqm/benchmarks/entanglement/__init__.py,sha256=sHVVToRWRCz0LSntk1rQaoSNNeyZLPoiTjUKWZWrk1E,778
 iqm/benchmarks/entanglement/ghz.py,sha256=RGA6ynJFsfaCJv0nKccsiIzPk2G-iHHvIeW8LVu30HY,41249
 iqm/benchmarks/entanglement/graph_states.py,sha256=7IlPocwHbi_K_KQqTSVEaDfB7wLH9loTawqDnnaDYek,62528
 iqm/benchmarks/optimization/__init__.py,sha256=_ajW_OibYLCtzU5AUv5c2zuuVYn8ZNeZUcUUSIGt51M,747
 iqm/benchmarks/optimization/qscore.py,sha256=KOw8fjXeMwCjYvKukpX7IiAqRQrVTkrnIgKjNCPVWdw,38130
 iqm/benchmarks/quantum_volume/__init__.py,sha256=i-Q4SpDWELBw7frXnxm1j4wJRcxbIyrS5uEK_v06YHo,951
-iqm/benchmarks/quantum_volume/clops.py,sha256=fD_eh10qHv_W-_mCA-PjPDIxNJ5sqD7yDkK1UjRsAAo,31474
+iqm/benchmarks/quantum_volume/clops.py,sha256=9_4xljndh4iUcyPRPvYaslpeye1XPH2u5O1FMfhr9Mk,31608
 iqm/benchmarks/quantum_volume/quantum_volume.py,sha256=pro7Lz-A5pPpT9UZ8wtXKTyhdWmTjQjRHt4BylDR-3U,36553
 iqm/benchmarks/randomized_benchmarking/__init__.py,sha256=IkKo-7zUChxZZd3my_csQCJfJfZNsV3-JTvdG8uqys4,734
 iqm/benchmarks/randomized_benchmarking/clifford_1q.pkl,sha256=yrmSJqhv7Lb1yqiqU9-2baqTljJPNmTUPQR-AH6GGfc,7800
@@ -29,18 +29,18 @@ iqm/benchmarks/randomized_benchmarking/interleaved_rb/__init__.py,sha256=sq6MgN_
 iqm/benchmarks/randomized_benchmarking/interleaved_rb/interleaved_rb.py,sha256=TaR1YFWBhOgm1hmEQzuwLYpp0yl0Xpuo3jAT6YhiXpc,28471
 iqm/benchmarks/randomized_benchmarking/mirror_rb/__init__.py,sha256=ZekEqI_89nXzGO1vjM-b5Uwwicy59M4fYHXfA-f0MIg,674
 iqm/benchmarks/randomized_benchmarking/mirror_rb/mirror_rb.py,sha256=_xdp8XLPcZyuqy7Xz8-K8H7zjgRo9ZxFiDgCXE72gaE,34997
-iqm_benchmarks-2.29.dist-info/licenses/LICENSE,sha256=2Ncb40-hqkTil78RPv3-YiJfKaJ8te9USJgliKqIdSY,11558
+iqm_benchmarks-2.31.dist-info/licenses/LICENSE,sha256=2Ncb40-hqkTil78RPv3-YiJfKaJ8te9USJgliKqIdSY,11558
 mGST/LICENSE,sha256=TtHNq55cUcbglb7uhVudeBLUh_qPdUoAEvU0BBwFz-k,1098
 mGST/README.md,sha256=v_5kw253csHF4-RfE-44KqFmBXIsSMRmOtN0AUPrRxE,5050
 mGST/additional_fns.py,sha256=_SEJ10FRNM7_CroysT8hCLZTfpm6ZhEIDCY5zPTnhjo,31390
-mGST/algorithm.py,sha256=QnxLJtxZysggLUtbZE-c2MWaFclZB2XUVJhvrmUvjVs,26315
+mGST/algorithm.py,sha256=mXcDG9_0j3hVjxLyc585dsj_yvydfrWNlCrcnUOQHPw,26625
 mGST/compatibility.py,sha256=00DsPnNfOtrQcDTvxBDs-0aMhmuXmOIIxl_Ohy-Emkg,8920
 mGST/low_level_jit.py,sha256=uE1D3v01FbPpsbP92C4220OQalzOfxgL1Ku89BNkxLY,27377
 mGST/optimization.py,sha256=YHwkzIkYvsZOPjclR-BCQWh24jeqjuXp0BB0WX5Lwow,10559
 mGST/qiskit_interface.py,sha256=ajx6Zn5FnrX_T7tMP8xnBLyG4c2ddFRm0Fu2_3r1t30,10118
 mGST/reporting/figure_gen.py,sha256=6Xd8vwfy09hLY1YbJY6TRevuMsQSU4MsWqemly3ZO0I,12970
 mGST/reporting/reporting.py,sha256=B8NWfpZrrSmyH7lwZxd0EbZMYLsAGK1YsHRB4D5qXH4,26002
-iqm_benchmarks-2.29.dist-info/METADATA,sha256=SY72V4WZ3XtM8E7x5jYmTn-7lScCOjbwd1he-TFOzuo,10710
-iqm_benchmarks-2.29.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-iqm_benchmarks-2.29.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
-iqm_benchmarks-2.29.dist-info/RECORD,,
+iqm_benchmarks-2.31.dist-info/METADATA,sha256=q-6NOPnr9dvN0ZQ1clPFZ4nFhgd38se5bR8tC_MxsdA,10710
+iqm_benchmarks-2.31.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+iqm_benchmarks-2.31.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
+iqm_benchmarks-2.31.dist-info/RECORD,,

mGST/algorithm.py

@@ -688,30 +688,30 @@ def run_mGST(
         K, E = (init[0], init[1])
         # offset small negative eigenvalues for stability
         rho = init[2] + 1e-14 * np.eye(pdim).reshape(-1)
-        max_inits = 0
+        A = np.array([la.cholesky(E[k].reshape(pdim, pdim) + 1e-14 * np.eye(pdim)).T.conj() for k in range(n_povm)])
+        B = la.cholesky(rho.reshape(pdim, pdim))
+        X = np.einsum("ijkl,ijnm -> iknlm", K, K.conj()).reshape((d, r, r))
+        res_list = [objf(X, E, rho, J, y)]
     else:
-        K, _, E, rho = random_gs(d, r, rK, n_povm)
-
-    A = np.array([la.cholesky(E[k].reshape(pdim, pdim) + 1e-14 * np.eye(pdim)).T.conj() for k in range(n_povm)])
-    B = la.cholesky(rho.reshape(pdim, pdim))
-    X = np.einsum("ijkl,ijnm -> iknlm", K, K.conj()).reshape((d, r, r))
-    res_list = [objf(X, E, rho, J, y)]
-
-    for i in range(max_inits):
-        with logging_redirect_tqdm(loggers=[qcvv_logger]):
-            for _ in trange(max_iter):
-                yb, Jb = batch(y, J, bsize)
-                K, X, E, rho, A, B = optimize(yb, Jb, d, r, rK, n_povm, method, K, rho, A, B, fixed_elements)
-                res_list.append(objf(X, E, rho, J, y))
-                if res_list[-1] < delta:
-                    qcvv_logger.info(f"Batch optimization successful, improving estimate over full data....")
-                    success = True
-                    break
-        if testing:
-            plot_objf(res_list, delta, f"Objective function for batch optimization")
-        if success:
-            break
-        qcvv_logger.info(f"Run ", i, f"failed, trying new initialization...")
+        for i in range(max_inits):
+            K, X, E, rho = random_gs(d, r, rK, n_povm)
+            A = np.array([la.cholesky(E[k].reshape(pdim, pdim) + 1e-14 * np.eye(pdim)).T.conj() for k in range(n_povm)])
+            B = la.cholesky(rho.reshape(pdim, pdim))
+            res_list = [objf(X, E, rho, J, y)]
+            with logging_redirect_tqdm(loggers=[qcvv_logger]):
+                for _ in trange(max_iter):
+                    yb, Jb = batch(y, J, bsize)
+                    K, X, E, rho, A, B = optimize(yb, Jb, d, r, rK, n_povm, method, K, rho, A, B, fixed_elements)
+                    res_list.append(objf(X, E, rho, J, y))
+                    if res_list[-1] < delta:
+                        qcvv_logger.info(f"Batch optimization successful, improving estimate over full data....")
+                        success = True
+                        break
+            if testing:
+                plot_objf(res_list, delta, f"Objective function for batch optimization")
+            if success:
+                break
+            qcvv_logger.info(f"Run {i+1}/{max_inits} failed, trying new initialization...")
 
     if not success and max_inits > 0:
         qcvv_logger.info(f"Success threshold not reached, attempting optimization over full data set...")
@@ -719,7 +719,7 @@ def run_mGST(
         for _ in trange(final_iter):
             K, X, E, rho, A, B = optimize(y, J, d, r, rK, n_povm, method, K, rho, A, B, fixed_elements)
             res_list.append(objf(X, E, rho, J, y))
-            if np.abs(res_list[-2] - res_list[-1]) < delta * target_rel_prec:
+            if len(res_list) >= 2 and np.abs(res_list[-2] - res_list[-1]) < delta * target_rel_prec:
                 break
     if testing:
         plot_objf(res_list, delta, f"Objective function over batches and full data")