Skip to content

Remove opflow classes from primitives #11209

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

Closed
mberna wants to merge 1 commit into from
Closed

Remove opflow classes from primitives #11209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions qiskit/primitives/backend_estimator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

from __future__ import annotations

import typing
from collections.abc import Sequence
from itertools import accumulate

Expand All @@ -41,9 +40,6 @@
from .primitive_job import PrimitiveJob
from .utils import _circuit_key, _observable_key, init_observable

if typing.TYPE_CHECKING:
from qiskit.opflow import PauliSumOp


def _run_circuits(
circuits: QuantumCircuit | list[QuantumCircuit],
Expand Down Expand Up @@ -269,7 +265,7 @@ def _call(
def _run(
self,
circuits: tuple[QuantumCircuit, ...],
observables: tuple[BaseOperator | PauliSumOp, ...],
observables: tuple[BaseOperator, ...],
parameter_values: tuple[tuple[float, ...], ...],
**run_options,
):
Expand Down
10 changes: 3 additions & 7 deletions qiskit/primitives/base/base_estimator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
from collections.abc import Sequence
from copy import copy
from typing import Generic, TypeVar
import typing

from qiskit.utils.deprecation import deprecate_func
from qiskit.circuit import QuantumCircuit
Expand All @@ -97,9 +96,6 @@
from .base_primitive import BasePrimitive
from . import validation

if typing.TYPE_CHECKING:
from qiskit.opflow import PauliSumOp

T = TypeVar("T", bound=Job)


Expand Down Expand Up @@ -149,7 +145,7 @@ def __getattr__(self, name: str) -> any:
def run(
self,
circuits: Sequence[QuantumCircuit] | QuantumCircuit,
observables: Sequence[BaseOperator | PauliSumOp | str] | BaseOperator | PauliSumOp | str,
observables: Sequence[BaseOperator | str] | BaseOperator | str,
parameter_values: Sequence[Sequence[float]] | Sequence[float] | float | None = None,
**run_options,
) -> T:
Expand Down Expand Up @@ -218,14 +214,14 @@ def _run(
@staticmethod
@deprecate_func(since="0.46.0")
def _validate_observables(
observables: Sequence[BaseOperator | PauliSumOp | str] | BaseOperator | PauliSumOp | str,
observables: Sequence[BaseOperator | str] | BaseOperator | str,
) -> tuple[SparsePauliOp, ...]:
return validation._validate_observables(observables)

@staticmethod
@deprecate_func(since="0.46.0")
def _cross_validate_circuits_observables(
circuits: tuple[QuantumCircuit, ...], observables: tuple[BaseOperator | PauliSumOp, ...]
circuits: tuple[QuantumCircuit, ...], observables: tuple[BaseOperator, ...]
) -> None:
return validation._cross_validate_circuits_observables(circuits, observables)

Expand Down
6 changes: 1 addition & 5 deletions qiskit/primitives/estimator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

from collections.abc import Sequence
from typing import Any
import typing

import numpy as np

Expand All @@ -35,9 +34,6 @@
init_observable,
)

if typing.TYPE_CHECKING:
from qiskit.opflow import PauliSumOp


class Estimator(BaseEstimator[PrimitiveJob[EstimatorResult]]):
"""
Expand Down Expand Up @@ -130,7 +126,7 @@ def _call(
def _run(
self,
circuits: tuple[QuantumCircuit, ...],
observables: tuple[BaseOperator | PauliSumOp, ...],
observables: tuple[BaseOperator, ...],
parameter_values: tuple[tuple[float, ...], ...],
**run_options,
):
Expand Down
5 changes: 2 additions & 3 deletions test/python/primitives/test_estimator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
from qiskit.circuit import Parameter, QuantumCircuit
from qiskit.circuit.library import RealAmplitudes
from qiskit.exceptions import QiskitError
from qiskit.opflow import PauliSumOp
from qiskit.primitives import Estimator, EstimatorResult
from qiskit.primitives.base import validation
from qiskit.primitives.utils import _observable_key
Expand Down Expand Up @@ -350,7 +349,7 @@ class TestObservableValidation(QiskitTestCase):
("IXYZ", (SparsePauliOp("IXYZ"),)),
(Pauli("IXYZ"), (SparsePauliOp("IXYZ"),)),
(SparsePauliOp("IXYZ"), (SparsePauliOp("IXYZ"),)),
(PauliSumOp(SparsePauliOp("IXYZ")), (SparsePauliOp("IXYZ"),)),
(SparsePauliOp(SparsePauliOp("IXYZ")), (SparsePauliOp("IXYZ"),)),
Copy link
Copy Markdown
Member

@t-imamichi t-imamichi Nov 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to test SparsePauliOp(SparsePauliOp(...)). The test of SparsePauliOp(...) is enough.

(
["IXYZ", "ZYXI"],
(SparsePauliOp("IXYZ"), SparsePauliOp("ZYXI")),
Expand All @@ -364,7 +363,7 @@ class TestObservableValidation(QiskitTestCase):
(SparsePauliOp("IXYZ"), SparsePauliOp("ZYXI")),
),
(
[PauliSumOp(SparsePauliOp("IXYZ")), PauliSumOp(SparsePauliOp("ZYXI"))],
[SparsePauliOp(SparsePauliOp("IXYZ")), SparsePauliOp(SparsePauliOp("ZYXI"))],
(SparsePauliOp("IXYZ"), SparsePauliOp("ZYXI")),
),
)
Expand Down