Terra compatibility changes

Author: manoelmarques

aqua/simulations_with_noise_and_measurement_error_mitigation.ipynb

@@ -127,7 +127,7 @@
    ],
    "source": [
     "backend = Aer.get_backend('qasm_simulator')\n",
-    "quantum_instance = QuantumInstance(backend=backend, seed=167, seed_transpiler=167) \n",
+    "quantum_instance = QuantumInstance(backend=backend, seed_simulator=167, seed_transpiler=167) \n",
     "\n",
     "counts = []\n",
     "values = []\n",
@@ -212,16 +212,16 @@
    "source": [
     "from qiskit.providers.aer import noise\n",
     "\n",
-    "IBMQ.load_accounts(hub=None)\n",
-    "device = IBMQ.get_backend('ibmqx4')\n",
+    "provider = IBMQ.load_account()\n",
+    "device = provider.get_backend('ibmqx4')\n",
     "coupling_map = device.configuration().coupling_map\n",
     "noise_model = noise.device.basic_device_noise_model(device.properties())\n",
     "basis_gates = noise_model.basis_gates\n",
     "\n",
     "print(noise_model)\n",
     "\n",
     "backend = Aer.get_backend('qasm_simulator')\n",
-    "quantum_instance = QuantumInstance(backend=backend, seed=167, seed_transpiler=167,\n",
+    "quantum_instance = QuantumInstance(backend=backend, seed_simulator=167, seed_transpiler=167,\n",
     "                                   noise_model=noise_model,)\n",
     "\n",
     "counts1 = []\n",
@@ -315,7 +315,7 @@
    "source": [
     "from qiskit.ignis.mitigation.measurement import CompleteMeasFitter\n",
     "\n",
-    "quantum_instance = QuantumInstance(backend=backend, seed=167, seed_transpiler=167,\n",
+    "quantum_instance = QuantumInstance(backend=backend, seed_simulator=167, seed_transpiler=167,\n",
     "                                   noise_model=noise_model, \n",
     "                                   measurement_error_mitigation_cls=CompleteMeasFitter, \n",
     "                                   cals_matrix_refresh_period=30)\n",

aqua/vqe2iqpe.ipynb

@@ -171,7 +171,7 @@
     "iqpe = IQPE(algo_input.qubit_op, state_in, num_time_slices, num_iterations,\n",
     "            expansion_mode='suzuki', expansion_order=2,\n",
     "            shallow_circuit_concat=True)\n",
-    "quantum_instance = QuantumInstance(backend, shots=100, seed=random_seed, pass_manager=PassManager(), seed_transpiler=random_seed)\n",
+    "quantum_instance = QuantumInstance(backend, shots=100, seed_simulator=random_seed, pass_manager=PassManager(), seed_transpiler=random_seed)\n",
     "result_iqpe = iqpe.run(quantum_instance)\n",
     "print(\"Continuing with VQE's result, IQPE estimated the ground energy to be {}.\".format(\n",
     "    result_iqpe['energy']))"

artificial_intelligence/custom_feature_map.ipynb

@@ -90,7 +90,7 @@
     "backend = BasicAer.get_backend('statevector_simulator')\n",
     "random_seed = 10598\n",
     "\n",
-    "quantum_instance = QuantumInstance(backend, seed=random_seed, seed_transpiler=random_seed)"
+    "quantum_instance = QuantumInstance(backend, seed_simulator=random_seed, seed_transpiler=random_seed)"
    ]
   },
   {

artificial_intelligence/qsvm_directly.ipynb

@@ -196,7 +196,7 @@
     "feature_map = SecondOrderExpansion(feature_dimension=feature_dim, depth=2, entangler_map=[[0, 1]])\n",
     "svm = QSVM(feature_map, training_input, test_input, None)# the data for prediction can be fed later.\n",
     "svm.random_seed = random_seed\n",
-    "quantum_instance = QuantumInstance(backend, shots=shots, seed=random_seed, seed_transpiler=random_seed)\n",
+    "quantum_instance = QuantumInstance(backend, shots=shots, seed_simulator=random_seed, seed_transpiler=random_seed)\n",
     "result = svm.run(quantum_instance)"
    ]
   },

artificial_intelligence/vqc.ipynb

@@ -196,7 +196,7 @@
     "feature_map = SecondOrderExpansion(feature_dimension=feature_dim, depth=2)\n",
     "var_form = RYRZ(num_qubits=feature_dim, depth=3)\n",
     "vqc = VQC(optimizer, feature_map, var_form, training_input, test_input)\n",
-    "quantum_instance = QuantumInstance(backend, shots=shots, seed=random_seed, seed_transpiler=random_seed)"
+    "quantum_instance = QuantumInstance(backend, shots=shots, seed_simulator=random_seed, seed_transpiler=random_seed)"
    ]
   },
   {

chemistry/QSE_pytket.ipynb

@@ -141,10 +141,10 @@
     "from pytket.qiskit import TketPass\n",
     "\n",
     "# Qiskit Aqua, for chemistry\n",
-    "from qiskit_chemistry.drivers import PySCFDriver, UnitsType\n",
-    "from qiskit_chemistry import FermionicOperator\n",
-    "from qiskit_chemistry.aqua_extensions.components.initial_states import HartreeFock\n",
-    "from qiskit_chemistry.aqua_extensions.components.variational_forms import UCCSD"
+    "from qiskit.chemistry.drivers import PySCFDriver, UnitsType\n",
+    "from qiskit.chemistry import FermionicOperator\n",
+    "from qiskit.chemistry.aqua_extensions.components.initial_states import HartreeFock\n",
+    "from qiskit.chemistry.aqua_extensions.components.variational_forms import UCCSD"
    ]
   },
   {
@@ -165,7 +165,7 @@
    },
    "outputs": [],
    "source": [
-    "IBMQ.load_accounts()"
+    "provider = IBMQ.load_account()"
    ]
   },
   {
@@ -589,7 +589,7 @@
    ],
    "source": [
     "# Grab only backends that have at least 12 qubits\n",
-    "IBMQ.backends(filters=lambda x: x.configuration().n_qubits >= 12)"
+    "provider.backends(filters=lambda x: x.configuration().n_qubits >= 12)"
    ]
   },
   {
@@ -605,7 +605,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "real_backend = IBMQ.get_backend('ibmq_16_melbourne')"
+    "real_backend = provider.get_backend('ibmq_16_melbourne')"
    ]
   },
   {
@@ -754,10 +754,10 @@
     "# Code imports\n",
     "\n",
     "# From Aqua, we need \n",
-    "from qiskit_aqua import QuantumInstance\n",
+    "from qiskit.aqua import QuantumInstance\n",
     "\n",
-    "from qiskit_aqua.algorithms.adaptive import VQE\n",
-    "from qiskit_aqua.components.optimizers import L_BFGS_B\n",
+    "from qiskit.aqua.algorithms.adaptive import VQE\n",
+    "from qiskit.aqua.components.optimizers import L_BFGS_B\n",
     "\n",
     "# From pytket, we need QSE functions\n",
     "\n",