iqm-benchmarks 2.41__py3-none-any.whl → 2.42__py3-none-any.whl

iqm/benchmarks/optimization/qscore.py

@@ -422,9 +422,6 @@ def qscore_analysis(run: BenchmarkRunResult) -> BenchmarkAnalysisResult:
     beta_ratio_list = []
     beta_ratio_std_list = []
     for num_nodes in nodes_list:
-        # Retrieve counts for all the instances within each executed node size.
-        execution_results = xrvariable_to_counts(dataset, num_nodes, num_instances)
-
         # Retrieve other dataset values
         dataset_dictionary = dataset.attrs[num_nodes]
 
@@ -433,18 +430,21 @@ def qscore_analysis(run: BenchmarkRunResult) -> BenchmarkAnalysisResult:
         qubit_to_node_list = dataset_dictionary["qubit_to_node"]
         virtual_node_list = dataset_dictionary["virtual_nodes"]
         no_edge_instances = dataset_dictionary["no_edge_instances"]
-
         cut_sizes_list = [0.0] * len(no_edge_instances)
+
+        # Retrieve counts for all the instances within each executed node size.
         instances_with_edges = set(range(num_instances)) - set(no_edge_instances)
+        num_instances_with_edges = len(instances_with_edges)
+        execution_results = xrvariable_to_counts(dataset, num_nodes, num_instances_with_edges)
 
-        for inst_idx in list(instances_with_edges):
+        for inst_idx, instance in enumerate(list(instances_with_edges)):
             cut_sizes = run_QAOA(
                 execution_results[inst_idx],
-                graph_list[inst_idx],
-                qubit_to_node_list[inst_idx],
+                graph_list[instance],
+                qubit_to_node_list[instance],
                 use_classically_optimized_angles,
                 num_qaoa_layers,
-                virtual_node_list[inst_idx],
+                virtual_node_list[instance],
             )
             cut_sizes_list.append(cut_sizes)
 
@@ -770,7 +770,7 @@ class QScoreBenchmark(Benchmark):
         for num_nodes in node_numbers:
             qc_list = []
             qc_transpiled_list: List[QuantumCircuit] = []
-            execution_results = []
+            execution_results: List[Dict[str, int]] = []
             graph_list = []
             qubit_set_list = []
             theta_list = []
@@ -789,6 +789,7 @@ class QScoreBenchmark(Benchmark):
             virtual_node_list = []
             qubit_to_node_list = []
             no_edge_instances = []
+            qc_all = []  # all circuits, including those with no edges
             for instance in range(self.num_instances):
                 qcvv_logger.debug(f"Executing graph {instance} with {num_nodes} nodes.")
                 graph = nx.generators.erdos_renyi_graph(num_nodes, 0.5, seed=seed)
@@ -839,69 +840,64 @@ class QScoreBenchmark(Benchmark):
                 theta_list.append(theta)
 
                 qc = self.generate_maxcut_ansatz(graph, theta)
-                qc_list.append(qc)
-                qubit_to_node_copy = self.qubit_to_node.copy()
-                qubit_to_node_list.append(qubit_to_node_copy)
-
-                if len(qc.count_ops()) == 0:
-                    counts = {"": 1.0}  # to handle the case of physical graph with no edges
-                    qc_transpiled_list.append([])
-                    execution_results.append(counts)
-                    qc_list.append([])
-                    qcvv_logger.debug(f"This graph instance has no edges.")
-                else:
-                    qcvv_logger.setLevel(logging.WARNING)
-                    # Account for all-to-all connected backends like Sirius
-                    if "move" in backend.architecture.gates:
-                        # If the circuit is defined on a subset of qubit_set, choose the first qubtis in the set
-                        active_qubit_set = qubit_set[: len(qc.qubits)]
-                        # All-to-all coupling map on the active qubits
-                        effective_coupling_map = [[x, y] for x in active_qubit_set for y in active_qubit_set if x != y]
-                    else:
-                        if self.choose_qubits_routine == "naive":
-                            active_qubit_set = None
-                            effective_coupling_map = self.backend.coupling_map
-                        else:
-                            active_qubit_set = qubit_set
-                            effective_coupling_map = self.backend.coupling_map.reduce(active_qubit_set)
-
-                    transpilation_params = {
-                        "backend": self.backend,
-                        "qubits": active_qubit_set,
-                        "coupling_map": effective_coupling_map,
-                        "qiskit_optim_level": self.qiskit_optim_level,
-                        "optimize_sqg": self.optimize_sqg,
-                        "routing_method": self.routing_method,
-                    }
 
-                    transpiled_qc, _ = perform_backend_transpilation([qc], **transpilation_params)
-
-                    sorted_transpiled_qc_list = {tuple(qubit_set): transpiled_qc}
-                    # Execute on the backend
-                    jobs, _ = submit_execute(
-                        sorted_transpiled_qc_list,
-                        self.backend,
-                        self.shots,
-                        self.calset_id,
-                        max_gates_per_batch=self.max_gates_per_batch,
-                        max_circuits_per_batch=self.configuration.max_circuits_per_batch,
-                        circuit_compilation_options=self.circuit_compilation_options,
-                    )
-                    qc_transpiled_list.append(transpiled_qc)
-                    qcvv_logger.setLevel(logging.INFO)
-
-                    if self.REM:
-                        rem_counts = apply_readout_error_mitigation(
-                            backend, transpiled_qc, [retrieve_all_counts(jobs)[0][0]], self.mit_shots
-                        )
-                        rem_distribution = rem_counts[0][0].nearest_probability_distribution()
-                        execution_results.append(rem_distribution)
-                    else:
-                        execution_results.append(retrieve_all_counts(jobs)[0][0])
+                if len(qc.count_ops()) != 0:
+                    qc_list.append(qc)
+                    qc_all.append(qc)
+                    qubit_to_node_copy = self.qubit_to_node.copy()
+                    qubit_to_node_list.append(qubit_to_node_copy)
+                else:
+                    qc_all.append([])
 
                 seed += 1
                 qcvv_logger.debug(f"Solved the MaxCut on graph {instance+1}/{self.num_instances}.")
 
+            qcvv_logger.setLevel(logging.WARNING)
+            if self.choose_qubits_routine == "naive":
+                active_qubit_set = None
+                effective_coupling_map = self.backend.coupling_map
+            else:
+                active_qubit_set = qubit_set
+                effective_coupling_map = self.backend.coupling_map.reduce(active_qubit_set)
+
+            transpilation_params = {
+                "backend": self.backend,
+                "qubits": active_qubit_set,
+                "coupling_map": effective_coupling_map,
+                "qiskit_optim_level": self.qiskit_optim_level,
+                "optimize_sqg": self.optimize_sqg,
+                "routing_method": self.routing_method,
+            }
+
+            transpiled_qc, _ = perform_backend_transpilation(qc_list, **transpilation_params)
+
+            sorted_transpiled_qc_list = {tuple(qubit_set): transpiled_qc}
+            # Execute on the backend
+            jobs, _ = submit_execute(
+                sorted_transpiled_qc_list,
+                self.backend,
+                self.shots,
+                self.calset_id,
+                max_gates_per_batch=self.max_gates_per_batch,
+                max_circuits_per_batch=self.configuration.max_circuits_per_batch,
+                circuit_compilation_options=self.circuit_compilation_options,
+            )
+            qc_transpiled_list.append(transpiled_qc)
+            qcvv_logger.setLevel(logging.INFO)
+            instance_with_edges = set(range(self.num_instances)) - set(no_edge_instances)
+            num_instances_with_edges = len(instance_with_edges)
+            if self.REM:
+                rem_counts = apply_readout_error_mitigation(
+                    backend, transpiled_qc, retrieve_all_counts(jobs)[0], self.mit_shots
+                )
+                execution_results.extend(
+                    rem_counts[0][instance].nearest_probability_distribution()
+                    for instance in range(num_instances_with_edges)
+                )
+                # execution_results.append(rem_distribution)
+            else:
+                execution_results.extend(retrieve_all_counts(jobs)[0])
+
             dataset.attrs.update(
                 {
                     num_nodes: {
@@ -918,10 +914,7 @@ class QScoreBenchmark(Benchmark):
 
             qcvv_logger.debug(f"Adding counts for the random graph for {num_nodes} nodes to the dataset")
             dataset, _ = add_counts_to_dataset(execution_results, str(num_nodes), dataset)
-
-            # self.untranspiled_circuits[str(num_nodes)].update({tuple(qubit_set): qc_list})
-            # self.transpiled_circuits[str(num_nodes)].update(sorted_transpiled_qc_list)
-            self.untranspiled_circuits.circuit_groups.append(CircuitGroup(name=str(num_nodes), circuits=qc_list))
+            self.untranspiled_circuits.circuit_groups.append(CircuitGroup(name=str(num_nodes), circuits=qc_all))
             self.transpiled_circuits.circuit_groups.append(
                 CircuitGroup(name=str(num_nodes), circuits=qc_transpiled_list)
             )

iqm/benchmarks/utils.py

@@ -567,35 +567,31 @@ def perform_backend_transpilation(
     # Helper function considering whether optimize_sqg is done,
     # and whether the coupling map is reduced (whether final physical layout must be fixed onto an auxiliary QC)
     def transpile_and_optimize(qc, aux_qc=None):
-        transpiled = transpile(
-            qc,
-            basis_gates=basis_gates,
-            coupling_map=coupling_map,
-            optimization_level=qiskit_optim_level,
-            initial_layout=qubits if aux_qc is None else None,
-            routing_method=routing_method,
-        )
-        if optimize_sqg:
-            transpiled = optimize_single_qubit_gates(transpiled, drop_final_rz=drop_final_rz)
         if backend.has_resonators():
+            coupling_map_red = (
+                backend.coupling_map.reduce(qubits[: qc.num_qubits]) if aux_qc is not None else coupling_map
+            )
             transpiled = transpile_to_IQM(
-                qc, backend=backend, optimize_single_qubits=optimize_sqg, remove_final_rzs=drop_final_rz
+                qc,
+                backend=backend,
+                optimize_single_qubits=optimize_sqg,
+                remove_final_rzs=drop_final_rz,
+                coupling_map=coupling_map_red,
+                # initial_layout=qubits if aux_qc is None else None,
             )
-        if aux_qc is not None:
-            if backend.has_resonators():
-                if backend.num_qubits in qubits:
-                    raise ValueError(
-                        f"Label {backend.num_qubits} is reserved for Resonator - "
-                        f"Please specify computational qubit labels {np.arange(backend.num_qubits)}"
-                    )
-                backend_topology = "star"
-                transpiled = reduce_to_active_qubits(transpiled, backend_topology, backend.num_qubits)
-                transpiled = aux_qc.compose(
-                    transpiled, qubits=qubits + [backend.num_qubits], clbits=list(range(qc.num_clbits))
-                )
-            else:
+        else:
+            transpiled = transpile(
+                qc,
+                basis_gates=basis_gates,
+                coupling_map=coupling_map,
+                optimization_level=qiskit_optim_level,
+                initial_layout=qubits if aux_qc is None else None,
+                routing_method=routing_method,
+            )
+            if aux_qc is not None:
                 transpiled = aux_qc.compose(transpiled, qubits=qubits, clbits=list(range(qc.num_clbits)))
-
+            if optimize_sqg:
+                transpiled = optimize_single_qubit_gates(transpiled, drop_final_rz=drop_final_rz)
         return transpiled
 
     qcvv_logger.info(
@@ -607,7 +603,7 @@ def perform_backend_transpilation(
         transpiled_qc_list = [transpile_and_optimize(qc) for qc in qc_list]
     else:  # The coupling map will be reduced if the physical layout is to be fixed
         if backend.has_resonators():
-            aux_qc_list = [QuantumCircuit(backend.num_qubits + 1, q.num_clbits) for q in qc_list]
+            aux_qc_list = [QuantumCircuit(backend.num_qubits, q.num_clbits) for q in qc_list]
         else:
             aux_qc_list = [QuantumCircuit(backend.num_qubits, q.num_clbits) for q in qc_list]
         transpiled_qc_list = [transpile_and_optimize(qc, aux_qc=aux_qc_list[idx]) for idx, qc in enumerate(qc_list)]

{iqm_benchmarks-2.41.dist-info → iqm_benchmarks-2.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iqm-benchmarks
-Version: 2.41
+Version: 2.42
 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.41.dist-info → iqm_benchmarks-2.42.dist-info}/RECORD

@@ -4,7 +4,7 @@ iqm/benchmarks/benchmark_definition.py,sha256=e4xe0wlWKZqj48_6-zTglMaMeoiA9aGkHr
 iqm/benchmarks/circuit_containers.py,sha256=anEtZEsodYqOX-34oZRmuKGeEpp_VfgG5045Mz4-4hI,7562
 iqm/benchmarks/logging_config.py,sha256=U7olP5Kr75AcLJqNODf9VBhJLVqIvA4AYR6J39D5rww,1052
 iqm/benchmarks/readout_mitigation.py,sha256=Q2SOGWTNgmklOYkNxepAaSaXlxSj0QQyymYY1bOkT8A,11756
-iqm/benchmarks/utils.py,sha256=HUiLUBwlYwQbQivcswRLkSZuSwhXmroxiu9MMnxcnNI,41381
+iqm/benchmarks/utils.py,sha256=sItoMsfUYiMWTSCNOTe_RWi2l1xTf2slvXkFiEMRwKU,41091
 iqm/benchmarks/utils_plots.py,sha256=Q4h7gcKXf8Eizm13P0yL2I_P-QobHVFr9JCV83wrUi8,14942
 iqm/benchmarks/utils_shadows.py,sha256=e77PV_uaAO5m_woox9lAzompKAvFeDJ-0AKJrNJ7NFg,9728
 iqm/benchmarks/compressive_gst/__init__.py,sha256=LneifgYXtcwo2jcXo7GdUEHL6_peipukShhkrdaTRCA,929
@@ -14,7 +14,7 @@ iqm/benchmarks/entanglement/__init__.py,sha256=sHVVToRWRCz0LSntk1rQaoSNNeyZLPoiT
 iqm/benchmarks/entanglement/ghz.py,sha256=12bf9ANfgzyR7Vs8REO-Xm68gisqn8Q7_WSfaNnAmOk,41213
 iqm/benchmarks/entanglement/graph_states.py,sha256=7GMxuhbOeQXc3hn3yAwp51S-F-1qaP0AYXm6JtuL9gA,62560
 iqm/benchmarks/optimization/__init__.py,sha256=_ajW_OibYLCtzU5AUv5c2zuuVYn8ZNeZUcUUSIGt51M,747
-iqm/benchmarks/optimization/qscore.py,sha256=C7_Vaj_JnjipBJacaa-rhH70Wgct3y1uzPMurZ4wPco,38068
+iqm/benchmarks/optimization/qscore.py,sha256=D2BVVNAqO32uGu5_kLVl2XJUOBlRl1C-c6zYenaCBMg,37259
 iqm/benchmarks/quantum_volume/__init__.py,sha256=i-Q4SpDWELBw7frXnxm1j4wJRcxbIyrS5uEK_v06YHo,951
 iqm/benchmarks/quantum_volume/clops.py,sha256=fLY0aPHjNbW33SuVM9brAgBYFncDHjY5Bwh6iXzbjiU,31099
 iqm/benchmarks/quantum_volume/quantum_volume.py,sha256=pro7Lz-A5pPpT9UZ8wtXKTyhdWmTjQjRHt4BylDR-3U,36553
@@ -33,7 +33,7 @@ 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=jRKbivWCZ3xdO1k0sx-ygC3s5DUkGSModd975PoAtcg,692
 iqm/benchmarks/randomized_benchmarking/mirror_rb/mirror_rb.py,sha256=n_5gt9636ZDMsM9hC3Zm5qP2bQr2sy41zxGhOh0XMjI,32932
-iqm_benchmarks-2.41.dist-info/licenses/LICENSE,sha256=2Ncb40-hqkTil78RPv3-YiJfKaJ8te9USJgliKqIdSY,11558
+iqm_benchmarks-2.42.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
@@ -44,7 +44,7 @@ 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.41.dist-info/METADATA,sha256=dhrtXPKZVscHp004aaBgn50XtkkakMKYT2wswyxZYfU,10872
-iqm_benchmarks-2.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iqm_benchmarks-2.41.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
-iqm_benchmarks-2.41.dist-info/RECORD,,
+iqm_benchmarks-2.42.dist-info/METADATA,sha256=JBIVb_IKpTjclpuMILV4Gmo3nZhs3FhwU5vsOtTjLPc,10872
+iqm_benchmarks-2.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iqm_benchmarks-2.42.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
+iqm_benchmarks-2.42.dist-info/RECORD,,