Merge pull request #850 from manoelmarques/json_remove

Remove Aqua Declarative API, Update import paths, Change to Machine Learning

Author: nonhermitian

qiskit/1_start_here.ipynb

@@ -16,7 +16,15 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Qiskit Aqua: Tutorial to build a pluggable algorithm/component\n"
+    "# _*Qiskit Aqua: Tutorial to build a pluggable algorithm/component*_ \n",
+    "\n",
+    "The latest version of this notebook is available on https://github.com/Qiskit/qiskit-tutorial.\n",
+    "\n",
+    "***\n",
+    "### Contributors\n",
+    "Richard Chen<sup>[1]</sup>, Shaohan Hu<sup>[1]</sup>, Antonio Mezzacapo<sup>[1]</sup>, Peng Liu<sup>[1]</sup>, Marco Pistoia<sup>[1]</sup>, Stephen Wood<sup>[1]</sup>\n",
+    "### Affiliation\n",
+    "- <sup>[1]</sup>IBMQ"
    ]
   },
   {
@@ -28,120 +36,36 @@
     "This notebook is part of the simple example of an algorithm for `Qiskit Aqua`. This sample, called `Evolution Fidelity`, illustrates how to implement an algorithm and what steps to take to configure and run it. The implementation of the algorithm itself is located in the `evolutionfidelity` directory."
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Register a pluggable algorithm/components\n",
-    "After you complete the algorithm implementation, there are two approaches to register your pluggable algorithm/components.\n",
-    "\n",
-    "**Note: you can use the developed algorithm directly in Python without any issue.**\n",
-    "\n",
-    "1. Register it permanently. \n",
-    "2. Register it on-the-fly.\n",
-    "\n",
-    "\n",
-    "#### Register it permanently\n",
-    "If you complete the pluggable algorithm/components as a Python package, you can refer to this [instruction](https://qiskit.org/documentation/aqua/extending.html#extending-aqua) to prepare the `setup.py` file to register the pluggable algorithm/component, which will be discovered in Qiskit-Aqua. We prepared a [setup.py](evolutionfidelity/setup.py) example for this tutorial. \n",
-    "\n",
-    "Go to the `qiskit/advanced/aqua/evolutionfidelity` folder, and then do `python3 setup.py install` to install the package.\n",
-    "\n",
-    "#### Register it on-the-fly\n",
-    "You can also register it on-the-fly. Aqua provides a function to register your pluggable algorithm/component easily. The following cell shows how to do that."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-12-12T15:16:11.185336Z",
-     "start_time": "2019-12-12T15:16:08.136942Z"
-    }
-   },
-   "outputs": [],
-   "source": [
-    "from qiskit.aqua import register_pluggable\n",
-    "from evolutionfidelity.evolutionfidelity import EvolutionFidelity\n",
-    "try:\n",
-    "    register_pluggable(EvolutionFidelity)\n",
-    "except Exception as e:\n",
-    "    print(e)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-12-12T15:16:11.201460Z",
-     "start_time": "2019-12-12T15:16:11.198572Z"
-    }
-   },
-   "outputs": [],
-   "source": [
-    "from qiskit import BasicAer\n",
-    "import numpy as np\n",
-    "from qiskit.aqua.operators import MatrixOperator, op_converter\n",
-    "from qiskit.aqua import local_pluggables, PluggableType"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "List all registered algorithms, and we will find `EvolutionFidelity` in the list if you registered it."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 3,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-12-12T15:16:11.217871Z",
-     "start_time": "2019-12-12T15:16:11.214681Z"
-    }
-   },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "['QAOA.Variational', 'QGAN', 'VQC', 'VQE', 'ExactEigensolver', 'ExactLSsolver', 'SVM', 'EOH', 'QSVM', 'AmplitudeEstimation', 'MaximumLikelihoodAmplitudeEstimation', 'BernsteinVazirani', 'DeutschJozsa', 'Grover', 'HHL', 'IQPE', 'QPE', 'Shor', 'Simon', 'QEomEE', 'QEomVQE', 'EvolutionFidelity']\n"
-     ]
-    }
-   ],
-   "source": [
-    "print(local_pluggables(PluggableType.ALGORITHM))"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
     "### Use the algorithm directly\n",
-    "Without registration, you can still use the designed algorithm/components as is."
+    "You can use the designed algorithm/components as is."
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 1,
    "metadata": {
     "ExecuteTime": {
-     "end_time": "2019-12-12T15:16:11.402263Z",
-     "start_time": "2019-12-12T15:16:11.283486Z"
+     "end_time": "2019-08-22T01:38:45.795524Z",
+     "start_time": "2019-08-22T01:38:45.524414Z"
     }
    },
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "0.9420934576187111\n"
+      "0.7182824381334073\n"
      ]
     }
    ],
    "source": [
+    "from qiskit import BasicAer\n",
+    "import numpy as np\n",
+    "from qiskit.aqua.operators import MatrixOperator, op_converter\n",
     "from evolutionfidelity.evolutionfidelity import EvolutionFidelity\n",
     "from qiskit.aqua.components.initial_states import Zero\n",
     "from qiskit.aqua import QuantumInstance\n",
@@ -160,90 +84,21 @@
     "print(result['score'])"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Use the algorithm via a declarative approach\n",
-    "After you register the package, you will be able to discover the algorithm declaratively."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 5,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-12-12T15:16:12.488671Z",
-     "start_time": "2019-12-12T15:16:12.483037Z"
-    }
-   },
-   "outputs": [],
-   "source": [
-    "from qiskit.aqua.input import EnergyInput\n",
-    "from qiskit.aqua import run_algorithm\n",
-    "\n",
-    "params = {\n",
-    "    'problem': {\n",
-    "        'name': 'eoh'\n",
-    "    },\n",
-    "    'algorithm': {\n",
-    "        'name': 'EvolutionFidelity',\n",
-    "        'expansion_order': 1\n",
-    "    },\n",
-    "    'initial_state': {\n",
-    "        'name': 'ZERO'\n",
-    "    }\n",
-    "}\n",
-    "\n",
-    "algo_input = EnergyInput(qubit_op)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 6,
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2019-12-12T15:16:24.808291Z",
-     "start_time": "2019-12-12T15:16:13.001536Z"
-    }
-   },
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/Users/paul/opt/anaconda3/envs/qiskit/lib/python3.7/site-packages/qiskit/providers/models/backendconfiguration.py:337: UserWarning: `dt` and `dtm` now have units of seconds(s) rather than nanoseconds(ns).\n",
-      "  warnings.warn('`dt` and `dtm` now have units of seconds(s) rather '\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "0.9420934576187111\n"
-     ]
-    }
-   ],
-   "source": [
-    "result = run_algorithm(params, algo_input, backend=backend)\n",
-    "print(result['score'])"
-   ]
-  },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 2,
    "metadata": {
     "ExecuteTime": {
-     "end_time": "2019-12-12T15:16:24.898534Z",
-     "start_time": "2019-12-12T15:16:24.823965Z"
+     "end_time": "2019-08-22T01:38:34.386128Z",
+     "start_time": "2019-08-22T01:38:34.375938Z"
     }
    },
    "outputs": [
     {
      "data": {
       "text/html": [
-       "<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>0.14.0</td></tr><tr><td>Terra</td><td>0.11.0</td></tr><tr><td>Aer</td><td>0.3.4</td></tr><tr><td>Ignis</td><td>0.2.0</td></tr><tr><td>Aqua</td><td>0.6.1</td></tr><tr><td>IBM Q Provider</td><td>0.4.4</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.5 (default, Oct 25 2019, 10:52:18) \n",
-       "[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>4</td></tr><tr><td>Memory (Gb)</td><td>16.0</td></tr><tr><td colspan='2'>Thu Dec 12 10:16:24 2019 EST</td></tr></table>"
+       "<h3>Version Information</h3><table><tr><th>Qiskit Software</th><th>Version</th></tr><tr><td>Qiskit</td><td>None</td></tr><tr><td>Terra</td><td>0.11.0.dev0+4164568</td></tr><tr><td>Aer</td><td>0.4.0</td></tr><tr><td>Ignis</td><td>0.3.0.dev0+6145a4e</td></tr><tr><td>Aqua</td><td>0.7.0.dev0+2d7a26f</td></tr><tr><td>IBM Q Provider</td><td>0.4.0rc1</td></tr><tr><th>System information</th></tr><tr><td>Python</td><td>3.7.4 (default, Aug 13 2019, 15:17:50) \n",
+       "[Clang 4.0.1 (tags/RELEASE_401/final)]</td></tr><tr><td>OS</td><td>Darwin</td></tr><tr><td>CPUs</td><td>2</td></tr><tr><td>Memory (Gb)</td><td>8.0</td></tr><tr><td colspan='2'>Mon Nov 11 17:29:56 2019 EST</td></tr></table>"
       ],
       "text/plain": [
        "<IPython.core.display.HTML object>"
@@ -295,7 +150,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.5"
+   "version": "3.7.4"
   },
   "varInspector": {
    "cols": {