Skip to content

Commit

Permalink
Remove deprecated algorithms, fix lint, fix imports (qiskit-community#2)
Browse files Browse the repository at this point in the history
  • Loading branch information
ElePT authored Jul 18, 2023
1 parent d153c28 commit 5053a6e
Show file tree
Hide file tree
Showing 104 changed files with 256 additions and 7,476 deletions.
6 changes: 5 additions & 1 deletion constraints.txt
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
# There are currently no constraints for Qiskit Algorithms
# Numpy 1.25 deprecated some behaviours that we used, and caused the isometry
# tests to flake. See https://github.com/Qiskit/qiskit-terra/issues/10305,
# remove pin when resolving that.
numpy<1.25

32 changes: 1 addition & 31 deletions qiskit_algorithms/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,6 @@
"""
from .algorithm_job import AlgorithmJob
from .algorithm_result import AlgorithmResult
from .evolvers import EvolutionResult, EvolutionProblem
from .evolvers.real_evolver import RealEvolver
from .evolvers.imaginary_evolver import ImaginaryEvolver
from .variational_algorithm import VariationalAlgorithm, VariationalResult
from .amplitude_amplifiers import Grover, GroverResult, AmplificationProblem, AmplitudeAmplifier
from .amplitude_estimators import (
Expand All @@ -317,15 +314,7 @@
MaximumLikelihoodAmplitudeEstimationResult,
EstimationProblem,
)
from .eigen_solvers import NumPyEigensolver, Eigensolver, EigensolverResult, VQD, VQDResult
from .minimum_eigen_solvers import (
VQE,
VQEResult,
QAOA,
NumPyMinimumEigensolver,
MinimumEigensolver,
MinimumEigensolverResult,
)

from .phase_estimators import (
HamiltonianPhaseEstimation,
HamiltonianPhaseEstimationResult,
Expand All @@ -335,9 +324,7 @@
IterativePhaseEstimation,
)
from .exceptions import AlgorithmError
from .aux_ops_evaluator import eval_observables
from .observables_evaluator import estimate_observables
from .evolvers.trotterization import TrotterQRTE

from .time_evolvers import (
ImaginaryTimeEvolver,
Expand Down Expand Up @@ -374,28 +361,12 @@
"MaximumLikelihoodAmplitudeEstimation",
"MaximumLikelihoodAmplitudeEstimationResult",
"EstimationProblem",
"NumPyEigensolver",
"RealEvolver",
"ImaginaryEvolver",
"RealTimeEvolver",
"ImaginaryTimeEvolver",
"TrotterQRTE",
"EvolutionResult",
"EvolutionProblem",
"TimeEvolutionResult",
"TimeEvolutionProblem",
"Eigensolver",
"EigensolverResult",
"VQE",
"VQEResult",
"QAOA",
"NumPyMinimumEigensolver",
"MinimumEigensolver",
"MinimumEigensolverResult",
"HamiltonianPhaseEstimation",
"HamiltonianPhaseEstimationResult",
"VQD",
"VQDResult",
"PhaseEstimationScale",
"PhaseEstimation",
"PhaseEstimationResult",
Expand All @@ -405,7 +376,6 @@
"SciPyImaginaryEvolver",
"IterativePhaseEstimation",
"AlgorithmError",
"eval_observables",
"estimate_observables",
"VarQITE",
"VarQRTE",
Expand Down
3 changes: 2 additions & 1 deletion qiskit_algorithms/amplitude_amplifiers/grover.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@
import numpy as np

from qiskit import ClassicalRegister, QuantumCircuit
from qiskit_algorithms.exceptions import AlgorithmError
from qiskit.primitives import BaseSampler
from qiskit.providers import Backend
from qiskit.quantum_info import partial_trace, Statevector
from qiskit.utils import QuantumInstance, algorithm_globals
from qiskit.utils.deprecation import deprecate_arg, deprecate_func

from qiskit_algorithms.exceptions import AlgorithmError

from .amplification_problem import AmplificationProblem
from .amplitude_amplifier import AmplitudeAmplifier, AmplitudeAmplifierResult

Expand Down
2 changes: 1 addition & 1 deletion qiskit_algorithms/amplitude_estimators/ae.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def __init__(
self.quantum_instance = quantum_instance

# get parameters
self._m = num_eval_qubits
self._m = num_eval_qubits # pylint: disable=invalid-name
self._M = 2**num_eval_qubits # pylint: disable=invalid-name

self._iqft = iqft
Expand Down
2 changes: 1 addition & 1 deletion qiskit_algorithms/amplitude_estimators/ae_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def _derivative_circ_dist(x, p):
Returns:
float: The derivative.
"""
# pylint: disable=chained-comparison,misplaced-comparison-constant
# pylint: disable=chained-comparison
t = p - x
if t < -0.5 or (0 < t and t < 0.5):
return -1
Expand Down
2 changes: 1 addition & 1 deletion qiskit_algorithms/amplitude_estimators/mlae.py
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ def _safe_min(array, default=0):
return np.min(array)


def _safe_max(array, default=(np.pi / 2)):
def _safe_max(array, default=(np.pi / 2)): # pylint: disable=superfluous-parens
if len(array) == 0:
return default
return np.max(array)
Expand Down
195 changes: 0 additions & 195 deletions qiskit_algorithms/aux_ops_evaluator.py

This file was deleted.

19 changes: 0 additions & 19 deletions qiskit_algorithms/eigen_solvers/__init__.py

This file was deleted.

Loading

0 comments on commit 5053a6e

Please sign in to comment.