iqm-benchmarks 2.20__tar.gz → 2.22__tar.gz

{iqm_benchmarks-2.20 → iqm_benchmarks-2.22}/CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog
 =========
 
+Version 2.22
+============
+* Fix for QScore errors when custom_qubits_array is specified.
+
+Version 2.21
+============
+* Function to bootstrap counts added to utils file.
+
 Version 2.20
 ============
 * Standardizes observations for CLOPS and Mirror RB.

{iqm_benchmarks-2.20/src/iqm_benchmarks.egg-info → iqm_benchmarks-2.22}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.2
 Name: iqm-benchmarks
-Version: 2.20
+Version: 2.22
 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>, Miikka Koistinen <miikka@meetiqm.com>, Adrian Auer <adrian.auer@meetiqm.com>, Nadia Milazzo <nadia.milazzo@meetiqm.com>
+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
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3 :: Only

{iqm_benchmarks-2.20 → iqm_benchmarks-2.22}/pyproject.toml

@@ -15,15 +15,17 @@ dynamic = ["version"]
 description = "A package for implementation of Quantum Characterization, Verification and Validation (QCVV) techniques on IQM's hardware at gate level abstraction"
 authors = [
     {name="IQM Finland Oy", email="developers@meetiqm.com"},
-    {name="Aniket Rath", email="aniket.rath@meetiqm.com"},
-    {name="Jami Rönkkö", email="jami@meetiqm.com"},
-    {name="Pedro Figueroa Romero", email="pedro.romero@meetiqm.com"},
-    {name="Vicente Pina Canelles", email="vicente.pina@meetiqm.com"},
+    {name="Adrian Auer", email="adrian.auer@meetiqm.com"},
     {name="Raphael Brieger", email="raphael.brieger@meetiqm.com"},
-    {name="Stefan Seegerer", email="stefan.seegerer@meetiqm.com"},
+    {name="Alessio Calzona", email="alessio.calzona@meetiqm.com"},
+    {name="Pedro Figueroa Romero", email="pedro.romero@meetiqm.com"},
+    {name="Amin Hosseinkhani", email="amin.hosseinkhani@meetiqm.com"},
     {name="Miikka Koistinen", email="miikka@meetiqm.com"},
-    {name="Adrian Auer", email="adrian.auer@meetiqm.com"},
     {name="Nadia Milazzo", email="nadia.milazzo@meetiqm.com"},
+    {name="Vicente Pina Canelles", email="vicente.pina@meetiqm.com"},
+    {name="Aniket Rath", email="aniket.rath@meetiqm.com"},
+    {name="Jami Rönkkö", email="jami@meetiqm.com"},
+    {name="Stefan Seegerer", email="stefan.seegerer@meetiqm.com"}
 ]
 readme = "README.md"
 classifiers = [

{iqm_benchmarks-2.20 → iqm_benchmarks-2.22}/src/iqm/benchmarks/entanglement/ghz.py

@@ -682,7 +682,7 @@ class GHZBenchmark(Benchmark):
             )
             final_ghz = ghz_native_transpiled
         elif routine == "star":
-            ghz: QuantumCircuit = generate_ghz_star(qubit_count)
+            ghz = generate_ghz_star(qubit_count)
             circuit_group.add_circuit(ghz)
             ghz_native_transpiled, _ = perform_backend_transpilation(
                 [ghz],

{iqm_benchmarks-2.20 → iqm_benchmarks-2.22}/src/iqm/benchmarks/optimization/qscore.py

@@ -411,8 +411,7 @@ def qscore_analysis(run: BenchmarkRunResult) -> BenchmarkAnalysisResult:
     backend_name = dataset.attrs["backend_name"]
     timestamp = dataset.attrs["execution_timestamp"]
 
-    max_num_nodes = dataset.attrs["max_num_nodes"]
-    min_num_nodes = dataset.attrs["min_num_nodes"]
+    nodes_list = dataset.attrs["node_numbers"]
     num_instances: int = dataset.attrs["num_instances"]
 
     use_virtual_node: bool = dataset.attrs["use_virtual_node"]
@@ -420,7 +419,6 @@ def qscore_analysis(run: BenchmarkRunResult) -> BenchmarkAnalysisResult:
     num_qaoa_layers = dataset.attrs["num_qaoa_layers"]
 
     qscore = 0
-    nodes_list = list(range(min_num_nodes, max_num_nodes + 1))
     beta_ratio_list = []
     beta_ratio_std_list = []
     for num_nodes in nodes_list:
@@ -753,17 +751,26 @@ class QScoreBenchmark(Benchmark):
         else:
             nqubits = self.backend.num_qubits
 
-        if self.max_num_nodes is None or self.max_num_nodes == nqubits + 1:
+        if self.custom_qubits_array is not None:
             if self.use_virtual_node:
-                max_num_nodes = nqubits + 1
+                node_numbers = [len(qubit_layout)+1 for qubit_layout in self.custom_qubits_array]
             else:
-                max_num_nodes = nqubits
+                node_numbers = [len(qubit_layout) for qubit_layout in self.custom_qubits_array]
+
         else:
-            max_num_nodes = self.max_num_nodes
+            if self.max_num_nodes is None or self.max_num_nodes == nqubits + 1:
+                if self.use_virtual_node:
+                    max_num_nodes = nqubits + 1
+                else:
+                    max_num_nodes = nqubits
+            else:
+                max_num_nodes = self.max_num_nodes
+            node_numbers = range(self.min_num_nodes, max_num_nodes + 1)
 
-        dataset.attrs.update({"max_num_nodes": max_num_nodes})
+        dataset.attrs.update({"max_num_nodes": node_numbers[-1]})
+        dataset.attrs.update({"node_numbers": node_numbers})
 
-        for num_nodes in range(self.min_num_nodes, max_num_nodes + 1):
+        for num_nodes in node_numbers:
             qc_list = []
             qc_transpiled_list: List[QuantumCircuit] = []
             execution_results = []

{iqm_benchmarks-2.20 → iqm_benchmarks-2.22}/src/iqm/benchmarks/readout_mitigation.py

@@ -25,7 +25,7 @@ from mthree.exceptions import M3Error
 from mthree.mitigation import _job_thread
 from mthree.utils import final_measurement_mapping
 from qiskit import transpile  # pylint: disable = no-name-in-module
-from qiskit.providers import Backend, BackendV1, BackendV2
+from qiskit.providers import BackendV1, BackendV2
 
 from iqm.benchmarks.logging_config import qcvv_logger
 from iqm.benchmarks.utils import get_iqm_backend, timeit

{iqm_benchmarks-2.20 → iqm_benchmarks-2.22}/src/iqm/benchmarks/utils.py

@@ -25,6 +25,7 @@ from typing import Any, Dict, Iterable, List, Literal, Optional, Sequence, Tuple
 from more_itertools import chunked
 from mthree.utils import final_measurement_mapping
 import numpy as np
+from numpy.random import Generator
 from qiskit import ClassicalRegister, transpile
 from qiskit.converters import circuit_to_dag
 from qiskit.transpiler import CouplingMap
@@ -65,6 +66,54 @@ def timeit(f):
     return wrap
 
 
+def bootstrap_counts(
+    original_counts: Dict[str, int],
+    num_bootstrap_samples: int = 100,
+    rgen: Optional[Generator] = None,
+    include_original_counts: bool = False,
+) -> List[Dict[str, int]]:
+    """Returns num_bootstrap_samples resampled copies of the original_counts.
+
+    Args:
+        original_counts (Dict[str, int]): The original dictionary of counts to bootstrap from.
+        num_bootstrap_samples (int): The number of bootstrapping samples to generate.
+            * Default is 100.
+        rgen (Optional[Generator]): The random number generator.
+            * Default is None: assigns numpy's default_rng().
+        include_original_counts (bool): Whether to include the original counts in the returned bootstrapped count samples.
+            * Default is False.
+    Returns:
+        List[Dict[str, int]]: A list of bootstrapped counts.
+    """
+    if rgen is None:
+        rgen = np.random.default_rng()
+
+    keys = list(original_counts.keys())
+    values = list(original_counts.values())
+    tot_shots = int(sum(values))
+
+    # Pre-calculate cumulative sum and create bins
+    cumulative_sum = np.cumsum(values)
+    bins = np.insert(cumulative_sum, 0, 0)
+
+    if include_original_counts:
+        bs_counts_fast = [original_counts]
+    else:
+        bs_counts_fast = []
+
+    for _ in range(num_bootstrap_samples):
+        # Generate random integers
+        random_integers = rgen.integers(low=0, high=tot_shots, size=tot_shots)
+        # Bin the random integers
+        binned_integers = np.digitize(random_integers, bins) - 1
+        # Count occurrences in each bin
+        occurrences = np.bincount(binned_integers, minlength=len(keys))
+        # Create dictionary mapping keys to occurrence counts
+        bs_counts_fast.append(dict(zip(keys, occurrences)))
+
+    return bs_counts_fast
+
+
 @timeit
 def count_2q_layers(circuit_list: List[QuantumCircuit]) -> List[int]:
     """Calculate the number of layers of parallel 2-qubit gates in a list of circuits.

{iqm_benchmarks-2.20 → iqm_benchmarks-2.22/src/iqm_benchmarks.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.2
 Name: iqm-benchmarks
-Version: 2.20
+Version: 2.22
 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>, Miikka Koistinen <miikka@meetiqm.com>, Adrian Auer <adrian.auer@meetiqm.com>, Nadia Milazzo <nadia.milazzo@meetiqm.com>
+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
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3 :: Only

{iqm_benchmarks-2.20 → iqm_benchmarks-2.22}/tests/test_qscore.py

@@ -1,14 +1,14 @@
 """Tests for Qscore estimation"""
 
 from iqm.benchmarks.optimization.qscore import *
-from iqm.qiskit_iqm.fake_backends.fake_adonis import IQMFakeAdonis
+from iqm.qiskit_iqm.fake_backends.fake_apollo import IQMFakeApollo
 from iqm.qiskit_iqm.fake_backends.fake_deneb import IQMFakeDeneb
 
 
 class TestQScore:
-    backend = IQMFakeAdonis()
+    backend = IQMFakeApollo()
     qpu_topology = "crystal"
-    custom_qubits_array = [[0], [0, 2], [0, 1, 2], [0, 1, 2, 3], [0, 1, 2, 3, 4]]
+    custom_qubits_array = [[0, 1, 3], [0, 1, 2, 3] , [0, 1, 2, 3, 4]]
 
     def test_qscore(self):
         EXAMPLE_QSCORE = QScoreConfiguration(
@@ -17,7 +17,7 @@ class TestQScore:
             shots=4,
             calset_id=None,  # calibration set ID, default is None
             min_num_nodes=2,
-            max_num_nodes=None,
+            max_num_nodes=4,
             use_virtual_node=True,
             use_classically_optimized_angles=True,
             choose_qubits_routine="custom",
@@ -34,4 +34,4 @@ class TestQScore:
 class TestQScoreDeneb(TestQScore):
     backend = IQMFakeDeneb()
     qpu_topology = "star"
-    custom_qubits_array = [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4], [1, 2, 3, 4, 5], [1, 2, 3, 4, 5, 6]]
+    custom_qubits_array = [[1], [1, 2], [1, 2, 3, 4], [1, 2, 3, 4, 5]]

{iqm_benchmarks-2.20 → iqm_benchmarks-2.22}/tests/test_rb.py

@@ -40,7 +40,7 @@ class TestRB:
         EXAMPLE_IRB_1Q = InterleavedRBConfiguration(
             qubits_array=[[1]],
             sequence_lengths=[2 ** (m + 1) - 1 for m in range(4)],
-            num_circuit_samples=2,
+            num_circuit_samples=5,
             shots=2**4,
             parallel_execution=True,
             interleaved_gate="RGate",
@@ -55,7 +55,7 @@ class TestRB:
         EXAMPLE_CRB_1Q = CliffordRBConfiguration(
             qubits_array=[[3]],
             sequence_lengths=[2 ** (m + 1) - 1 for m in range(4)],
-            num_circuit_samples=2,
+            num_circuit_samples=5,
             shots=2**4,
             calset_id=None,
             parallel_execution=False,