Skip to content

Commit 5053a6e

Browse files
authored
Remove deprecated algorithms, fix lint, fix imports (#2)
1 parent d153c28 commit 5053a6e

File tree

104 files changed

+256
-7476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+256
-7476
lines changed

constraints.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
# There are currently no constraints for Qiskit Algorithms
1+
# Numpy 1.25 deprecated some behaviours that we used, and caused the isometry
2+
# tests to flake. See https://github.com/Qiskit/qiskit-terra/issues/10305,
3+
# remove pin when resolving that.
4+
numpy<1.25
5+

qiskit_algorithms/__init__.py

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,6 @@
299299
"""
300300
from .algorithm_job import AlgorithmJob
301301
from .algorithm_result import AlgorithmResult
302-
from .evolvers import EvolutionResult, EvolutionProblem
303-
from .evolvers.real_evolver import RealEvolver
304-
from .evolvers.imaginary_evolver import ImaginaryEvolver
305302
from .variational_algorithm import VariationalAlgorithm, VariationalResult
306303
from .amplitude_amplifiers import Grover, GroverResult, AmplificationProblem, AmplitudeAmplifier
307304
from .amplitude_estimators import (
@@ -317,15 +314,7 @@
317314
MaximumLikelihoodAmplitudeEstimationResult,
318315
EstimationProblem,
319316
)
320-
from .eigen_solvers import NumPyEigensolver, Eigensolver, EigensolverResult, VQD, VQDResult
321-
from .minimum_eigen_solvers import (
322-
VQE,
323-
VQEResult,
324-
QAOA,
325-
NumPyMinimumEigensolver,
326-
MinimumEigensolver,
327-
MinimumEigensolverResult,
328-
)
317+
329318
from .phase_estimators import (
330319
HamiltonianPhaseEstimation,
331320
HamiltonianPhaseEstimationResult,
@@ -335,9 +324,7 @@
335324
IterativePhaseEstimation,
336325
)
337326
from .exceptions import AlgorithmError
338-
from .aux_ops_evaluator import eval_observables
339327
from .observables_evaluator import estimate_observables
340-
from .evolvers.trotterization import TrotterQRTE
341328

342329
from .time_evolvers import (
343330
ImaginaryTimeEvolver,
@@ -374,28 +361,12 @@
374361
"MaximumLikelihoodAmplitudeEstimation",
375362
"MaximumLikelihoodAmplitudeEstimationResult",
376363
"EstimationProblem",
377-
"NumPyEigensolver",
378-
"RealEvolver",
379-
"ImaginaryEvolver",
380364
"RealTimeEvolver",
381365
"ImaginaryTimeEvolver",
382-
"TrotterQRTE",
383-
"EvolutionResult",
384-
"EvolutionProblem",
385366
"TimeEvolutionResult",
386367
"TimeEvolutionProblem",
387-
"Eigensolver",
388-
"EigensolverResult",
389-
"VQE",
390-
"VQEResult",
391-
"QAOA",
392-
"NumPyMinimumEigensolver",
393-
"MinimumEigensolver",
394-
"MinimumEigensolverResult",
395368
"HamiltonianPhaseEstimation",
396369
"HamiltonianPhaseEstimationResult",
397-
"VQD",
398-
"VQDResult",
399370
"PhaseEstimationScale",
400371
"PhaseEstimation",
401372
"PhaseEstimationResult",
@@ -405,7 +376,6 @@
405376
"SciPyImaginaryEvolver",
406377
"IterativePhaseEstimation",
407378
"AlgorithmError",
408-
"eval_observables",
409379
"estimate_observables",
410380
"VarQITE",
411381
"VarQRTE",

qiskit_algorithms/amplitude_amplifiers/grover.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
import numpy as np
2323

2424
from qiskit import ClassicalRegister, QuantumCircuit
25-
from qiskit_algorithms.exceptions import AlgorithmError
2625
from qiskit.primitives import BaseSampler
2726
from qiskit.providers import Backend
2827
from qiskit.quantum_info import partial_trace, Statevector
2928
from qiskit.utils import QuantumInstance, algorithm_globals
3029
from qiskit.utils.deprecation import deprecate_arg, deprecate_func
3130

31+
from qiskit_algorithms.exceptions import AlgorithmError
32+
3233
from .amplification_problem import AmplificationProblem
3334
from .amplitude_amplifier import AmplitudeAmplifier, AmplitudeAmplifierResult
3435

qiskit_algorithms/amplitude_estimators/ae.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def __init__(
106106
self.quantum_instance = quantum_instance
107107

108108
# get parameters
109-
self._m = num_eval_qubits
109+
self._m = num_eval_qubits # pylint: disable=invalid-name
110110
self._M = 2**num_eval_qubits # pylint: disable=invalid-name
111111

112112
self._iqft = iqft

qiskit_algorithms/amplitude_estimators/ae_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def _derivative_circ_dist(x, p):
106106
Returns:
107107
float: The derivative.
108108
"""
109-
# pylint: disable=chained-comparison,misplaced-comparison-constant
109+
# pylint: disable=chained-comparison
110110
t = p - x
111111
if t < -0.5 or (0 < t and t < 0.5):
112112
return -1

qiskit_algorithms/amplitude_estimators/mlae.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ def _safe_min(array, default=0):
474474
return np.min(array)
475475

476476

477-
def _safe_max(array, default=(np.pi / 2)):
477+
def _safe_max(array, default=(np.pi / 2)): # pylint: disable=superfluous-parens
478478
if len(array) == 0:
479479
return default
480480
return np.max(array)

qiskit_algorithms/aux_ops_evaluator.py

Lines changed: 0 additions & 195 deletions
This file was deleted.

qiskit_algorithms/eigen_solvers/__init__.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)