Ipython notebook updated.

plots_display_all.ipynb

@@ -8,7 +8,7 @@
    "outputs": [
     {
      "data": {
-      "application/mercury+json": "{\n    \"widget\": \"App\",\n    \"title\": \"Performance Benchmarks\",\n    \"description\": \"Collated Performance Benchmarks\",\n    \"show_code\": false,\n    \"show_prompt\": false,\n    \"output\": \"app\",\n    \"schedule\": \"\",\n    \"notify\": \"{}\",\n    \"continuous_update\": true,\n    \"static_notebook\": false,\n    \"show_sidebar\": true,\n    \"full_screen\": true,\n    \"allow_download\": true,\n    \"model_id\": \"mercury-app\",\n    \"code_uid\": \"App.0.40.24.2-rand1db37b16\"\n}",
+      "application/mercury+json": "{\n    \"widget\": \"App\",\n    \"title\": \"Performance Benchmarks\",\n    \"description\": \"Collated Performance Benchmarks\",\n    \"show_code\": false,\n    \"show_prompt\": false,\n    \"output\": \"app\",\n    \"schedule\": \"\",\n    \"notify\": \"{}\",\n    \"continuous_update\": true,\n    \"static_notebook\": false,\n    \"show_sidebar\": true,\n    \"full_screen\": true,\n    \"allow_download\": true,\n    \"model_id\": \"mercury-app\",\n    \"code_uid\": \"App.0.40.24.2-rand17eaaf72\"\n}",
       "text/html": [
        "<h3>Mercury Application</h3><small>This output won't appear in the web app.</small>"
       ],
@@ -33,9 +33,9 @@
    "outputs": [
     {
      "data": {
-      "application/mercury+json": "{\n    \"widget\": \"Checkbox\",\n    \"value\": false,\n    \"label\": \"Compare all\",\n    \"model_id\": \"385ef3109d1d4a44b0658c8ee014360e\",\n    \"code_uid\": \"Checkbox.0.40.11.1-rand850c5ef8\",\n    \"url_key\": \"\",\n    \"disabled\": false,\n    \"hidden\": false\n}",
+      "application/mercury+json": "{\n    \"widget\": \"Checkbox\",\n    \"value\": false,\n    \"label\": \"Compare all\",\n    \"model_id\": \"406a1223c5dc49aa8f5a9728dd71dbae\",\n    \"code_uid\": \"Checkbox.0.40.11.1-randec587946\",\n    \"url_key\": \"\",\n    \"disabled\": false,\n    \"hidden\": false\n}",
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "385ef3109d1d4a44b0658c8ee014360e",
+       "model_id": "406a1223c5dc49aa8f5a9728dd71dbae",
        "version_major": 2,
        "version_minor": 0
       },
@@ -48,9 +48,9 @@
     },
     {
      "data": {
-      "application/mercury+json": "{\n    \"widget\": \"Checkbox\",\n    \"value\": false,\n    \"label\": \"Compare 1 vs 1\",\n    \"model_id\": \"6b4174a4f1b24ffbb86e89b56d304750\",\n    \"code_uid\": \"Checkbox.0.40.11.2-rand749ca0d6\",\n    \"url_key\": \"\",\n    \"disabled\": false,\n    \"hidden\": false\n}",
+      "application/mercury+json": "{\n    \"widget\": \"Checkbox\",\n    \"value\": false,\n    \"label\": \"Compare across compute capabilities\",\n    \"model_id\": \"e18a97bcc4804f0db8f94cd574fc8e07\",\n    \"code_uid\": \"Checkbox.0.40.11.2-rand31fb60f4\",\n    \"url_key\": \"\",\n    \"disabled\": false,\n    \"hidden\": false\n}",
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "6b4174a4f1b24ffbb86e89b56d304750",
+       "model_id": "e18a97bcc4804f0db8f94cd574fc8e07",
        "version_major": 2,
        "version_minor": 0
       },
@@ -63,9 +63,9 @@
     },
     {
      "data": {
-      "application/mercury+json": "{\n    \"widget\": \"Checkbox\",\n    \"value\": false,\n    \"label\": \"Compare between tasks\",\n    \"model_id\": \"d4b4bedb893a43079b6303cb3487c007\",\n    \"code_uid\": \"Checkbox.0.40.11.3-rand5a85fb82\",\n    \"url_key\": \"\",\n    \"disabled\": false,\n    \"hidden\": false\n}",
+      "application/mercury+json": "{\n    \"widget\": \"Checkbox\",\n    \"value\": false,\n    \"label\": \"Compare one-on-one\",\n    \"model_id\": \"589330926d0a4692af34ee4f72151b21\",\n    \"code_uid\": \"Checkbox.0.40.11.3-randbb72fc68\",\n    \"url_key\": \"\",\n    \"disabled\": false,\n    \"hidden\": false\n}",
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "d4b4bedb893a43079b6303cb3487c007",
+       "model_id": "589330926d0a4692af34ee4f72151b21",
        "version_major": 2,
        "version_minor": 0
       },
@@ -78,9 +78,24 @@
     },
     {
      "data": {
-      "application/mercury+json": "{\n    \"widget\": \"Checkbox\",\n    \"value\": false,\n    \"label\": \"Multi-GPU\",\n    \"model_id\": \"a07db403be6f46ebb3402692f2131361\",\n    \"code_uid\": \"Checkbox.0.40.11.4-rand6dce6c97\",\n    \"url_key\": \"\",\n    \"disabled\": false,\n    \"hidden\": false\n}",
+      "application/mercury+json": "{\n    \"widget\": \"Checkbox\",\n    \"value\": false,\n    \"label\": \"Compare between tasks\",\n    \"model_id\": \"cd489a79a32e4d9284e42d3d4bc0433f\",\n    \"code_uid\": \"Checkbox.0.40.11.4-rand66c69a3e\",\n    \"url_key\": \"\",\n    \"disabled\": false,\n    \"hidden\": false\n}",
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "a07db403be6f46ebb3402692f2131361",
+       "model_id": "cd489a79a32e4d9284e42d3d4bc0433f",
+       "version_major": 2,
+       "version_minor": 0
+      },
+      "text/plain": [
+       "mercury.Checkbox"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "application/mercury+json": "{\n    \"widget\": \"Checkbox\",\n    \"value\": false,\n    \"label\": \"Multi-GPU\",\n    \"model_id\": \"aeeb3e299fd54fc3b413fcba15796e43\",\n    \"code_uid\": \"Checkbox.0.40.11.5-rand64f9bbd8\",\n    \"url_key\": \"\",\n    \"disabled\": false,\n    \"hidden\": false\n}",
+      "application/vnd.jupyter.widget-view+json": {
+       "model_id": "aeeb3e299fd54fc3b413fcba15796e43",
        "version_major": 2,
        "version_minor": 0
       },
@@ -94,7 +109,8 @@
    ],
    "source": [
     "all_flag = mr.Checkbox(value=False, label=\"Compare all\")\n",
-    "ovo_flag = mr.Checkbox(value=False, label=\"Compare 1 vs 1\")\n",
+    "cc_flag = mr.Checkbox(value=False, label=\"Compare across compute capabilities\")\n",
+    "ovo_flag = mr.Checkbox(value=False, label=\"Compare one-on-one\")\n",
     "com_task_flag = mr.Checkbox(value=False, label=\"Compare between tasks\")\n",
     "mgpu_flag = mr.Checkbox(value=False, label=\"Multi-GPU\")"
    ]
@@ -144,7 +160,19 @@
     {
      "data": {
       "text/markdown": [
-       "- Compare 1 vs 1: Compare the performance by selecting two different set of parameters"
+       "- Compare across compute capabilities: Compare the performance of package(s) with different compute capabilities"
+      ],
+      "text/plain": [
+       "<IPython.core.display.Markdown object>"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/markdown": [
+       "- Compare one-on-one: Compare the performance by selecting two different set of parameters"
       ],
       "text/plain": [
        "<IPython.core.display.Markdown object>"
@@ -179,13 +207,14 @@
     }
    ],
    "source": [
-    "flag_arr = [all_flag.value, ovo_flag.value, com_task_flag.value, mgpu_flag.value]\n",
+    "flag_arr = [all_flag.value, cc_flag.value, ovo_flag.value, com_task_flag.value, mgpu_flag.value]\n",
     "\n",
     "if flag_arr.count(True) == 0 or flag_arr.count(True) > 1:\n",
     "    mr.Md(\"### Performance Benchmarks of quantum simulators\")\n",
     "    mr.Md(\"Options on the left include (please select only one):\")\n",
     "    mr.Md(\"- Compare all: Compare the TtS of all packages and also the performance relative to a given package\")\n",
-    "    mr.Md(\"- Compare 1 vs 1: Compare the performance by selecting two different set of parameters\")\n",
+    "    mr.Md(\"- Compare across compute capabilities: Compare the performance of package(s) with different compute capabilities\")\n",
+    "    mr.Md(\"- Compare one-on-one: Compare the performance by selecting two different set of parameters\")\n",
     "    mr.Md(\"- Compare between tasks: Compare the performance between two tasks with respect to ratio of gates applied\")\n",
     "    mr.Md(\"- Multi-GPU: Compare the performance between different parameters as a function of the number of GPUs\")\n",
     "\n",
@@ -198,7 +227,6 @@
     "    _p = os.getcwd()\n",
     "    \n",
     "    import sys\n",
-    "    \n",
     "    sys.path.append(_p + '/plot_scripts/')\n",
     "    from map_packages_colors_all import *\n",
     "    from plot_scripts_all import *\n",
@@ -225,16 +253,90 @@
     "        mr.Md(f\"Performance benchmarks of task: {task.value}, with compute capability: {com_cap.value}, precision: {prec.value}\")\n",
     "    \n",
     "        abs_time(task.value, com_cap.value, prec.value, com_pack.value, N_slider.value+2)\n",
+    "        \n",
+    "elif cc_flag.value == True:\n",
+    "    \n",
+    "    import numpy as np\n",
+    "    import h5py\n",
+    "    import os\n",
+    "    \n",
+    "    cc_packages_flag = mr.Checkbox(value=False, label=\"Compare across packages\")\n",
+    "    \n",
+    "    cc_pack_flag = mr.Checkbox(value=False, label=\"Compare a single package\")\n",
+    "    \n",
+    "    if (cc_packages_flag.value == False and cc_pack_flag.value == False) or (cc_packages_flag.value == True and cc_pack_flag.value == True):\n",
+    "        mr.Md(\"The options on the left include:\")\n",
+    "        mr.Md(\"- Performance benchmark across packages with different compute capabilities\")\n",
+    "        mr.Md(\"- Performance benchmark of a package with different compute capabilites\")\n",
+    "        \n",
+    "    elif cc_packages_flag.value == True:\n",
+    "\n",
+    "        import sys\n",
+    "        \n",
+    "        _p = os.getcwd()\n",
+    "        \n",
+    "        sys.path.append(_p + '/plot_scripts/')\n",
+    "        from map_packages_colors_all import *\n",
+    "        from plot_scripts_all import *\n",
+    "        from plot_display_com_cap_all import *\n",
+    "        \n",
+    "        # params = {'figure.figsize': (5, 5)}\n",
+    "        # plt.rcParams.update(params)\n",
+    "        \n",
+    "        mr.Md(\"Ratio of different compute capabilities for different packages\")\n",
+    "        \n",
+    "        task = mr.Select(label=\"Select Task: \", value=\"Heisenberg dynamics\", choices=[\"Heisenberg dynamics\", \"Random Quantum Circuit\", \"Quantum Fourier Transform\"])\n",
+    "        \n",
+    "        prec = mr.Select(label=\"Select Precision : \", value=\"Single\", choices=[\"Single\", \"Double\"])\n",
+    "        \n",
+    "        N_slider = mr.Slider(value=36, min=6, max=36, label=\"Select System size: \", step=2)\n",
+    "        \n",
+    "        com_cap_1 = mr.Select(label=\"Select Compute Capability: \", value=\"Singlethread\", choices=[\"Singlethread\", \"Multithread\", \"GPU\"])\n",
+    "        com_cap_2 = mr.Select(label=\"Select Compute Capability: \", value=\"Multithread\", choices=[\"Singlethread\", \"Multithread\", \"GPU\"])        \n",
+    "        \n",
+    "        abs_time_pack(task.value, prec.value, N_slider.value+2, com_cap_1.value, com_cap_2.value)        \n",
+    "        \n",
+    "        compare_task_flag = mr.Checkbox(value=False, label=\"Compare to other task (ratio):\")\n",
+    "        if compare_task_flag.value == True:\n",
+    "            mr.Md(\"___\")\n",
+    "            mr.Md(\"Comparison to different tasks\")\n",
+    "            task2 = mr.Select(label=\"Select Task: \", value=\"Heisenberg dynamics\", choices=[\"Heisenberg dynamics\", \"Random Quantum Circuit\", \"Quantum Fourier Transform\"])\n",
+    "            comp_time_pack(task.value, task2.value, prec.value, N_slider.value+2, com_cap_1.value, com_cap_2.value)\n",
+    "            \n",
+    "    elif cc_pack_flag.value == True:\n",
+    "        \n",
+    "        import sys\n",
+    "        \n",
+    "        _p = os.getcwd()\n",
+    "        \n",
+    "        sys.path.append(_p + '/plot_scripts/')\n",
+    "        from map_packages_colors_1v1 import *\n",
+    "        from plot_scripts_1v1 import *\n",
+    "        from plot_display_com_cap import *\n",
+    "    \n",
+    "        task = mr.Select(label=\"Select Task: \", value=\"Heisenberg dynamics\", choices=[\"Heisenberg dynamics\", \"Random Quantum Circuit\", \"Quantum Fourier Transform\"])\n",
+    "\n",
+    "        com_pack = mr.Select(label=\"Select Package to compare: \", value=\"qsimcirq\", choices=['qiskit' , 'cirq', 'qsimcirq', 'pennylane', 'pennylane_l', 'qibo', 'qibojit', 'yao', 'quest', 'qulacs', 'intel_qs_cpp', 'projectq', 'svsim',  'hybridq', 'hiq', 'qcgpu', 'qrack_sch', 'cuquantum_qiskit', 'cuquantum_qsimcirq', 'qpanda'])\n",
     "    \n",
+    "        prec = mr.Select(label=\"Select Precision : \", value=\"Single\", choices=[\"Single\", \"Double\"])\n",
+    "    \n",
+    "        N_slider = mr.Slider(value=36, min=6, max=36, label=\"Select System size: \", step=2)\n",
+    "    \n",
+    "        if task.value == \"Random Quantum Circuit\" and N_slider.value < 12:\n",
+    "            mr.Md(\"### Please select a different final N value\")\n",
+    "        else:\n",
+    "            abs_time_pack(task.value, com_pack.value, prec.value, N_slider.value+2)\n",
+    "            \n",
+    "    \n",
+    "        \n",
     "elif ovo_flag.value == True:\n",
     "    \n",
     "    import numpy as np\n",
     "    import h5py\n",
     "    import os\n",
     "\n",
-    "    _p = os.getcwd()\n",
-    "    \n",
     "    import sys\n",
+    "    _p = os.getcwd()\n",
     "    sys.path.append(_p + '/plot_scripts/')\n",
     "    from map_packages_colors_1v1 import *\n",
     "    from plot_scripts_1v1 import *\n",
@@ -279,9 +381,8 @@
     "    import h5py\n",
     "    import os\n",
     "\n",
-    "    _p = os.getcwd()\n",
-    "    \n",
     "    import sys\n",
+    "    _p = os.getcwd()\n",
     "    sys.path.append(_p + '/plot_scripts/')\n",
     "    from map_packages_colors_all import *\n",
     "    from plot_scripts_all import *\n",
@@ -319,10 +420,11 @@
     "    import h5py\n",
     "    import os\n",
     "\n",
+    "    import sys\n",
+    "    \n",
     "    _p = os.getcwd()\n",
     "    \n",
-    "    import sys\n",
-    "    sys.path.append(_p+'/plot_scripts/')\n",
+    "    sys.path.append(_p + '/plot_scripts/')\n",
     "    from map_packages_colors_mgpu import *\n",
     "    from plot_scripts_mgpu import *\n",
     "    from plot_display_mgpu import *\n",