iqm-benchmarks 2.52__py3-none-any.whl → 2.54__py3-none-any.whl

iqm/benchmarks/entanglement/ghz.py

@@ -690,7 +690,7 @@ class GHZBenchmark(Benchmark):
                     f"The current backend is a star architecture for which a suboptimal state generation routine is chosen. Consider setting state_generation_routine={routine}."
                 )
             if self.cal_url:
-                edges_cal, fidelities_cal, _ = extract_fidelities(self.cal_url)
+                edges_cal, fidelities_cal, _, _ = extract_fidelities(self.cal_url)
                 graph = get_edges(self.backend.coupling_map, qubit_layout, edges_cal, fidelities_cal)
             else:
                 graph = get_edges(self.backend.coupling_map, qubit_layout)

iqm/benchmarks/optimization/qscore.py

@@ -541,12 +541,12 @@ def qscore_analysis(run: BenchmarkRunResult) -> BenchmarkAnalysisResult:
 
         if success:
             qcvv_logger.info(
-                f"Q-Score = {num_nodes} passed with approximation ratio (Beta) {approximation_ratio:.4f}; Avg MaxCut size: {np.mean(cut_sizes_list):.4f}"
+                f"Q-Score = {num_nodes} passed with approximation ratio (Beta) {approximation_ratio:.4f} ± {std_of_approximation_ratio:.4f} with uncertainty; Avg MaxCut size: {np.mean(cut_sizes_list):.4f}"
             )
             qscore = num_nodes
         else:
             qcvv_logger.info(
-                f"Q-Score = {num_nodes} failed with approximation ratio (Beta) {approximation_ratio:.4f} < 0.2; Avg MaxCut size: {np.mean(cut_sizes_list):.4f}"
+                f"Q-Score = {num_nodes} failed with approximation ratio (Beta) {approximation_ratio:.4f} ± {std_of_approximation_ratio:.4f} < 0.2; Avg MaxCut size: {np.mean(cut_sizes_list):.4f}"
             )
         qubit_indices = dataset.attrs[num_nodes]["qubit_set"][0]
         observations.extend(
@@ -726,31 +726,40 @@ class QScoreBenchmark(Benchmark):
 
     def generate_maxcut_ansatz_star(  # pylint: disable=too-many-branches
         self,
-        graph,
-        theta,
+        graph: Graph,
+        theta: list[float],
+        qubit_set: Optional[list[int]] = None,
     ):
         """Generate an ansatz circuit for QAOA MaxCut, with measurements at the end.
 
         Args:
             graph (networkx graph): the MaxCut problem graph
             theta (list[float]): the variational parameters for QAOA, first gammas then betas
+            qubit_set (list[int]): the qubit set to be used for the ansatz
 
         Returns:
             QuantumCircuit: the QAOA ansatz quantum circuit.
         """
-
         gamma = theta[: self.num_qaoa_layers]
         beta = theta[self.num_qaoa_layers :]
-
+        if qubit_set is None:
+            qubit_set_resonator = list(range(self.graph_physical.number_of_nodes() + 1))
+            qubit_set_resonator = [q + 1 for q in qubit_set_resonator]
+        else:
+            qubit_set_resonator = [q + 1 for q in qubit_set]
         if self.graph_physical.number_of_nodes() != graph.number_of_nodes():
             num_qubits = self.graph_physical.number_of_nodes()
             # re-label the nodes to be between 0 and _num_qubits
-            self.node_to_qubit = {node: qubit for qubit, node in enumerate(list(self.graph_physical.nodes))}
+            self.node_to_qubit = {
+                node: qubit_set_resonator[qubit] for qubit, node in enumerate(list(self.graph_physical.nodes))
+            }
             self.qubit_to_node = dict(enumerate(list(self.graph_physical.nodes)))
         else:
             num_qubits = graph.number_of_nodes()
-            self.node_to_qubit = {node: node for node in list(self.graph_physical.nodes)}  # no relabeling
-            self.qubit_to_node = self.node_to_qubit
+            self.node_to_qubit = {
+                node: qubit_set_resonator[node] for node in list(self.graph_physical.nodes)
+            }  # no relabeling
+            self.qubit_to_node = {node: node for node in list(self.graph_physical.nodes)}
 
         covermap = self.greedy_vertex_cover_with_mapping(self.graph_physical)
         new_covermap = {}
@@ -759,20 +768,22 @@ class QScoreBenchmark(Benchmark):
         covermap = new_covermap
 
         compr = QuantumRegister(1, "compr")
-        q = QuantumRegister(num_qubits, "q")
+        q = QuantumRegister(self.backend.num_qubits, "q")
         c = ClassicalRegister(num_qubits, "c")
-        qaoa_qc = IQMCircuit(compr, q, c)  # num_qb+1,num_qb)
+        qaoa_qc = IQMCircuit(compr, q, c)
+        qubit_list = list(self.node_to_qubit.values())
+
         # in case the graph is trivial: return empty circuit
         if num_qubits == 0:
             return QuantumCircuit(1)
-        for i in range(1, num_qubits + 1):
+        for i in qubit_list:
             qaoa_qc.h(i)
         for layer in range(self.num_qaoa_layers):
             for move_qubit, edge_qubits in covermap.items():
-                qaoa_qc.move(move_qubit + 1, 0)
+                qaoa_qc.move(move_qubit, 0)
                 for edge_qubit in edge_qubits:
-                    qaoa_qc.rzz(2 * gamma[layer], 0, edge_qubit + 1)
-                qaoa_qc.move(move_qubit + 1, 0)
+                    qaoa_qc.rzz(2 * gamma[layer], 0, edge_qubit)
+                qaoa_qc.move(move_qubit, 0)
 
             # include edges of the virtual node as rz terms
             for vn in self.virtual_nodes:
@@ -784,13 +795,13 @@ class QScoreBenchmark(Benchmark):
                         sign = 1.0
                         if vn[1] == 1:
                             sign = -1.0
-                        qaoa_qc.rz(sign * 2.0 * gamma[layer], self.node_to_qubit[edge[1]] + 1)
+                        qaoa_qc.rz(sign * 2.0 * gamma[layer], self.node_to_qubit[edge[1]])
 
-            for i in range(1, num_qubits + 1):
+            for i in qubit_list:
                 qaoa_qc.rx(2 * beta[layer], i)
-        qaoa_qc.barrier()
-        qaoa_qc.measure(q, c)
 
+        qaoa_qc.barrier()
+        qaoa_qc.measure(qubit_list, list(range(num_qubits)))
         return qaoa_qc
 
     def generate_maxcut_ansatz(  # pylint: disable=too-many-branches
@@ -923,8 +934,6 @@ class QScoreBenchmark(Benchmark):
         dataset = xr.Dataset()
         self.add_all_meta_to_dataset(dataset)
 
-        nqubits = self.backend.num_qubits
-
         if self.choose_qubits_routine == "custom":
             if self.use_virtual_node:
                 node_numbers = [len(qubit_layout) + 1 for qubit_layout in self.custom_qubits_array]
@@ -932,11 +941,8 @@ class QScoreBenchmark(Benchmark):
                 node_numbers = [len(qubit_layout) for qubit_layout in self.custom_qubits_array]
 
         else:
-            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
+            if self.use_virtual_node:  ## if nqubits are used then with virtual node, max_num_nodes is nqubits + 1
+                max_num_nodes = self.max_num_nodes + 1
             else:
                 max_num_nodes = self.max_num_nodes
             node_numbers = list(range(self.min_num_nodes, max_num_nodes + 1))
@@ -1031,24 +1037,29 @@ class QScoreBenchmark(Benchmark):
                 else:
                     theta = get_optimal_angles(self.num_qaoa_layers)
 
-                theta_list.append(theta)
-
                 if self.backend.has_resonators():
-                    qc_opt = self.generate_maxcut_ansatz_star(graph, theta)
+                    qc_opt = self.generate_maxcut_ansatz_star(graph, theta, active_qubit_set)
                 else:
                     qc_list_temp = []
                     cz_count_temp = []
+                    theta_temp = []
                     for _ in range(self.num_trials):
                         perm = np.random.permutation(num_nodes)
                         mapping = dict(zip(graph.nodes, perm))
                         G1_permuted = nx.relabel_nodes(graph, mapping)
-                        theta = calculate_optimal_angles_for_QAOA_p1(G1_permuted)
+                        theta = (
+                            calculate_optimal_angles_for_QAOA_p1(G1_permuted)
+                            if G1_permuted.number_of_edges() != 0
+                            else [1.0, 1.0]
+                        )
                         qc_perm = self.generate_maxcut_ansatz(G1_permuted, theta)
                         transpiled_qc_temp, _ = perform_backend_transpilation([qc_perm], **transpilation_params)
                         cz_count_temp.append(transpiled_qc_temp[0].count_ops().get("cz", 0))
                         qc_list_temp.append(qc_perm)
+                        theta_temp.append(theta)
                     min_cz_index = cz_count_temp.index(min(cz_count_temp))
                     qc_opt = qc_list_temp[min_cz_index]
+                    theta_list.append(theta_temp[min_cz_index])
 
                 if len(qc_opt.count_ops()) != 0:
                     qc_list.append(qc_opt)
@@ -1144,7 +1155,6 @@ class QScoreConfiguration(BenchmarkConfigurationBase):
         min_num_nodes (int): The min number of nodes to be taken into account, which should be >= 2.
                             * Default is 2.
         max_num_nodes (int): The max number of nodes to be taken into account, which has to be <= num_qubits + 1.
-                            * Default is None
         use_virtual_node (bool): Parameter to increase the potential Qscore by +1.
                             * Default is True.
         use_classically_optimized_angles (bool): Use pre-optimised tuned parameters in the QAOA circuit.
@@ -1174,7 +1184,7 @@ class QScoreConfiguration(BenchmarkConfigurationBase):
     num_instances: int
     num_qaoa_layers: int = 1
     min_num_nodes: int = 2
-    max_num_nodes: Optional[int] = None
+    max_num_nodes: int
     use_virtual_node: bool = True
     use_classically_optimized_angles: bool = True
     choose_qubits_routine: Literal["naive", "custom"] = "naive"

{iqm_benchmarks-2.52.dist-info → iqm_benchmarks-2.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iqm-benchmarks
-Version: 2.52
+Version: 2.54
 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
@@ -19,8 +19,9 @@ Requires-Dist: networkx<4.0,>=3.3
 Requires-Dist: rustworkx>=0.16.0
 Requires-Dist: numpy<2.0,>=1.25.2
 Requires-Dist: qiskit<=1.4.2,>=1.2.4
-Requires-Dist: iqm-client[qiskit]<33.0,>=32.1.1
-Requires-Dist: iqm-station-control-client<12.0,>=11.3.1
+Requires-Dist: iqm-client[qiskit]<34.0,>=32.1.1
+Requires-Dist: qiskit-ibm-runtime<0.44.0
+Requires-Dist: iqm-station-control-client<13.0,>=11.3.1
 Requires-Dist: requests<3.0,>=2.32.3
 Requires-Dist: scikit-optimize<0.11.0,>=0.10.2
 Requires-Dist: tabulate<1.0.0,>=0.9.0

{iqm_benchmarks-2.52.dist-info → iqm_benchmarks-2.54.dist-info}/RECORD

@@ -13,10 +13,10 @@ iqm/benchmarks/compressive_gst/__init__.py,sha256=LneifgYXtcwo2jcXo7GdUEHL6_peip
 iqm/benchmarks/compressive_gst/compressive_gst.py,sha256=_thQfc9qmIJqAcS3Kg4ITEYl8Ofi8xgC_oZotrmyzVk,28484
 iqm/benchmarks/compressive_gst/gst_analysis.py,sha256=H6EQGbpI_sig69Jy6hflg6alMTtjB0t9tHftygzA2YA,41240
 iqm/benchmarks/entanglement/__init__.py,sha256=sHVVToRWRCz0LSntk1rQaoSNNeyZLPoiTjUKWZWrk1E,778
-iqm/benchmarks/entanglement/ghz.py,sha256=drTmV2JQi9ZYr2_Gl28aizFDbV4TQ2NYynsRou-6re0,45946
+iqm/benchmarks/entanglement/ghz.py,sha256=L4NyOaSlIgUjqOPzWDz8Kxob1A9d-rK7fQqNWB6fRXA,45949
 iqm/benchmarks/entanglement/graph_states.py,sha256=6qACedd3UXpiowXc9GW4QhSwO-CzHXnBA3dIC6nCIbE,62788
 iqm/benchmarks/optimization/__init__.py,sha256=_ajW_OibYLCtzU5AUv5c2zuuVYn8ZNeZUcUUSIGt51M,747
-iqm/benchmarks/optimization/qscore.py,sha256=iDbL9aKR-fgw1kQA7cdjkEjwKW6ySufs9kexXgzxwMk,46058
+iqm/benchmarks/optimization/qscore.py,sha256=7JJIVrJvmec77kSdwM4YkwJJoNBCT-LuZ7Ay8JMZ7Nc,46847
 iqm/benchmarks/quantum_volume/__init__.py,sha256=i-Q4SpDWELBw7frXnxm1j4wJRcxbIyrS5uEK_v06YHo,951
 iqm/benchmarks/quantum_volume/clops.py,sha256=EUtO-_OYBYvwqb4xY3aubI2gc2Z6cBokRzt_E0608WA,31242
 iqm/benchmarks/quantum_volume/quantum_volume.py,sha256=af9C4SdEPcYyZgQgtJYy2h_F8QWv1a0hEtN6hr4KeM0,36861
@@ -35,7 +35,7 @@ iqm/benchmarks/randomized_benchmarking/interleaved_rb/__init__.py,sha256=sq6MgN_
 iqm/benchmarks/randomized_benchmarking/interleaved_rb/interleaved_rb.py,sha256=OHoAWajCE48dRDInwQUT8VvtzKad0ExefdqvZFTaYzs,28918
 iqm/benchmarks/randomized_benchmarking/mirror_rb/__init__.py,sha256=jRKbivWCZ3xdO1k0sx-ygC3s5DUkGSModd975PoAtcg,692
 iqm/benchmarks/randomized_benchmarking/mirror_rb/mirror_rb.py,sha256=ijieNymik3BeEUpXS-m64mtgdHz9iAFELuLooHeZY0E,33252
-iqm_benchmarks-2.52.dist-info/licenses/LICENSE,sha256=2Ncb40-hqkTil78RPv3-YiJfKaJ8te9USJgliKqIdSY,11558
+iqm_benchmarks-2.54.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=MV0Pm5ap59IjhT_E3QhsZyM7lXOF1RZ9SD11zoaf43A,31781
@@ -46,7 +46,7 @@ mGST/optimization.py,sha256=x9tJ9wMQ5aONWpNpBMVtK0rwE6DRcOU33htNgrt0tx4,11015
 mGST/qiskit_interface.py,sha256=uCdn-Q9CXI2f4FQSxGUy8GmmzQhr9NhCOFb2VPj0gTs,10061
 mGST/reporting/figure_gen.py,sha256=xFPAHx1Trdqz7swn0kRqwc_jbRaNxhG9Nvx0jeitooo,25847
 mGST/reporting/reporting.py,sha256=Wss1-zFsMEhzrrXKfP-RICau80ezjDIzcN555KhSehc,34160
-iqm_benchmarks-2.52.dist-info/METADATA,sha256=sgMF6sIgC9aFl-8ylHXenilP3QSrM93s-RT30FSuEmk,10968
-iqm_benchmarks-2.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iqm_benchmarks-2.52.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
-iqm_benchmarks-2.52.dist-info/RECORD,,
+iqm_benchmarks-2.54.dist-info/METADATA,sha256=YW717J-dTO5FVIaGkmYeuZwK_FYSS71uqxvGc3-vI70,11009
+iqm_benchmarks-2.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iqm_benchmarks-2.54.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
+iqm_benchmarks-2.54.dist-info/RECORD,,