Add support for v2 provider interface

qiskit/aqua/algorithms/amplitude_amplifiers/grover.py

@@ -20,6 +20,7 @@
 
 from qiskit import ClassicalRegister, QuantumCircuit
 from qiskit.circuit.library import GroverOperator
+from qiskit.providers import Backend
 from qiskit.providers import BaseBackend
 from qiskit.quantum_info import Statevector
 
@@ -121,7 +122,7 @@ class Grover(QuantumAlgorithm):
         ('post_processing', {float: 'lam'}),
         ('grover_operator', {list: 'rotation_counts'}),
         ('quantum_instance', {str: 'mct_mode'}),
-        ('incremental', {(BaseBackend, QuantumInstance): 'quantum_instance'})
+        ('incremental', {(Backend, BaseBackend, QuantumInstance): 'quantum_instance'})
     ], skip=1)  # skip the argument 'self'
     def __init__(self,
                  oracle: Union[Oracle, QuantumCircuit, Statevector],
@@ -131,7 +132,7 @@ def __init__(self,
                  sample_from_iterations: bool = False,
                  post_processing: Callable[[List[int]], List[int]] = None,
                  grover_operator: Optional[QuantumCircuit] = None,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None,
+                 quantum_instance: Optional[Union[QuantumInstance, Backend, BaseBackend]] = None,
                  init_state: Optional[InitialState] = None,
                  incremental: bool = False,
                  num_iterations: Optional[int] = None,

qiskit/aqua/algorithms/amplitude_estimators/ae.py

@@ -23,6 +23,7 @@
 from qiskit import QuantumCircuit, ClassicalRegister
 from qiskit.circuit.library import QFT
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, AquaError
 from qiskit.aqua.utils import CircuitFactory
 from qiskit.aqua.circuits import PhaseEstimationCircuit
@@ -67,7 +68,8 @@ def __init__(self, num_eval_qubits: int,
                  post_processing: Optional[Callable[[float], float]] = None,
                  phase_estimation_circuit: Optional[QuantumCircuit] = None,
                  iqft: Optional[QuantumCircuit] = None,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None,
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None,
                  a_factory: Optional[CircuitFactory] = None,
                  q_factory: Optional[CircuitFactory] = None,
                  i_objective: Optional[int] = None

qiskit/aqua/algorithms/amplitude_estimators/ae_algorithm.py

@@ -20,6 +20,7 @@
 from qiskit.circuit import QuantumCircuit
 from qiskit.circuit.library import GroverOperator
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm, AlgorithmResult
 from qiskit.aqua.utils import CircuitFactory
@@ -64,7 +65,7 @@ def __init__(self,
                  grover_operator: Optional[Union[QuantumCircuit, CircuitFactory]] = None,
                  objective_qubits: Optional[List[int]] = None,
                  post_processing: Optional[Callable[[float], float]] = None,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None,
+                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend, Backend]] = None,
                  a_factory: Optional[CircuitFactory] = None,
                  q_factory: Optional[CircuitFactory] = None,
                  i_objective: Optional[int] = None) -> None:

qiskit/aqua/algorithms/amplitude_estimators/iqae.py

@@ -20,6 +20,7 @@
 
 from qiskit import ClassicalRegister, QuantumRegister, QuantumCircuit
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, AquaError
 from qiskit.aqua.utils.circuit_factory import CircuitFactory
 from qiskit.aqua.utils.validation import validate_range, validate_in_set
@@ -62,7 +63,8 @@ def __init__(self, epsilon: float,
                  q_factory: Optional[CircuitFactory] = None,
                  i_objective: Optional[int] = None,
                  initial_state: Optional[QuantumCircuit] = None,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         r"""
         The output of the algorithm is an estimate for the amplitude `a`, that with at least
         probability 1 - alpha has an error of epsilon. The number of A operator calls scales

qiskit/aqua/algorithms/amplitude_estimators/mlae.py

@@ -20,6 +20,7 @@
 from scipy.stats import norm, chi2
 
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit import ClassicalRegister, QuantumRegister, QuantumCircuit
 from qiskit.aqua import QuantumInstance, AquaError
 from qiskit.aqua.utils.circuit_factory import CircuitFactory
@@ -57,7 +58,8 @@ def __init__(self, num_oracle_circuits: int,
                  q_factory: Optional[CircuitFactory] = None,
                  i_objective: Optional[int] = None,
                  likelihood_evals: Optional[int] = None,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         r"""
         Args:
             num_oracle_circuits: The number of circuits applying different powers of the Grover

qiskit/aqua/algorithms/classifiers/qsvm/qsvm.py

@@ -23,6 +23,7 @@
 from qiskit.tools.events import TextProgressBar
 from qiskit.circuit import ParameterVector
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, aqua_globals
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua import AquaError
@@ -79,7 +80,8 @@ def __init__(self, feature_map: Union[QuantumCircuit, FeatureMap],
                  test_dataset: Optional[Dict[str, np.ndarray]] = None,
                  datapoints: Optional[np.ndarray] = None,
                  multiclass_extension: Optional[MulticlassExtension] = None,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
         Args:
             feature_map: Feature map module, used to transform data

qiskit/aqua/algorithms/classifiers/vqc.py

@@ -23,6 +23,7 @@
 from qiskit.circuit import ParameterVector, ParameterExpression
 
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, AquaError, aqua_globals
 from qiskit.aqua.utils import map_label_to_class_name
 from qiskit.aqua.utils import split_dataset_to_data_and_labels
@@ -64,7 +65,8 @@ def __init__(
             max_evals_grouped: int = 1,
             minibatch_size: int = -1,
             callback: Optional[Callable[[int, np.ndarray, float, int], None]] = None,
-            quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+            quantum_instance: Optional[
+                Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
         Args:
             optimizer: The classical optimizer to use.

qiskit/aqua/algorithms/distribution_learners/qgan.py

@@ -22,6 +22,7 @@
 
 from qiskit.circuit import QuantumCircuit
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, AquaError, aqua_globals
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.components.neural_networks.discriminative_network import DiscriminativeNetwork
@@ -69,7 +70,8 @@ def __init__(self, data: np.ndarray, bounds: Optional[np.ndarray] = None,
                  discriminator: Optional[DiscriminativeNetwork] = None,
                  generator: Optional[GenerativeNetwork] = None,
                  tol_rel_ent: Optional[float] = None, snapshot_dir: Optional[str] = None,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
 
         Args:

qiskit/aqua/algorithms/education/bernstein_vazirani.py

@@ -20,6 +20,7 @@
 
 from qiskit import ClassicalRegister, QuantumCircuit
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.utils import get_subsystem_density_matrix
@@ -42,7 +43,8 @@ class BernsteinVazirani(QuantumAlgorithm):
 
     def __init__(self,
                  oracle: Oracle,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[Union[QuantumInstance,
+                                                  BaseBackend, Backend]] = None) -> None:
         """
         Args:
             oracle: The oracle component

qiskit/aqua/algorithms/education/deutsch_jozsa.py

@@ -20,6 +20,7 @@
 
 from qiskit import ClassicalRegister, QuantumCircuit
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.utils import get_subsystem_density_matrix
@@ -47,7 +48,8 @@ class DeutschJozsa(QuantumAlgorithm):
 
     def __init__(self,
                  oracle: Oracle,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
         Args:
             oracle: The oracle component

qiskit/aqua/algorithms/education/eoh.py

@@ -18,6 +18,7 @@
 from typing import Optional, Union, Dict, Any
 from qiskit import QuantumRegister
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.operators.legacy import op_converter
@@ -47,7 +48,8 @@ def __init__(self, operator: LegacyBaseOperator,
                  num_time_slices: int = 1,
                  expansion_mode: str = 'trotter',
                  expansion_order: int = 1,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
         Args:
             operator: Operator to evaluate

qiskit/aqua/algorithms/education/simon.py

@@ -20,6 +20,7 @@
 
 from qiskit import ClassicalRegister, QuantumCircuit
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.utils import get_subsystem_density_matrix
@@ -44,7 +45,8 @@ class Simon(QuantumAlgorithm):
 
     def __init__(self,
                  oracle: Oracle,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
         Args:
             oracle: The oracle component

qiskit/aqua/algorithms/factorizers/shor.py

@@ -23,6 +23,7 @@
 from qiskit.circuit import Gate, Instruction, ParameterVector
 from qiskit.circuit.library import QFT
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import AlgorithmResult, QuantumAlgorithm
 from qiskit.aqua.utils import get_subsystem_density_matrix, summarize_circuits
@@ -53,7 +54,8 @@ class Shor(QuantumAlgorithm):
     def __init__(self,
                  N: int = 15,
                  a: int = 2,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
         Args:
             N: The integer to be factored, has a min. value of 3.

qiskit/aqua/algorithms/linear_solvers/hhl.py

@@ -20,6 +20,7 @@
 from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit
 from qiskit.dagcircuit import DAGCircuit
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.ignis.verification.tomography import state_tomography_circuits, \
@@ -95,7 +96,8 @@ def __init__(
             num_q: int = 0,
             num_a: int = 0,
             orig_size: Optional[int] = None,
-            quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+            quantum_instance: Optional[
+                Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
         Args:
             matrix: The input matrix of linear system of equations

qiskit/aqua/algorithms/minimum_eigen_solvers/iqpe.py

@@ -22,6 +22,7 @@
 from qiskit import QuantumRegister, ClassicalRegister, QuantumCircuit
 from qiskit.quantum_info import Pauli
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.operators import (WeightedPauliOperator, suzuki_expansion_slice_pauli_list,
                                    evolution_instruction)
@@ -62,7 +63,8 @@ def __init__(self,
                  expansion_mode: str = 'suzuki',
                  expansion_order: int = 2,
                  shallow_circuit_concat: bool = False,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
 
         Args:

qiskit/aqua/algorithms/minimum_eigen_solvers/qaoa/qaoa.py

@@ -17,6 +17,7 @@
 import numpy as np
 
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.operators import OperatorBase, ExpectationBase, LegacyBaseOperator
 from qiskit.aqua.components.initial_states import InitialState
@@ -74,7 +75,8 @@ def __init__(self,
                  aux_operators: Optional[List[Optional[Union[OperatorBase, LegacyBaseOperator]]]] =
                  None,
                  callback: Optional[Callable[[int, np.ndarray, float, float], None]] = None,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
         Args:
             operator: Qubit operator

qiskit/aqua/algorithms/minimum_eigen_solvers/qpe.py

@@ -20,6 +20,7 @@
 from qiskit.quantum_info import Pauli
 
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance
 from qiskit.aqua.operators import op_converter, OperatorBase
 from qiskit.aqua.utils import get_subsystem_density_matrix
@@ -62,7 +63,8 @@ def __init__(self,
                  expansion_mode: str = 'trotter',
                  expansion_order: int = 1,
                  shallow_circuit_concat: bool = False,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
 
         Args:

qiskit/aqua/algorithms/minimum_eigen_solvers/vqe.py

@@ -25,6 +25,7 @@
 from qiskit.circuit import Parameter
 from qiskit.circuit.library import RealAmplitudes
 from qiskit.providers import BaseBackend
+from qiskit.providers import Backend
 from qiskit.aqua import QuantumInstance, AquaError
 from qiskit.aqua.algorithms import QuantumAlgorithm
 from qiskit.aqua.operators import (OperatorBase, ExpectationBase, ExpectationFactory, StateFn,
@@ -96,7 +97,8 @@ def __init__(self,
                  aux_operators: Optional[List[Optional[Union[OperatorBase,
                                                              LegacyBaseOperator]]]] = None,
                  callback: Optional[Callable[[int, np.ndarray, float, float], None]] = None,
-                 quantum_instance: Optional[Union[QuantumInstance, BaseBackend]] = None) -> None:
+                 quantum_instance: Optional[
+                     Union[QuantumInstance, BaseBackend, Backend]] = None) -> None:
         """
 
         Args:
@@ -200,7 +202,8 @@ def _set_expectation(self, exp: ExpectationBase) -> None:
         self._expect_op = None
 
     @QuantumAlgorithm.quantum_instance.setter
-    def quantum_instance(self, quantum_instance: Union[QuantumInstance, BaseBackend]) -> None:
+    def quantum_instance(self, quantum_instance: Union[QuantumInstance,
+                                                       BaseBackend, Backend]) -> None:
         """ set quantum_instance """
         super(VQE, self.__class__).quantum_instance.__set__(self, quantum_instance)