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

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

@@ -2,6 +2,10 @@
 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.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: iqm-benchmarks
-Version: 2.21
+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>, 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.21 → 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.21 → iqm_benchmarks-2.22/src/iqm_benchmarks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: iqm-benchmarks
-Version: 2.21
+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>, 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.21 → 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]]