Merge pull request qiskit-community#67 from manoelmarques/master

Changed Aer to LegacySimulators
manoelmarques · Dec 14, 2018 · 1b9c089 · 1b9c089
2 parents b3cdb13 + 9699cdd
commit 1b9c089
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 qiskit-aqua>=0.4.0
-qiskit>=0.7.0,<0.8
+qiskit-terra>=0.7.0,<0.8
 numpy>=1.13
 h5py
 psutil>=5

diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
 
 requirements = [
     "qiskit-aqua>=0.4.0",
-    "qiskit>=0.7.0,<0.8",
+    "qiskit-terra>=0.7.0,<0.8",
     "numpy>=1.13",
     "h5py",
     "psutil>=5",

diff --git a/test/test_end2end_with_iqpe.py b/test/test_end2end_with_iqpe.py
@@ -20,7 +20,7 @@
 
 from parameterized import parameterized
 import numpy as np
-from qiskit import Aer
+from qiskit import LegacySimulators
 from qiskit.transpiler import PassManager
 from qiskit_aqua.utils import decimal_to_binary
 from qiskit_aqua import QuantumInstance
@@ -80,7 +80,7 @@ def test_iqpe(self, distance):
         iqpe = IQPE(self.qubit_op, state_in, num_time_slices, num_iterations,
                     paulis_grouping='random', expansion_mode='suzuki', expansion_order=2,
                     shallow_circuit_concat=True)
-        backend = Aer.get_backend('qasm_simulator')
+        backend = LegacySimulators.get_backend('qasm_simulator')
         quantum_instance = QuantumInstance(backend, shots=100, pass_manager=PassManager())
 
         result = iqpe.run(quantum_instance)

diff --git a/test/test_end2end_with_qpe.py b/test/test_end2end_with_qpe.py
@@ -20,7 +20,7 @@
 
 from parameterized import parameterized
 import numpy as np
-from qiskit import Aer
+from qiskit import LegacySimulators
 from qiskit.transpiler import PassManager
 from qiskit_aqua.utils import decimal_to_binary
 from qiskit_aqua import QuantumInstance
@@ -89,7 +89,7 @@ def test_qpe(self, distance):
         qpe = QPE(self.qubit_op, state_in, iqft, num_time_slices, n_ancillae,
                   paulis_grouping='random', expansion_mode='suzuki',
                   expansion_order=2, shallow_circuit_concat=True)
-        backend = Aer.get_backend('qasm_simulator')
+        backend = LegacySimulators.get_backend('qasm_simulator')
         quantum_instance = QuantumInstance(backend, shots=100, pass_manager=PassManager())
         result = qpe.run(quantum_instance)
 

diff --git a/test/test_end2end_with_vqe.py b/test/test_end2end_with_vqe.py
@@ -19,7 +19,7 @@
 from collections import OrderedDict
 
 from parameterized import parameterized
-from qiskit import Aer
+from qiskit import LegacySimulators
 
 from qiskit_aqua import QuantumInstance
 from qiskit_aqua.algorithms.adaptive import VQE
@@ -52,8 +52,8 @@ def setUp(self):
         self.reference_energy = -1.857275027031588
 
     @parameterized.expand([
-        ['COBYLA_M', 'COBYLA', Aer.get_backend('statevector_simulator'), 'matrix', 1],
-        ['COBYLA_P', 'COBYLA', Aer.get_backend('statevector_simulator'), 'paulis', 1],
+        ['COBYLA_M', 'COBYLA', LegacySimulators.get_backend('statevector_simulator'), 'matrix', 1],
+        ['COBYLA_P', 'COBYLA', LegacySimulators.get_backend('statevector_simulator'), 'paulis', 1],
         # ['SPSA_P', 'SPSA', 'qasm_simulator', 'paulis', 1024],
         # ['SPSA_GP', 'SPSA', 'qasm_simulator', 'grouped_paulis', 1024]
     ])