update python importing pattern to use qdk

samples/chemistry/Variational Quantum Algorithms.ipynb

@@ -45,7 +45,7 @@
    "source": [
     "from itertools import product\n",
     "import qutip as qt\n",
-    "import qsharp\n",
+    "from qdk import qsharp\n",
     "\n",
     "qsharp.init(project_root=\"SPSA\")"
    ]
@@ -350,7 +350,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "qsharp.code.EstimateExpectationOfZero()"
+    "from qdk import code\n",
+    "code.EstimateExpectationOfZero()"
    ]
   },
   {
@@ -390,7 +391,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "qsharp.code.EstimateExpectationOfOne()"
+    "code.EstimateExpectationOfOne()"
    ]
   },
   {
@@ -422,7 +423,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "qsharp.code.EstimateExpectationOfPlus()"
+    "code.EstimateExpectationOfPlus()"
    ]
   },
   {
@@ -610,7 +611,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "qsharp.code.EstimateEnergyOfPlus(H_decomposition)"
+    "code.EstimateEnergyOfPlus(H_decomposition)"
    ]
   },
   {
@@ -735,7 +736,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "qsharp.code.DumpAnsatz(ansatz_axes, [1.2, 1.9])"
+    "code.DumpAnsatz(ansatz_axes, [1.2, 1.9])"
    ]
   },
   {
@@ -745,7 +746,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "qsharp.code.DumpAnsatz(ansatz_axes, [1.2, -0.7])"
+    "code.DumpAnsatz(ansatz_axes, [1.2, -0.7])"
    ]
   },
   {
@@ -785,7 +786,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "qsharp.code.EstimateEnergyAtAnsatz(\n",
+    "code.EstimateEnergyAtAnsatz(\n",
     "    H_decomposition,\n",
     "    ansatz_axes,\n",
     "    [1.2, 1.9],\n",
@@ -844,7 +845,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "qsharp.code.FindMinimumEnergy(H_decomposition, ansatz_axes, [1.2, 1.9], 1000)"
+    "code.FindMinimumEnergy(H_decomposition, ansatz_axes, [1.2, 1.9], 1000)"
    ]
   },
   {

samples/estimation/df-chemistry/chemistry.py

@@ -5,7 +5,7 @@
 import numpy as np
 import numpy.linalg as LA
 import numpy.typing as npt
-import qsharp
+from qdk import qsharp
 from argparse import ArgumentParser
 from dataclasses import dataclass
 from pathlib import Path

samples/estimation/estimation-factoring.ipynb

@@ -17,8 +17,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import qsharp\n",
-    "from qsharp_widgets import EstimatesOverview\n",
+    "from qdk import qsharp\n",
+    "from qdk.widgets import EstimatesOverview\n",
     "\n",
     "with open(\"EkeraHastadFactoring.qs\", \"r\") as f:\n",
     "    qsharp.eval(f.read())"

samples/estimation/estimation-frontier-widgets.ipynb

@@ -10,8 +10,8 @@
     "# by running the following command in a terminal:\n",
     "# pip install qsharp qsharp-widgets -U\n",
     "\n",
-    "import qsharp\n",
-    "from qsharp_widgets import SpaceChart, EstimateDetails, EstimatesOverview, EstimatesPanel\n",
+    "from qdk import qsharp\n",
+    "from qdk.widgets import SpaceChart, EstimateDetails, EstimatesOverview, EstimatesPanel\n",
     "\n",
     "with open(\"Dynamics.qs\", \"r\") as f:\n",
     "    contents = f.read()\n",

samples/estimation/estimation-hardcoded-circuit.ipynb

@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import qsharp"
+    "from qdk import qsharp"
    ]
   },
   {

samples/estimation/estimation-heisenberg-2D.ipynb

@@ -45,7 +45,7 @@
    },
    "outputs": [],
    "source": [
-    "import qsharp\n",
+    "from qdk import qsharp\n",
     "import pandas as pd"
    ]
   },

samples/estimation/estimation-hubbard-2D.ipynb

@@ -45,7 +45,7 @@
    },
    "outputs": [],
    "source": [
-    "import qsharp\n",
+    "from qdk import qsharp\n",
     "import pandas as pd"
    ]
   },

samples/estimation/estimation-ising-2D.ipynb

@@ -20,7 +20,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import qsharp\n",
+    "from qdk import qsharp\n",
     "import pandas as pd"
    ]
   },

samples/estimation/estimation-openqasm.ipynb

@@ -96,8 +96,8 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "from qsharp.estimator import EstimatorParams\n",
-        "from qsharp.openqasm import estimate\n",
+        "from qdk.estimator import EstimatorParams\n",
+        "from qdk.openqasm import estimate\n",
         "\n",
         "params = EstimatorParams()\n",
         "result = estimate(program, params)"
@@ -116,7 +116,7 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "from qsharp_widgets import EstimateDetails\n",
+        "from qdk.widgets import EstimateDetails\n",
         "\n",
         "EstimateDetails(result)"
       ]
@@ -134,7 +134,7 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "from qsharp_widgets import SpaceChart\n",
+        "from qdk.widgets import SpaceChart\n",
         "\n",
         "SpaceChart(result)"
       ]

samples/estimation/estimation-qiskit.ipynb

@@ -91,8 +91,8 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "from qsharp.estimator import EstimatorParams\n",
-        "from qsharp.interop.qiskit import estimate\n",
+        "from qdk.estimator import EstimatorParams\n",
+        "from qdk.qiskit import estimate\n",
         "\n",
         "params = EstimatorParams()\n",
         "result = estimate(circ, params, skip_transpilation=True)"
@@ -111,8 +111,8 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "from qsharp.interop.qiskit import ResourceEstimatorBackend\n",
-        "from qsharp.estimator import EstimatorParams\n",
+        "from qdk.qiskit import ResourceEstimatorBackend\n",
+        "from qdk.estimator import EstimatorParams\n",
         "\n",
         "params = EstimatorParams()\n",
         "backend = ResourceEstimatorBackend(skip_transpilation=True)\n",
@@ -134,7 +134,7 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "from qsharp_widgets import EstimateDetails\n",
+        "from qdk.widgets import EstimateDetails\n",
         "\n",
         "EstimateDetails(result)"
       ]
@@ -152,7 +152,7 @@
       "metadata": {},
       "outputs": [],
       "source": [
-        "from qsharp_widgets import SpaceChart\n",
+        "from qdk.widgets import SpaceChart\n",
         "\n",
         "SpaceChart(result)"
       ]

samples/estimation/estimation-random-circuit.ipynb

@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import qsharp"
+    "from qdk import qsharp"
    ]
   },
   {

samples/notebooks/azure_submission.ipynb

@@ -32,7 +32,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import qsharp\n",
+    "from qdk import qsharp\n",
     "\n",
     "qsharp.init(target_profile=qsharp.TargetProfile.Base)\n"
    ]

samples/notebooks/benzene_molecule/benzene.ipynb

@@ -24,7 +24,7 @@
     "from qdk.widgets import Circuit, Histogram\n",
     "\n",
     "from pathlib import Path\n",
-    "src = Path(\"benzene_diradical_injected_rotation_measurement_circuit_0.qasm\").read_text()\n",
+    "src = Path(\"benzene_diradical_injected_rotation_measurement_circuit_0.qasm\").read_text(encoding=\"utf-8\")\n",
     "\n",
     "init(target_profile=TargetProfile.Base)\n",
     "qir = compile(src)"
@@ -131,16 +131,16 @@
     "from qdk.widgets import MoleculeViewer\n",
     "\n",
     "# Load cached molecule data from file.\n",
-    "molecule_data = Path(\"benzene_diradical.structure.xyz\").read_text()\n",
+    "molecule_data = Path(\"benzene_diradical.structure.xyz\").read_text(encoding=\"utf-8\")\n",
     "\n",
     "# Note: The \"info\" field is optional and can contain any metadata you want to display with the cube data.\n",
     "cube_data = {\n",
     "    \"alpha_18\": {\n",
-    "        \"data\": Path(\"MO_alpha_18.cube\").read_text(),\n",
+    "        \"data\": Path(\"MO_alpha_18.cube\").read_text(encoding=\"utf-8\"),\n",
     "        \"info\": {\"Energy (Ha)\": -0.392, \"Symmetry\": \"A1\", \"Occupation\": 1.0}\n",
     "    },\n",
     "    \"alpha_19\": {\n",
-    "        \"data\": Path(\"MO_alpha_19.cube\").read_text(),\n",
+    "        \"data\": Path(\"MO_alpha_19.cube\").read_text(encoding=\"utf-8\"),\n",
     "        \"info\": {\"Energy (Ha)\":  0.581, \"Symmetry\": \"B2\", \"Occupation\": 0.0}\n",
     "    }\n",
     "}\n",

samples/notebooks/carbon_error_correction/decoder.py

@@ -3,7 +3,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-import qsharp
+from qdk import qsharp
 
 table = {
     frozenset(): "IIIIIIIIIIII",

samples/notebooks/circuits.ipynb

@@ -13,7 +13,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import qsharp"
+    "from qdk import qsharp"
    ]
   },
   {
@@ -71,7 +71,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from qsharp_widgets import Circuit\n",
+    "from qdk.widgets import Circuit\n",
     "\n",
     "Circuit(qsharp.circuit(\"GHZSample(3)\"))"
    ]
@@ -228,7 +228,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from qsharp import CircuitGenerationMethod\n",
+    "from qdk.qsharp import CircuitGenerationMethod\n",
     "\n",
     "Circuit(qsharp.circuit(\"ResetIfOne()\", generation_method=CircuitGenerationMethod.Simulate))"
    ]

samples/notebooks/iterative_phase_estimation.ipynb

@@ -23,7 +23,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import qsharp\n",
+    "from qdk import qsharp\n",
     "\n",
     "qsharp.init(target_profile=qsharp.TargetProfile.Adaptive_RI)"
    ]
@@ -353,11 +353,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "vscode": {
-     "languageId": "qsharp"
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "job = target.submit(qsharp.compile(\"PerformMeasurements(PI() / 7.0, PI() / 5.0, 4)\"), shots=128)\n",

samples/notebooks/noise.ipynb

@@ -7,7 +7,7 @@
     "# Simulating Pauli noise and Qubit Loss\n",
     "This notebook shows how to run simulations with Pauli noise, such as bit-flip or depolarizing noise, as well as qubit loss.\n",
     "\n",
-    "First, make sure prerequisites are available. Packages `qsharp` and `qsharp_widgets` must be already installed."
+    "First, make sure prerequisites are available. The package and extra `qdk[jupyter]` must be already installed."
    ]
   },
   {
@@ -16,8 +16,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import qsharp\n",
-    "import qsharp_widgets"
+    "from qdk import qsharp\n",
+    "from qdk.widgets import Histogram"
    ]
   },
   {
@@ -133,7 +133,7 @@
    "outputs": [],
    "source": [
     "result = qsharp.run(\"Cat5()\", 1000)\n",
-    "qsharp_widgets.Histogram(result)\n"
+    "Histogram(result)\n"
    ]
   },
   {
@@ -152,7 +152,7 @@
     "for p in [0.01, 0.05, 0.1, 0.25]:\n",
     "    result = qsharp.run(\"Cat5()\", 1000, noise=qsharp.BitFlipNoise(p))\n",
     "    display(f\"Noise probability = {p}\")\n",
-    "    display(qsharp_widgets.Histogram(result))"
+    "    display(Histogram(result))"
    ]
   },
   {
@@ -178,9 +178,9 @@
    "outputs": [],
    "source": [
     "result = qsharp.run(\"Cat5()\", 1000, noise=(0.1, 0.0, 0.1))\n",
-    "display(qsharp_widgets.Histogram(result))\n",
+    "display(Histogram(result))\n",
     "result = qsharp.run(\"Cat5()\", 1000, noise=(0.0, 0.1, 0.0))\n",
-    "display(qsharp_widgets.Histogram(result))"
+    "display(Histogram(result))"
    ]
   },
   {
@@ -201,7 +201,7 @@
    "outputs": [],
    "source": [
     "result = qsharp.run(\"BellPair()\", 100, qubit_loss=0.5)\n",
-    "display(qsharp_widgets.Histogram(result))"
+    "display(Histogram(result))"
    ]
   },
   {
@@ -243,7 +243,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "qsharp_widgets.Histogram(qsharp.run(\"CheckForLoss()\", 100, qubit_loss=0.5))"
+    "Histogram(qsharp.run(\"CheckForLoss()\", 100, qubit_loss=0.5))"
    ]
   }
  ],