iqm-benchmarks 2.2__py3-none-any.whl → 2.4__py3-none-any.whl

iqm/benchmarks/quantum_volume/quantum_volume.py

@@ -322,11 +322,10 @@ def qv_analysis(run: BenchmarkRunResult) -> BenchmarkAnalysisResult:
         execution_results[str(qubits)] = xrvariable_to_counts(dataset, str(qubits), num_circuits)
 
         # Retrieve other dataset values
-        dataset_dictionary = dataset.attrs[qubits_idx]
-        sorted_qc_list_indices = dataset_dictionary["sorted_qc_list_indices"]
-        qc_list = run.circuits["transpiled_circuits"][str(qubits)].circuits
+        sorted_qc_list_indices = dataset.attrs[qubits_idx]["sorted_qc_list_indices"]
+        qc_list = run.circuits["untranspiled_circuits"][str(qubits)].circuits
 
-        qv_results_type[str(qubits)] = dataset_dictionary["qv_results_type"]
+        qv_results_type[str(qubits)] = dataset.attrs[qubits_idx]["qv_results_type"]
         depth[str(qubits)] = len(qubits)
 
         # Simulate the circuits and get the ideal heavy outputs
@@ -358,12 +357,14 @@ def qv_analysis(run: BenchmarkRunResult) -> BenchmarkAnalysisResult:
 
         dataset.attrs[qubits_idx].update(
             {
-                "sorted_qc_list_indices": (sorted_qc_list_indices if rem or physical_layout == "batching" else None),
                 "cumulative_average_heavy_output_probability": cumulative_hop(qv_result),
                 "cumulative_stddev_heavy_output_probability": cumulative_std(qv_result),
                 "heavy_output_probabilities": qv_result,
             }
         )
+        # Remove sorted_qc_list_indices from dataset if using physical_layout = "fixed"
+        if physical_layout == "fixed" and rem is None:
+            del dataset.attrs[qubits_idx]["sorted_qc_list_indices"]
 
         fig_name, fig = plot_hop_threshold(
             qubits,
@@ -384,12 +385,11 @@ def qv_analysis(run: BenchmarkRunResult) -> BenchmarkAnalysisResult:
     mit_shots = dataset.attrs["mit_shots"]
     rem_quasidistros = dataset.attrs["REM_quasidistributions"]
     for qubits_idx, qubits in enumerate(qubit_layouts):
-        qcvv_logger.info(f"REM post-processing for layout {qubits}")
-        # Retrieve
-        dataset_dictionary = dataset.attrs[qubits_idx]
+        qcvv_logger.info(f"REM post-processing for layout {qubits} with {mit_shots} shots")
 
-        qcvv_logger.info(f"Applying REM with {mit_shots} shots")
-        sorted_qc_list_indices = dataset_dictionary["sorted_qc_list_indices"]
+        # Remove sorted_qc_list_indices from dataset if using physical_layout = "fixed"
+        if physical_layout == "fixed":
+            del dataset.attrs[qubits_idx]["sorted_qc_list_indices"]
 
         qv_result_rem = get_rem_hops(
             rem_quasidistros[f"REM_quasidist_{str(qubits)}"],
@@ -398,7 +398,6 @@ def qv_analysis(run: BenchmarkRunResult) -> BenchmarkAnalysisResult:
 
         dataset.attrs[qubits_idx].update(
             {
-                "sorted_qc_list_indices": (sorted_qc_list_indices if physical_layout == "batching" else None),
                 "REM_cumulative_average_heavy_output_probability": cumulative_hop(qv_result_rem),
                 "REM_cumulative_stddev_heavy_output_probability": cumulative_std(qv_result_rem),
                 "REM_heavy_output_probabilities": qv_result_rem,

iqm/benchmarks/readout_mitigation.py

@@ -14,7 +14,6 @@
 """M3 modification for readout mitigation at IQM QPU's."""
 import logging
 from math import ceil
-import sys
 import threading
 from typing import Any, Dict, Iterable, List
 import warnings
@@ -28,6 +27,7 @@ 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 iqm.benchmarks.logging_config import qcvv_logger
 from iqm.benchmarks.utils import get_iqm_backend, timeit
 from iqm.qiskit_iqm import IQMCircuit as QuantumCircuit
 from iqm.qiskit_iqm.iqm_backend import IQMBackendBase
@@ -220,7 +220,7 @@ class M3IQM(mthree.M3Mitigation):
                         calibration_set_id=cal_id,
                     )
                 jobs.append(_job)
-                print(f"{len(circs)} calibration circuits ready to be executed!")
+                qcvv_logger.info(f"REM: {len(circs)} calibration circuits to be executed!")
 
         # Execute job and cal building in new thread.
         self._job_error = None
@@ -265,11 +265,8 @@ def apply_readout_error_mitigation(
     Returns:
         tuple[Any, Any] | tuple[QuasiCollection, list] | QuasiCollection: a list of dictionaries with REM-corrected quasiprobabilities for each outcome.
     """
-    # M3IQM uses mthree.mitigation, which for some reason displays many INFO messages
-    # Not sure if this is the best way to suppress them; MODIFY IF NECESSARY !
-    warnings.warn("Suppressing INFO messages from M3IQM with logging.disable(sys.maxsize) - update if problematic!")
-    logging.disable(sys.maxsize)
-
+    # M3IQM uses mthree.mitigation, which for some reason displays way too many INFO messages
+    logging.getLogger().setLevel(logging.WARN)
     if isinstance(backend_arg, str):
         backend = get_iqm_backend(backend_arg)
     else:
@@ -282,5 +279,6 @@ def apply_readout_error_mitigation(
     mit.cals_from_system(qubits_rem, shots=mit_shots)
     # Apply the REM correction to the given measured counts
     rem_quasidistro = [mit.apply_correction(c, q) for c, q in zip(counts, qubits_rem)]
+    logging.getLogger().setLevel(logging.INFO)
 
     return rem_quasidistro

{iqm_benchmarks-2.2.dist-info → iqm_benchmarks-2.4.dist-info}/METADATA

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

{iqm_benchmarks-2.2.dist-info → iqm_benchmarks-2.4.dist-info}/RECORD

@@ -1,10 +1,9 @@
 iqm/benchmarks/__init__.py,sha256=sAS6OKctANSzgVUEUWugQs9mcKwG9KOTBEsbSYGxtPc,2201
 iqm/benchmarks/benchmark.py,sha256=SGhBcSxLPUu-cVXAjG4Db2TRobFCRBYoE1NtTDK1lJg,4432
 iqm/benchmarks/benchmark_definition.py,sha256=AZkvANrf0_0glbq_P_uo_YqbBU9IZa2gJlMVz6qT6VU,10500
-iqm/benchmarks/benchmark_experiment.py,sha256=ynbsQS92v6soIgkDEdm3ygNO7f82-dhg7qB1l8jvSFM,6614
 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=6lWtDyc0-3WMtVrlwsbC60Ba_xaCDblzdKc34nBbPXg,12327
+iqm/benchmarks/readout_mitigation.py,sha256=7FlbSH-RJTtQuRYLChwkQV_vBv0ZfMQTH519cAbyxQ4,12252
 iqm/benchmarks/utils.py,sha256=BNbPeNNiFfE72Y-coVjLK3O7y7-j1Ag-l_qyBQsxXRY,20278
 iqm/benchmarks/compressive_gst/__init__.py,sha256=4F_5YxExn4ysGQaEs-WNfm0yiFBxkKtGAYBZFWnRsSk,915
 iqm/benchmarks/compressive_gst/compressive_gst.py,sha256=pzkqFQQXEZZJmQgwyLo2_eF3rcK3BwXAj5QfY4poczY,21206
@@ -12,10 +11,10 @@ iqm/benchmarks/compressive_gst/gst_analysis.py,sha256=qaF9zDIadPGe9I0l_SC3EfnODZ
 iqm/benchmarks/entanglement/__init__.py,sha256=9T7prOwqMmFWdb4t6ETAHZXKK5o6FvU2DvVb6WhNi-U,682
 iqm/benchmarks/entanglement/ghz.py,sha256=qg6mw1RydosKdc2KoPi6M3q0Ek7eMBPIkWOJC2ZDx8M,39446
 iqm/benchmarks/optimization/__init__.py,sha256=_ajW_OibYLCtzU5AUv5c2zuuVYn8ZNeZUcUUSIGt51M,747
-iqm/benchmarks/optimization/qscore.py,sha256=pTDRrNI2kkujqb5IoaPTiq9MS8OZd9M8Gv0G2Jn3Ka0,28078
+iqm/benchmarks/optimization/qscore.py,sha256=6I13YbFvFq1RcX4mYTw6S4ALb4Ix9t7gjlRzZbaTARM,34038
 iqm/benchmarks/quantum_volume/__init__.py,sha256=i-Q4SpDWELBw7frXnxm1j4wJRcxbIyrS5uEK_v06YHo,951
 iqm/benchmarks/quantum_volume/clops.py,sha256=j6BPEj1rKBAHigox7nrvaTLyb4iCrHadBl2d1yiETDA,30956
-iqm/benchmarks/quantum_volume/quantum_volume.py,sha256=8UHDyw1aVXnmo9DpK_qGcfa_NLS148a2YdYNDS4NE78,36870
+iqm/benchmarks/quantum_volume/quantum_volume.py,sha256=PPg1kZA5Lx9b24iFVgP_VcgymI6CsD5LfB5Ppfk8TBM,36814
 iqm/benchmarks/randomized_benchmarking/__init__.py,sha256=IkKo-7zUChxZZd3my_csQCJfJfZNsV3-JTvdG8uqys4,734
 iqm/benchmarks/randomized_benchmarking/clifford_1q.pkl,sha256=vvSd0pRWxtzyirohO9yf_58mjevkc2-pbuWIEb-4gaw,46928
 iqm/benchmarks/randomized_benchmarking/clifford_2q.pkl,sha256=ZipqU3crPhz2T35qGFgB4GvMyoi_7pnu8NqW5ZP8NXg,90707258
@@ -37,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=-XBy3OCJIMOsA8cApwKjhVKBwnjSAoxm-voHNbRWytM,25803
-iqm_benchmarks-2.2.dist-info/LICENSE,sha256=2Ncb40-hqkTil78RPv3-YiJfKaJ8te9USJgliKqIdSY,11558
-iqm_benchmarks-2.2.dist-info/METADATA,sha256=OYot1WoGYKIbfRdSkf_eyho1lRnJLbUDQ6uR_c_2QD8,9103
-iqm_benchmarks-2.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-iqm_benchmarks-2.2.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
-iqm_benchmarks-2.2.dist-info/RECORD,,
+iqm_benchmarks-2.4.dist-info/LICENSE,sha256=2Ncb40-hqkTil78RPv3-YiJfKaJ8te9USJgliKqIdSY,11558
+iqm_benchmarks-2.4.dist-info/METADATA,sha256=Z-c61lqfGdVvhQmYjB7olZYAJyd9pbA7thPWahqFy4E,9103
+iqm_benchmarks-2.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+iqm_benchmarks-2.4.dist-info/top_level.txt,sha256=3G23Z-1LGf-IOzTCUl6QwWqiQ3USz25Zt90Ihq192to,9
+iqm_benchmarks-2.4.dist-info/RECORD,,

iqm/benchmarks/benchmark_experiment.py

@@ -1,163 +0,0 @@
-# Copyright 2024 IQM Benchmarks developers
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""
-Generic Benchmark Experiment class
-"""
-
-from copy import deepcopy
-from json import dump
-from pathlib import Path
-import pickle
-from time import strftime
-from typing import List, Optional, OrderedDict, Union
-
-from iqm.benchmarks.benchmark import BenchmarkBase, BenchmarkConfigurationBase
-from iqm.benchmarks.logging_config import qcvv_logger
-from iqm.benchmarks.utils import get_iqm_backend
-from iqm.qiskit_iqm.iqm_backend import IQMBackendBase
-
-
-class BenchmarkExperiment:
-    """
-    A Benchmark Experiment wraps the execution of one or more benchmarks, checks their requirements are met, stores the
-    execution results and plots relevant figures.
-    """
-
-    def __init__(
-        self,
-        backend: Union[str, IQMBackendBase],
-        benchmark_configurations: List[BenchmarkConfigurationBase],
-        device_id: Optional[str] = None,
-    ):
-        """Construct the BenchmarkExperiment class.
-
-        Args:
-            backend (str | IQMBackendBase): the backend to execute the benchmarks on
-            benchmark_configurations (List[BenchmarkConfigurationBase]): the configuration(s) of the benchmark(s)
-            device_id (Optional[str], optional): the identifier of the device. Defaults to None.
-
-        Raises:
-            ValueError: backend not supported. Try 'garnet' or 'iqmfakeadonis'
-        """
-        self.timestamp = strftime("%Y%m%d-%H%M%S")
-
-        if isinstance(backend, str):
-            self.backend = get_iqm_backend(backend)
-        else:
-            assert isinstance(backend, IQMBackendBase)
-            self.backend = backend
-
-        self.device_id = device_id if device_id is not None else self.backend.name
-
-        benchmarks: OrderedDict[str, BenchmarkBase] = OrderedDict(
-            (config.benchmark.name(), config.benchmark(self.backend, config)) for config in benchmark_configurations
-        )
-
-        for benchmark in benchmarks.values():
-            benchmarks_copy = deepcopy(benchmarks)
-            benchmarks_copy = benchmark.check_requirements(benchmarks_copy)
-        self.benchmarks = benchmarks_copy
-
-    def run_experiment(self) -> None:
-        """Run the Benchmark experiment, and store the configuration, raw data, results and figures."""
-
-        for name, benchmark in self.benchmarks.items():
-            qcvv_logger.info("\nNow executing " + name)
-            # Create the directory for results
-            results_dir = f"Outputs/{self.device_id}/{self.timestamp}/{name}/"
-            Path(results_dir).mkdir(parents=True, exist_ok=True)
-
-            # Execute the current benchmark
-            benchmark.generate_requirements(self.benchmarks)
-            benchmark.execute_full_benchmark()
-
-            # Create configuration JSON file
-            with open(
-                f"{results_dir}{self.device_id}_{self.timestamp}_{name}_configuration.json",
-                "w",
-                encoding="utf-8",
-            ) as f_configuration:
-                dump(benchmark.serializable_configuration.model_dump(), f_configuration)
-
-            # Create untranspiled circuit files
-            if benchmark.untranspiled_circuits:
-                for key_qubits in benchmark.untranspiled_circuits.keys():
-                    for key_depth in benchmark.untranspiled_circuits[key_qubits].keys():
-                        with open(
-                            f"{results_dir}{self.device_id}_{self.timestamp}_{name}_qubits_{key_qubits}_depth_{key_depth}_untranspiled.pkl",
-                            "wb",
-                        ) as f_circuits:
-                            pickle.dump(
-                                benchmark.untranspiled_circuits[key_qubits][key_depth],
-                                f_circuits,
-                            )
-
-            # Create transpiled circuit files
-            for key_qubits in benchmark.transpiled_circuits.keys():
-                for key_depth in benchmark.transpiled_circuits[key_qubits].keys():
-                    with open(
-                        f"{results_dir}{self.device_id}_{self.timestamp}_{name}_qubits_{key_qubits}_depth_{key_depth}_transpiled.pkl",
-                        "wb",
-                    ) as f_circuits:
-                        pickle.dump(
-                            benchmark.transpiled_circuits[key_qubits][key_depth],
-                            f_circuits,
-                        )
-
-            # Create raw result pickle files
-            with open(
-                f"{results_dir}{self.device_id}_{self.timestamp}_{name}_raw_results.pkl",
-                "wb",
-            ) as f_raw_results:
-                pickle.dump(
-                    benchmark.raw_results,
-                    f_raw_results,
-                )
-
-            # Create raw data JSON file
-            with open(
-                f"{results_dir}{self.device_id}_{self.timestamp}_{name}_raw_data.json",
-                "w",
-                encoding="utf-8",
-            ) as f_raw_data:
-                dump(benchmark.raw_data, f_raw_data)
-
-            # Create job metadata JSON file
-            with open(
-                f"{results_dir}{self.device_id}_{self.timestamp}_{name}_job_metadata.json",
-                "w",
-                encoding="utf-8",
-            ) as f_job_metadata:
-                dump(benchmark.job_meta, f_job_metadata)
-
-            # Create results JSON file
-            with open(
-                f"{results_dir}{self.device_id}_{self.timestamp}_{name}_results.json",
-                "w",
-                encoding="utf-8",
-            ) as f_results:
-                dump(benchmark.results, f_results)
-
-            # Create figures
-            Path(f"{results_dir}figures/").mkdir(parents=True, exist_ok=True)
-            for fig_name, fig in benchmark.figures.items():
-                fig.savefig(
-                    f"{results_dir}figures/{self.device_id}_{self.timestamp}_{name}_{fig_name}",
-                    dpi=250,
-                    bbox_inches="tight",
-                )
-
-            # Save benchmark
-            self.benchmarks[benchmark.name()] = benchmark