iqm-benchmarks 1.11__py3-none-any.whl → 1.12__py3-none-any.whl

iqm/benchmarks/benchmark_experiment.py

@@ -24,6 +24,7 @@ from time import strftime
 from typing import List, Optional, OrderedDict, Union
 
 from iqm.benchmarks.benchmark import BenchmarkBase, BenchmarkConfigurationBase
+from iqm.benchmarks.logging_config import qcvv_logger
 from iqm.benchmarks.utils import get_iqm_backend
 from iqm.qiskit_iqm.iqm_backend import IQMBackendBase
 
@@ -52,15 +53,14 @@ class BenchmarkExperiment:
         """
         self.timestamp = strftime("%Y%m%d-%H%M%S")
 
-        self.device_id = device_id if device_id is not None else backend
-
         if isinstance(backend, str):
             self.backend = get_iqm_backend(backend)
-
         else:
             assert isinstance(backend, IQMBackendBase)
             self.backend = backend
 
+        self.device_id = device_id if device_id is not None else self.backend.name
+
         benchmarks: OrderedDict[str, BenchmarkBase] = OrderedDict(
             (config.benchmark.name(), config.benchmark(self.backend, config)) for config in benchmark_configurations
         )
@@ -74,7 +74,7 @@ class BenchmarkExperiment:
         """Run the Benchmark experiment, and store the configuration, raw data, results and figures."""
 
         for name, benchmark in self.benchmarks.items():
-            print("\nNow executing " + name)
+            qcvv_logger.info("\nNow executing " + name)
             # Create the directory for results
             results_dir = f"Outputs/{self.device_id}/{self.timestamp}/{name}/"
             Path(results_dir).mkdir(parents=True, exist_ok=True)

iqm/benchmarks/optimization/qscore.py

@@ -17,8 +17,9 @@ Q-score benchmark
 """
 
 import itertools
+import logging
 from time import strftime
-from typing import Callable, Dict, List, Optional, Tuple, Type
+from typing import Callable, Dict, List, Literal, Optional, Tuple, Type
 
 from matplotlib.figure import Figure
 import matplotlib.pyplot as plt
@@ -209,6 +210,7 @@ class QScoreBenchmark(BenchmarkBase):
 
             else:
                 coupling_map = self.backend.coupling_map.reduce(qubit_set)
+                qcvv_logger.setLevel(logging.WARNING)
                 transpiled_qc_list, _ = perform_backend_transpilation(
                     [qc],
                     backend=self.backend,
@@ -230,6 +232,7 @@ class QScoreBenchmark(BenchmarkBase):
                 )
 
                 counts = retrieve_all_counts(jobs)[0][0]
+                qcvv_logger.setLevel(logging.INFO)
 
             return self.compute_expectation_value(counts, graph)
 
@@ -595,7 +598,7 @@ class QScoreBenchmark(BenchmarkBase):
 
         for i in range(self.num_instances):
             graph = nx.generators.erdos_renyi_graph(num_nodes, 0.5, seed=seed)
-            print(f"graph: {graph}")
+            qcvv_logger.debug(f"graph: {graph}")
             self.graph_physical = graph.copy()
             self.virtual_nodes = []
             if self.use_virtual_node:
@@ -619,14 +622,14 @@ class QScoreBenchmark(BenchmarkBase):
             if graph.number_of_edges() == 0:
                 cut_sizes.append(0)
                 seed += 1
-                qcvv_logger.info(f"Graph {i+1}/{self.num_instances} had no edges: cut size = 0.")
+                qcvv_logger.debug(f"Graph {i+1}/{self.num_instances} had no edges: cut size = 0.")
                 continue
 
             # Choose the qubit layout
             qubit_set = []
             if self.choose_qubits_routine.lower() == "naive":
                 qubit_set = self.choose_qubits_naive(num_nodes)
-            elif self.choose_qubits_routine.lower() == "custom" or self.choose_qubits_routine.lower() == "mapomatic":
+            elif self.choose_qubits_routine.lower() == "custom":
                 qubit_set = self.choose_qubits_custom(num_nodes)
             else:
                 raise ValueError('choose_qubits_routine must either be "naive" or "custom".')
@@ -634,7 +637,7 @@ class QScoreBenchmark(BenchmarkBase):
             # Solve the maximum cut size with QAOA
             cut_sizes.append(self.run_QAOA(graph, qubit_set))
             seed += 1
-            qcvv_logger.info(f"Solved the MaxCut on graph {i+1}/{self.num_instances}.")
+            qcvv_logger.debug(f"Solved the MaxCut on graph {i+1}/{self.num_instances}.")
 
         average_cut_size = np.mean(cut_sizes) - num_nodes * (num_nodes - 1) / 8
         average_best_cut_size = 0.178 * pow(num_nodes, 3 / 2)
@@ -677,7 +680,7 @@ class QScoreBenchmark(BenchmarkBase):
         list_of_cut_sizes = []
 
         for num_nodes in range(self.min_num_nodes, max_num_nodes + 1):
-            qcvv_logger.info(f"Executing on {self.num_instances} random graphs with {num_nodes} nodes.")
+            qcvv_logger.debug(f"Executing on {self.num_instances} random graphs with {num_nodes} nodes.")
             is_successful, approximation_ratio, cut_sizes = self.execute_single_benchmark(num_nodes)[0:3]
             approximation_ratios.append(approximation_ratio)
 
@@ -711,7 +714,7 @@ class QScoreConfiguration(BenchmarkConfigurationBase):
     max_num_nodes: Optional[int] = None
     use_virtual_node: bool = True
     use_classically_optimized_angles: bool = True
-    choose_qubits_routine: str = "naive"
+    choose_qubits_routine: Literal["naive", "custom"] = "naive"
     min_num_qubits: int = 2  # If choose_qubits_routine is "naive"
     custom_qubits_array: Optional[list[list[int]]] = None
     qiskit_optim_level: int = 3

iqm/benchmarks/randomized_benchmarking/randomized_benchmarking_common.py

@@ -550,7 +550,7 @@ def plot_rb_decay(
         shade_stdev (bool, optional): Whether standard deviations are shaded or not. Defaults to False
         shade_meanerror (bool, optional): Whether to shade standard deviations. Defaults to False
         logscale (bool, optional): Whether x-axis uses logscale. Defaults to True
-        interleaved_gate (Optional[str]):
+        interleaved_gate (Optional[str]): The label or the interleaved gate. Defaults to None
         mrb_2q_density (Optional[float], optional): Density of MRB 2Q gates. Defaults to None.
         mrb_2q_ensemble (Optional[Dict[str, float]], optional): MRB ensemble of 2Q gates. Defaults to None.
 
@@ -771,7 +771,7 @@ def plot_rb_decay(
             if identifier == "mrb":
                 plot_label = fr"$\overline{{F}}_{{MRB}} (n={len(qubits)})$ = {100.0 * fidelity_value[key][str(qubits)]:.2f} +/- {100.0 * fidelity_stderr[key][str(qubits)]:.2f} (%)"
             elif key == "interleaved":
-                plot_label = fr"$\overline{{F}}_{{interleaved_gate}} ({qubits})$ = {100.0 * fidelity_value[key][str(qubits)]:.2f} +/- {100.0 * fidelity_stderr[key][str(qubits)]:.2f} (%)"
+                plot_label = fr"$\overline{{F}}_{{{interleaved_gate}}} ({qubits})$ = {100.0 * fidelity_value[key][str(qubits)]:.2f} +/- {100.0 * fidelity_stderr[key][str(qubits)]:.2f} (%)"
             else:
                 print(fidelity_value)
                 print(qubits)

{iqm_benchmarks-1.11.dist-info → iqm_benchmarks-1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-benchmarks
-Version: 1.11
+Version: 1.12
 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>, Aniket Rath <aniket.rath@meetiqm.com>, Jami Rönkkö <jami@meetiqm.com>, Pedro Figueroa Romero <pedro.romero@meetiqm.com>, Vicente Pina Canelles <vicente.pina@meetiqm.com>, Raphael Brieger <raphael.brieger@meetiqm.com>, Stefan Seegerer <stefan.seegerer@meetiqm.com>
 Project-URL: Homepage, https://github.com/iqm-finland/iqm-benchmarks

{iqm_benchmarks-1.11.dist-info → iqm_benchmarks-1.12.dist-info}/RECORD

@@ -1,7 +1,7 @@
 iqm/benchmarks/__init__.py,sha256=7EOYlsJriQHKAlb3tHpPY4bh4wLbsssZg4NV0XW0WBU,2128
 iqm/benchmarks/benchmark.py,sha256=SGhBcSxLPUu-cVXAjG4Db2TRobFCRBYoE1NtTDK1lJg,4432
 iqm/benchmarks/benchmark_definition.py,sha256=aRpOmeR5LOg64K6konSmko87UZ7r3uN98nkiCIOz1EU,10311
-iqm/benchmarks/benchmark_experiment.py,sha256=0BFNn04jyD1Yj-pIKnuZjCD00v3pU5EnwkRzJUBc0n4,6540
+iqm/benchmarks/benchmark_experiment.py,sha256=ynbsQS92v6soIgkDEdm3ygNO7f82-dhg7qB1l8jvSFM,6614
 iqm/benchmarks/logging_config.py,sha256=U7olP5Kr75AcLJqNODf9VBhJLVqIvA4AYR6J39D5rww,1052
 iqm/benchmarks/readout_mitigation.py,sha256=ugdWwdSpNoCNoqQTRBdSjzMsb9WxFQzKgGFpJmUHChE,12287
 iqm/benchmarks/utils.py,sha256=OoHDBwlr_O9PK90vwidBEFtxJa5CrOSc2suYEPpXLKE,20238
@@ -11,7 +11,7 @@ iqm/benchmarks/compressive_gst/gst_analysis.py,sha256=qaF9zDIadPGe9I0l_SC3EfnODZ
 iqm/benchmarks/entanglement/__init__.py,sha256=9T7prOwqMmFWdb4t6ETAHZXKK5o6FvU2DvVb6WhNi-U,682
 iqm/benchmarks/entanglement/ghz.py,sha256=7Vz15n5D_qEfFaRPkSbEgAbM8aQXBMT0dkRVMIPg7jA,38470
 iqm/benchmarks/optimization/__init__.py,sha256=_ajW_OibYLCtzU5AUv5c2zuuVYn8ZNeZUcUUSIGt51M,747
-iqm/benchmarks/optimization/qscore.py,sha256=_s5_w5QTlaeDcHX1BmAevVctHOTVobee1eGkFx7DTEs,27942
+iqm/benchmarks/optimization/qscore.py,sha256=0S6OemnIPmFUamnEPT_lY86Zk_c0a9M2CLYeRJ4Se5c,28056
 iqm/benchmarks/quantum_volume/__init__.py,sha256=i-Q4SpDWELBw7frXnxm1j4wJRcxbIyrS5uEK_v06YHo,951
 iqm/benchmarks/quantum_volume/clops.py,sha256=PvxnKYSBwJgLOuDcCKB4H_IBzQiLw4RqXAOzquiEPxU,31439
 iqm/benchmarks/quantum_volume/quantum_volume.py,sha256=sy1MDz4U_6JCwc0W85GjC2VHvxUO4fdvHekd2oV4tww,36979
@@ -19,7 +19,7 @@ iqm/benchmarks/randomized_benchmarking/__init__.py,sha256=IkKo-7zUChxZZd3my_csQC
 iqm/benchmarks/randomized_benchmarking/clifford_1q.pkl,sha256=vvSd0pRWxtzyirohO9yf_58mjevkc2-pbuWIEb-4gaw,46928
 iqm/benchmarks/randomized_benchmarking/clifford_2q.pkl,sha256=ZipqU3crPhz2T35qGFgB4GvMyoi_7pnu8NqW5ZP8NXg,90707258
 iqm/benchmarks/randomized_benchmarking/multi_lmfit.py,sha256=Se1ygR4mXn_2_P82Ch31KBnCmY-g_A9NKzE9Ir8nEvw,3247
-iqm/benchmarks/randomized_benchmarking/randomized_benchmarking_common.py,sha256=62T01SYfyIwArLhVmmgQllk78RKH3jhdWKOX2gnLMzU,37892
+iqm/benchmarks/randomized_benchmarking/randomized_benchmarking_common.py,sha256=cH-SeOFqsGD6iqTcHTjCMJ-z89mfDjYT_QPsHwJFmU4,37946
 iqm/benchmarks/randomized_benchmarking/clifford_rb/__init__.py,sha256=bTDA156LAl7OLGcMec--1nzDrV1XpPRVq3CquTmucgE,677
 iqm/benchmarks/randomized_benchmarking/clifford_rb/clifford_rb.py,sha256=uo6cPhoQQ9qAGeZFZG23jxaR88_qKdiqtlBrG_mAGWg,17470
 iqm/benchmarks/randomized_benchmarking/interleaved_rb/__init__.py,sha256=sq6MgN_hwlpkOj10vyCU4e6eKSX-oLcF2L9na6W2Gt4,681
@@ -36,8 +36,8 @@ mGST/optimization.py,sha256=YHwkzIkYvsZOPjclR-BCQWh24jeqjuXp0BB0WX5Lwow,10559
 mGST/qiskit_interface.py,sha256=2XuJ4WFViLsHCTpEZncwsLbRr-cELEYhegTpRPzCcuI,10080
 mGST/reporting/figure_gen.py,sha256=6Xd8vwfy09hLY1YbJY6TRevuMsQSU4MsWqemly3ZO0I,12970
 mGST/reporting/reporting.py,sha256=-XBy3OCJIMOsA8cApwKjhVKBwnjSAoxm-voHNbRWytM,25803
-iqm_benchmarks-1.11.dist-info/LICENSE,sha256=2Ncb40-hqkTil78RPv3-YiJfKaJ8te9USJgliKqIdSY,11558
-iqm_benchmarks-1.11.dist-info/METADATA,sha256=dDdF6Dk_RVT-lzXzdWorltqvIezLl_OJCLrNSTfDstU,9074
-iqm_benchmarks-1.11.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-iqm_benchmarks-1.11.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
-iqm_benchmarks-1.11.dist-info/RECORD,,
+iqm_benchmarks-1.12.dist-info/LICENSE,sha256=2Ncb40-hqkTil78RPv3-YiJfKaJ8te9USJgliKqIdSY,11558
+iqm_benchmarks-1.12.dist-info/METADATA,sha256=zg9mbf09daWGyt2JxN4uc7V8rQQtmewp2QzgkPOBRKE,9074
+iqm_benchmarks-1.12.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+iqm_benchmarks-1.12.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
+iqm_benchmarks-1.12.dist-info/RECORD,,