iqm-benchmarks 2.17__py3-none-any.whl → 2.19__py3-none-any.whl

iqm/benchmarks/optimization/qscore.py

@@ -602,6 +602,7 @@ class QScoreBenchmark(Benchmark):
         self.session_timestamp = strftime("%Y%m%d-%H%M%S")
         self.execution_timestamp = ""
         self.seed = configuration.seed
+        self.qpu_topology = configuration.qpu_topology
 
         self.graph_physical: Graph
         self.virtual_nodes: List[Tuple[int, int]]
@@ -747,11 +748,16 @@ class QScoreBenchmark(Benchmark):
         dataset = xr.Dataset()
         self.add_all_meta_to_dataset(dataset)
 
-        if self.max_num_nodes is None or self.max_num_nodes == self.backend.num_qubits + 1:
+        if self.qpu_topology == "star":
+            nqubits = self.backend.num_qubits - 1  # need to leave out the resonator
+        else:
+            nqubits = self.backend.num_qubits
+
+        if self.max_num_nodes is None or self.max_num_nodes == nqubits + 1:
             if self.use_virtual_node:
-                max_num_nodes = self.backend.num_qubits + 1
+                max_num_nodes = nqubits + 1
             else:
-                max_num_nodes = self.backend.num_qubits
+                max_num_nodes = nqubits
         else:
             max_num_nodes = self.max_num_nodes
 
@@ -808,7 +814,6 @@ class QScoreBenchmark(Benchmark):
                     qcvv_logger.debug(f"Graph {instance+1}/{self.num_instances} had no edges: cut size = 0.")
 
                 # Choose the qubit layout
-
                 if self.choose_qubits_routine.lower() == "naive":
                     qubit_set = self.choose_qubits_naive(updated_num_nodes)
                 elif (
@@ -932,9 +937,11 @@ class QScoreConfiguration(BenchmarkConfigurationBase):
                             * Default is True.
         choose_qubits_routine (Literal["custom"]): The routine to select qubit layouts.
                             * Default is "custom".
-        min_num_qubits (int): Minumum number of qubits. 
+        min_num_qubits (int): Minumum number of qubits.
                             * Default is 2
         custom_qubits_array (Optional[Sequence[Sequence[int]]]): The physical qubit layouts to perform the benchmark on.
+                            If virtual_node is set to True, then a given graph with n nodes requires n-1 selected qubits.
+                            If virtual_node is set to False, then a given graph with n nodes requires n selected qubits.
                             * Default is None.
         qiskit_optim_level (int): The Qiskit transpilation optimization level.
                             * Default is 3.
@@ -946,6 +953,8 @@ class QScoreConfiguration(BenchmarkConfigurationBase):
                             * Default is False.
         mit_shots: (int): Number of shots used in readout error mitigation.
                             * Default is 1000.
+        qpu_topology: (str): Topology of the QPU, either "crystal" or "star".
+                            * Default is "crystal".
     """
 
     benchmark: Type[Benchmark] = QScoreBenchmark
@@ -963,3 +972,4 @@ class QScoreConfiguration(BenchmarkConfigurationBase):
     seed: int = 1
     REM: bool = False
     mit_shots: int = 1000
+    qpu_topology: str = "crystal"

iqm/benchmarks/readout_mitigation.py

@@ -198,29 +198,20 @@ class M3IQM(mthree.M3Mitigation):
             trans_qcs[(num_jobs - 1) * circ_slice :]
         ]
         # Do job submission here
-        # This Backend check is here for Qiskit direct access.  Should be removed later.
         jobs = []
-        if not isinstance(self.system, Backend):
-            for circs in circs_list:
-                transpiled_circuit = transpile(circs, self.system, optimization_level=0)
+        for circs in circs_list:
+            transpiled_circuit = transpile(circs, self.system, optimization_level=0)
+            if cal_id is None:
                 _job = self.system.run(transpiled_circuit, shots=shots, rep_delay=self.rep_delay)
-                jobs.append(_job)
-
-        # *****************************************
-        else:  # That's what IQM backend do!
-            # *****************************************
-            for circs in circs_list:
-                if cal_id is None:
-                    _job = self.system.run(circs, shots=shots, rep_delay=self.rep_delay)
-                else:
-                    _job = self.system.run(
-                        circs,
-                        shots=shots,
-                        rep_delay=self.rep_delay,
-                        calibration_set_id=cal_id,
-                    )
-                jobs.append(_job)
-                qcvv_logger.info(f"REM: {len(circs)} calibration circuits to be executed!")
+            else:
+                _job = self.system.run(
+                    transpiled_circuit,
+                    shots=shots,
+                    rep_delay=self.rep_delay,
+                    calibration_set_id=cal_id,
+                )
+            jobs.append(_job)
+            qcvv_logger.info(f"REM: {len(circs)} calibration circuits to be executed!")
 
         # Execute job and cal building in new thread.
         self._job_error = None

{iqm_benchmarks-2.17.dist-info → iqm_benchmarks-2.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: iqm-benchmarks
-Version: 2.17
+Version: 2.19
 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>
 Project-URL: Homepage, https://github.com/iqm-finland/iqm-benchmarks

{iqm_benchmarks-2.17.dist-info → iqm_benchmarks-2.19.dist-info}/RECORD

@@ -3,7 +3,7 @@ iqm/benchmarks/benchmark.py,sha256=SGhBcSxLPUu-cVXAjG4Db2TRobFCRBYoE1NtTDK1lJg,4
 iqm/benchmarks/benchmark_definition.py,sha256=AZkvANrf0_0glbq_P_uo_YqbBU9IZa2gJlMVz6qT6VU,10500
 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=7FlbSH-RJTtQuRYLChwkQV_vBv0ZfMQTH519cAbyxQ4,12252
+iqm/benchmarks/readout_mitigation.py,sha256=HLRka3LAlOiH0XdsQCAXmU1K8QVAbG29O_WJj1qv1Dg,11765
 iqm/benchmarks/utils.py,sha256=wOgf8x1Z-DsVUL5KQSaKXjGDXDBSvhmwg4Qo-vTOoo0,21172
 iqm/benchmarks/compressive_gst/__init__.py,sha256=LneifgYXtcwo2jcXo7GdUEHL6_peipukShhkrdaTRCA,929
 iqm/benchmarks/compressive_gst/compressive_gst.py,sha256=spq6jP0NLbjaJDzESpbfRPs0N_YheFWl2Wa6USHS5sI,22398
@@ -11,7 +11,7 @@ iqm/benchmarks/compressive_gst/gst_analysis.py,sha256=PxCThBfh2zdQpipI-6gAvLKdmk
 iqm/benchmarks/entanglement/__init__.py,sha256=9T7prOwqMmFWdb4t6ETAHZXKK5o6FvU2DvVb6WhNi-U,682
 iqm/benchmarks/entanglement/ghz.py,sha256=0C3zppwGGn_gIkxRWkV_mYqpkygZsu1Ap-xV9PcN0wY,42668
 iqm/benchmarks/optimization/__init__.py,sha256=_ajW_OibYLCtzU5AUv5c2zuuVYn8ZNeZUcUUSIGt51M,747
-iqm/benchmarks/optimization/qscore.py,sha256=q2gIU2blRagLfA6fU_iDg6WjdFgWMIqnKVvGgr-t3bI,36943
+iqm/benchmarks/optimization/qscore.py,sha256=xAv97MRVUNB_YjRbxzM6Ph0Pz0ctJjSA46J9lrbwe-w,37541
 iqm/benchmarks/quantum_volume/__init__.py,sha256=i-Q4SpDWELBw7frXnxm1j4wJRcxbIyrS5uEK_v06YHo,951
 iqm/benchmarks/quantum_volume/clops.py,sha256=aLxq2sC6cvRmtbmgr7TvluE2edkARH_ZzpTD1LEQEjw,30957
 iqm/benchmarks/quantum_volume/quantum_volume.py,sha256=njX5lBty9jcWMuJnl7uNqRfwE9akMe5gcX-f1_uYDXk,36791
@@ -36,8 +36,8 @@ mGST/optimization.py,sha256=YHwkzIkYvsZOPjclR-BCQWh24jeqjuXp0BB0WX5Lwow,10559
 mGST/qiskit_interface.py,sha256=L4H-4SdhP_bjSFFvpQoF1E7EyGbIJ_CI_y4a7_YEwmU,10102
 mGST/reporting/figure_gen.py,sha256=6Xd8vwfy09hLY1YbJY6TRevuMsQSU4MsWqemly3ZO0I,12970
 mGST/reporting/reporting.py,sha256=We1cccz9BKbITYcSlZHdmBGdjMWAa1xNZe5tKP-yh_E,26004
-iqm_benchmarks-2.17.dist-info/LICENSE,sha256=2Ncb40-hqkTil78RPv3-YiJfKaJ8te9USJgliKqIdSY,11558
-iqm_benchmarks-2.17.dist-info/METADATA,sha256=V6mJE3LgQJMGIX3pzLmu_UQ-WhWfJSKnQJy0QpnCqzs,10286
-iqm_benchmarks-2.17.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-iqm_benchmarks-2.17.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
-iqm_benchmarks-2.17.dist-info/RECORD,,
+iqm_benchmarks-2.19.dist-info/LICENSE,sha256=2Ncb40-hqkTil78RPv3-YiJfKaJ8te9USJgliKqIdSY,11558
+iqm_benchmarks-2.19.dist-info/METADATA,sha256=dcQbluz1EOWN1M-n7hymt641XmnXgbAQKsN9NqbRVLY,10286
+iqm_benchmarks-2.19.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+iqm_benchmarks-2.19.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
+iqm_benchmarks-2.19.dist-info/RECORD,,