From 1d4c1be9eda4fd01f04262a1833a96f552b41bbf Mon Sep 17 00:00:00 2001 From: Mariana C Bernagozzi Date: Mon, 6 Nov 2023 23:08:12 -0500 Subject: [PATCH] Remove opflow classes from primitives --- qiskit/primitives/backend_estimator.py | 6 +----- qiskit/primitives/base/base_estimator.py | 10 +++------- qiskit/primitives/estimator.py | 6 +----- test/python/primitives/test_estimator.py | 5 ++--- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/qiskit/primitives/backend_estimator.py b/qiskit/primitives/backend_estimator.py index 3805f2b6fb52..ec361f18bf25 100644 --- a/qiskit/primitives/backend_estimator.py +++ b/qiskit/primitives/backend_estimator.py @@ -15,7 +15,6 @@ from __future__ import annotations -import typing from collections.abc import Sequence from itertools import accumulate @@ -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], @@ -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, ): diff --git a/qiskit/primitives/base/base_estimator.py b/qiskit/primitives/base/base_estimator.py index b789863a812d..93b497f02049 100644 --- a/qiskit/primitives/base/base_estimator.py +++ b/qiskit/primitives/base/base_estimator.py @@ -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 @@ -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) @@ -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: @@ -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) diff --git a/qiskit/primitives/estimator.py b/qiskit/primitives/estimator.py index 69f36e1723f1..9edfe35d7eb2 100644 --- a/qiskit/primitives/estimator.py +++ b/qiskit/primitives/estimator.py @@ -17,7 +17,6 @@ from collections.abc import Sequence from typing import Any -import typing import numpy as np @@ -35,9 +34,6 @@ init_observable, ) -if typing.TYPE_CHECKING: - from qiskit.opflow import PauliSumOp - class Estimator(BaseEstimator[PrimitiveJob[EstimatorResult]]): """ @@ -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, ): diff --git a/test/python/primitives/test_estimator.py b/test/python/primitives/test_estimator.py index eaa1c7d922fd..55fe56295791 100644 --- a/test/python/primitives/test_estimator.py +++ b/test/python/primitives/test_estimator.py @@ -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 @@ -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"),)), ( ["IXYZ", "ZYXI"], (SparsePauliOp("IXYZ"), SparsePauliOp("ZYXI")), @@ -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")), ), )