Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qiskit 1.3 deprecation pulse gate removals #2116

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Qiskit 1.3 deprecation pulse gate removals #2116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bbdd68c
Replace EfficientSU2
kt474 Jan 27, 2025
8e7dc98
Remove channel related methods
kt474 Jan 30, 2025
12b8181
Fix backend config
kt474 Jan 31, 2025
0c1eca3
Remove need of PulseDefaults
kt474 Feb 3, 2025
fcae41e
Merge branch 'main' into qiskit-1.3-removals
kt474 Feb 3, 2025
a648f3a
Add release note
kt474 Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 6 additions & 154 deletions qiskit_ibm_runtime/fake_provider/fake_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,14 @@
"""
import logging
import warnings
import collections
import json
import os
import re

from typing import List, Iterable, Union
from typing import Union

from qiskit import circuit, QuantumCircuit
from qiskit import QuantumCircuit

from qiskit.providers import BackendV2
from qiskit import pulse
from qiskit.exceptions import QiskitError
from qiskit.utils import optionals as _optionals
from qiskit.transpiler import Target
from qiskit.providers import Options
Expand Down Expand Up @@ -101,36 +97,6 @@ def __init__(self) -> None:
self._target = None
self.sim = None

if "channels" in self._conf_dict:
self._parse_channels(self._conf_dict["channels"])

def _parse_channels(self, channels: dict) -> None:
type_map = {
"acquire": pulse.AcquireChannel,
"drive": pulse.DriveChannel,
"measure": pulse.MeasureChannel,
"control": pulse.ControlChannel,
}
identifier_pattern = re.compile(r"\D+(?P<index>\d+)")

channels_map = { # type: ignore
"acquire": collections.defaultdict(list),
"drive": collections.defaultdict(list),
"measure": collections.defaultdict(list),
"control": collections.defaultdict(list),
}
for identifier, spec in channels.items():
channel_type = spec["type"]
out = re.match(identifier_pattern, identifier)
if out is None:
# Identifier is not a valid channel name format
continue
channel_index = int(out.groupdict()["index"])
qubit_index = tuple(spec["operates"]["qubits"])
chan_obj = type_map[channel_type](channel_index)
channels_map[channel_type][qubit_index].append(chan_obj)
setattr(self, "channels_map", channels_map)

def _setup_sim(self) -> None:
if _optionals.HAS_AER:
from qiskit_aer import AerSimulator # pylint: disable=import-outside-toplevel
Expand Down Expand Up @@ -279,14 +245,10 @@ def target(self) -> Target:
props = None
if self._props_dict is not None:
props = BackendProperties.from_dict(self._props_dict) # type: ignore
defaults = None
if self._defs_dict is not None:
defaults = PulseDefaults.from_dict(self._defs_dict) # type: ignore

self._target = convert_to_target(
configuration=conf,
properties=props,
defaults=defaults,
# Fake backends use the simulator backend.
# This doesn't have the exclusive constraint.
include_control_flow=True,
Expand Down Expand Up @@ -333,89 +295,10 @@ def dtm(self) -> float:
else:
return None

@property
def meas_map(self) -> List[List[int]]:
"""Return the grouping of measurements which are multiplexed
This is required to be implemented if the backend supports Pulse
scheduling.

Returns:
The grouping of measurements which are multiplexed
"""
return self._conf_dict.get("meas_map")

def drive_channel(self, qubit: int): # type: ignore
"""Return the drive channel for the given qubit.

This is required to be implemented if the backend supports Pulse
scheduling.

Returns:
DriveChannel: The Qubit drive channel
"""
drive_channels_map = getattr(self, "channels_map", {}).get("drive", {})
qubits = (qubit,)
if qubits in drive_channels_map:
return drive_channels_map[qubits][0]
return None

def measure_channel(self, qubit: int): # type: ignore
"""Return the measure stimulus channel for the given qubit.

This is required to be implemented if the backend supports Pulse
scheduling.

Returns:
MeasureChannel: The Qubit measurement stimulus line
"""
measure_channels_map = getattr(self, "channels_map", {}).get("measure", {})
qubits = (qubit,)
if qubits in measure_channels_map:
return measure_channels_map[qubits][0]
return None

def acquire_channel(self, qubit: int): # type: ignore
"""Return the acquisition channel for the given qubit.

This is required to be implemented if the backend supports Pulse
scheduling.

Returns:
AcquireChannel: The Qubit measurement acquisition line.
"""
acquire_channels_map = getattr(self, "channels_map", {}).get("acquire", {})
qubits = (qubit,)
if qubits in acquire_channels_map:
return acquire_channels_map[qubits][0]
return None

def control_channel(self, qubits: Iterable[int]): # type: ignore
"""Return the secondary drive channel for the given qubit

This is typically utilized for controlling multiqubit interactions.
This channel is derived from other channels.

This is required to be implemented if the backend supports Pulse
scheduling.

Args:
qubits: Tuple or list of qubits of the form
``(control_qubit, target_qubit)``.

Returns:
List[ControlChannel]: The multi qubit control line.
"""
control_channels_map = getattr(self, "channels_map", {}).get("control", {})
qubits = tuple(qubits)
if qubits in control_channels_map:
return control_channels_map[qubits]
return []

def run(self, run_input, **options): # type: ignore
"""Run on the fake backend using a simulator.

This method runs circuit jobs (an individual or a list of QuantumCircuit
) and pulse jobs (an individual or a list of Schedule or ScheduleBlock)
This method runs circuit jobs (an individual or a list of QuantumCircuit)
using BasicSimulator or Aer simulator and returns a
:class:`~qiskit.providers.Job` object.

Expand All @@ -427,11 +310,9 @@ def run(self, run_input, **options): # type: ignore
FakeBackendV2.

Args:
run_input (QuantumCircuit or Schedule or ScheduleBlock or list): An
run_input (QuantumCircuit or list): An
individual or a list of
:class:`~qiskit.circuit.QuantumCircuit`,
:class:`~qiskit.pulse.ScheduleBlock`, or
:class:`~qiskit.pulse.Schedule` objects to run on the backend.
:class:`~qiskit.circuit.QuantumCircuit`
options: Any kwarg options to pass to the backend for running the
config. If a key is also present in the options
attribute/object then the expectation is that the value
Expand All @@ -440,38 +321,11 @@ def run(self, run_input, **options): # type: ignore

Returns:
Job: The job object for the run

Raises:
QiskitError: If a pulse job is supplied and qiskit-aer is not installed.
"""
circuits = run_input
pulse_job = None
if isinstance(circuits, (pulse.Schedule, pulse.ScheduleBlock)):
pulse_job = True
elif isinstance(circuits, circuit.QuantumCircuit):
pulse_job = False
elif isinstance(circuits, list):
if circuits:
if all(isinstance(x, (pulse.Schedule, pulse.ScheduleBlock)) for x in circuits):
pulse_job = True
elif all(isinstance(x, circuit.QuantumCircuit) for x in circuits):
pulse_job = False
if pulse_job is None: # submitted job is invalid
raise QiskitError(
"Invalid input object %s, must be either a "
"QuantumCircuit, Schedule, or a list of either" % circuits
)
if pulse_job: # pulse job
raise QiskitError("Pulse simulation is currently not supported for V2 fake backends.")
# circuit job
if not _optionals.HAS_AER:
warnings.warn(
"Aer not found, using qiskit.BasicSimulator and no noise.", RuntimeWarning
)
if self.sim is None:
self._setup_sim()
self.sim._options = self._options
job = self.sim.run(circuits, **options)
job = self.sim.run(run_input, **options)
return job

def _get_noise_model_from_backend_v2( # type: ignore
Expand Down Expand Up @@ -621,12 +475,10 @@ def refresh(self, service: QiskitRuntimeService) -> None:

updated_configuration = BackendConfiguration.from_dict(self._conf_dict)
updated_properties = BackendProperties.from_dict(self._props_dict)
updated_defaults = PulseDefaults.from_dict(self._defs_dict)

self._target = convert_to_target(
configuration=updated_configuration,
properties=updated_properties,
defaults=updated_defaults,
include_control_flow=True,
include_fractional_gates=True,
)
Expand Down
50 changes: 1 addition & 49 deletions qiskit_ibm_runtime/ibm_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"""Module for interfacing with an IBM Quantum Backend."""

import logging
from typing import Iterable, Union, Optional, Any, List
from typing import Union, Optional, Any, List
from datetime import datetime as python_datetime
from copy import deepcopy

Expand All @@ -22,12 +22,6 @@

from qiskit.providers.backend import BackendV2 as Backend
from qiskit.providers.options import Options
from qiskit.pulse.channels import (
AcquireChannel,
ControlChannel,
DriveChannel,
MeasureChannel,
)
from qiskit.transpiler.target import Target

from .models import (
Expand Down Expand Up @@ -234,7 +228,6 @@ def _convert_to_target(self, refresh: bool = False) -> None:
self._target = convert_to_target(
configuration=self._configuration, # type: ignore[arg-type]
properties=self._properties,
defaults=self._defaults,
)

@classmethod
Expand Down Expand Up @@ -314,12 +307,10 @@ def target_history(self, datetime: Optional[python_datetime] = None) -> Target:
Returns:
Target with properties found on `datetime`
"""
self.defaults()

return convert_to_target(
configuration=self._configuration, # type: ignore[arg-type]
properties=self.properties(datetime=datetime), # pylint: disable=unexpected-keyword-arg
defaults=self._defaults,
)

def refresh(self) -> None:
Expand Down Expand Up @@ -462,45 +453,6 @@ def configuration(
"""
return self._configuration

def drive_channel(self, qubit: int) -> DriveChannel:
"""Return the drive channel for the given qubit.

Returns:
DriveChannel: The Qubit drive channel
"""
return self._configuration.drive(qubit=qubit)

def measure_channel(self, qubit: int) -> MeasureChannel:
"""Return the measure stimulus channel for the given qubit.

Returns:
MeasureChannel: The Qubit measurement stimulus line
"""
return self._configuration.measure(qubit=qubit)

def acquire_channel(self, qubit: int) -> AcquireChannel:
"""Return the acquisition channel for the given qubit.

Returns:
AcquireChannel: The Qubit measurement acquisition line.
"""
return self._configuration.acquire(qubit=qubit)

def control_channel(self, qubits: Iterable[int]) -> List[ControlChannel]:
"""Return the secondary drive channel for the given qubit

This is typically utilized for controlling multiqubit interactions.
This channel is derived from other channels.

Args:
qubits: Tuple or list of qubits of the form
``(control_qubit, target_qubit)``.

Returns:
List[ControlChannel]: The Qubit measurement acquisition line.
"""
return self._configuration.control(qubits=qubits)

def __repr__(self) -> str:
return "<{}('{}')>".format(self.__class__.__name__, self.name)

Expand Down
Loading