diff --git a/pyproject.toml b/pyproject.toml index 81bfc303f1..2a6fefab7c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ environment = { CMAKE_GENERATOR = "Visual Studio 16 2019"} [[tool.cibuildwheel.overrides]] select = "cp3{9,10,11,12,13}-manylinux_i686" -before-all = "sed -i -e 's/^mirrorlist/#mirrorlist/' -e 's/^#baseurl/baseurl/' -e 's/mirror.centos.org/vault.centos.org/' /etc/yum.repos.d/*.repo && yum install -y wget && bash {project}/tools/install_openblas_i686.sh" +before-all = "sed -i -e 's/^mirrorlist/#mirrorlist/' -e 's/^#baseurl/baseurl/' -e 's/mirror.centos.org/vault.centos.org/' /etc/yum.repos.d/*.repo && yum install -y libatomic && yum install -y wget && bash {project}/tools/install_openblas_i686.sh && bash {project}/tools/install_rust.sh" [tool.black] line-length = 100 diff --git a/qiskit_aer/VERSION.txt b/qiskit_aer/VERSION.txt index 7eb3095a32..5f2491c5ad 100644 --- a/qiskit_aer/VERSION.txt +++ b/qiskit_aer/VERSION.txt @@ -1 +1 @@ -0.16.3 +0.16.4 diff --git a/qiskit_aer/backends/backendproperties.py b/qiskit_aer/backends/backendproperties.py index e026412509..1976201e90 100644 --- a/qiskit_aer/backends/backendproperties.py +++ b/qiskit_aer/backends/backendproperties.py @@ -17,7 +17,6 @@ import warnings from typing import Any, Iterable, Tuple, Union, Dict import dateutil.parser -from qiskit.providers.exceptions import BackendPropertyError from qiskit.utils.units import apply_prefix from qiskit.transpiler.target import Target @@ -301,7 +300,7 @@ def gate_property( Gate property as a tuple of the value and the time it was measured. Raises: - BackendPropertyError: If the property is not found or name is + ValueError: If the property is not found or name is specified but qubit is not. """ try: @@ -313,9 +312,9 @@ def gate_property( if name: result = result[name] elif name: - raise BackendPropertyError(f"Provide qubits to get {name} of {gate}") + raise ValueError(f"Provide qubits to get {name} of {gate}") except KeyError as ex: - raise BackendPropertyError(f"Could not find the desired property for {gate}") from ex + raise ValueError(f"Could not find the desired property for {gate}") from ex return result def faulty_qubits(self): @@ -396,7 +395,7 @@ def qubit_property( Qubit property as a tuple of the value and the time it was measured. Raises: - BackendPropertyError: If the property is not found. + ValueError: If the property is not found. """ try: result = self._qubits[qubit] @@ -404,7 +403,7 @@ def qubit_property( result = result[name] except KeyError as ex: formatted_name = "y '" + name + "'" if name else "ies" - raise BackendPropertyError( + raise ValueError( f"Couldn't find the propert{formatted_name} for qubit {qubit}." ) from ex return result @@ -497,12 +496,12 @@ def _apply_prefix(self, value: float, unit: str) -> float: Converted value. Raises: - BackendPropertyError: If the units aren't recognized. + ValueError: If the units aren't recognized. """ try: return apply_prefix(value, unit) except Exception as ex: - raise BackendPropertyError(f"Could not understand units: {unit}") from ex + raise ValueError(f"Could not understand units: {unit}") from ex def target_to_backend_properties(target: Target): diff --git a/qiskit_aer/noise/noise_model.py b/qiskit_aer/noise/noise_model.py index ea30295f3d..199ab75ac5 100644 --- a/qiskit_aer/noise/noise_model.py +++ b/qiskit_aer/noise/noise_model.py @@ -22,7 +22,6 @@ from qiskit.circuit import QuantumCircuit, Instruction, Delay, Reset from qiskit.circuit.library.generalized_gates import PauliGate, UnitaryGate -from qiskit.providers.exceptions import BackendPropertyError from qiskit.transpiler import PassManager from qiskit.utils import apply_prefix from .device.models import _excited_population, _truncate_t2_value @@ -412,7 +411,7 @@ def from_backend( _excited_population(freq=q.frequency, temperature=temperature) for q in all_qubit_properties ] - except BackendPropertyError: + except ValueError: excited_state_populations = None try: t1s = [prop.t1 for prop in all_qubit_properties] @@ -425,7 +424,7 @@ def from_backend( excited_state_populations=excited_state_populations, ) noise_model._custom_noise_passes.append(delay_pass) - except BackendPropertyError: + except ValueError: # Device does not have the required T1 or T2 information # in its properties pass @@ -522,7 +521,7 @@ def from_backend_properties( ) for q in range(num_qubits) ] - except BackendPropertyError: + except ValueError: excited_state_populations = None try: delay_pass = RelaxationNoisePass( @@ -536,7 +535,7 @@ def from_backend_properties( excited_state_populations=excited_state_populations, ) noise_model._custom_noise_passes.append(delay_pass) - except BackendPropertyError: + except ValueError: # Device does not have the required T1 or T2 information # in its properties pass diff --git a/test/terra/noise/test_device_models.py b/test/terra/noise/test_device_models.py index 45cf8d5f32..ff6fcb0022 100644 --- a/test/terra/noise/test_device_models.py +++ b/test/terra/noise/test_device_models.py @@ -16,15 +16,9 @@ import numpy as np from test.terra.common import QiskitAerTestCase -import qiskit from qiskit.circuit import library, Reset, Measure, Parameter from qiskit.transpiler import CouplingMap, Target, QubitProperties, InstructionProperties -if qiskit.__version__.startswith("0."): - from qiskit.providers.fake_provider import FakeQuito as Fake5QV1 -else: - from qiskit.providers.fake_provider import Fake5QV1 - from qiskit_aer.noise.device.models import basic_device_gate_errors from qiskit_aer.noise.errors.standard_errors import thermal_relaxation_error