diff --git a/samples/chemistry/Variational Quantum Algorithms.ipynb b/samples/chemistry/Variational Quantum Algorithms.ipynb index 26a49cf0e7..970661f713 100644 --- a/samples/chemistry/Variational Quantum Algorithms.ipynb +++ b/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)" ] }, { diff --git a/samples/estimation/df-chemistry/chemistry.py b/samples/estimation/df-chemistry/chemistry.py index db0b3e9e6d..4dffc71361 100644 --- a/samples/estimation/df-chemistry/chemistry.py +++ b/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 diff --git a/samples/estimation/estimation-factoring.ipynb b/samples/estimation/estimation-factoring.ipynb index 5f392ddec5..960a5e6f7c 100644 --- a/samples/estimation/estimation-factoring.ipynb +++ b/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())" diff --git a/samples/estimation/estimation-frontier-widgets.ipynb b/samples/estimation/estimation-frontier-widgets.ipynb index 70b3b696b3..9f72b61ac1 100644 --- a/samples/estimation/estimation-frontier-widgets.ipynb +++ b/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", diff --git a/samples/estimation/estimation-hardcoded-circuit.ipynb b/samples/estimation/estimation-hardcoded-circuit.ipynb index 719867c182..3c53f01b16 100644 --- a/samples/estimation/estimation-hardcoded-circuit.ipynb +++ b/samples/estimation/estimation-hardcoded-circuit.ipynb @@ -16,7 +16,7 @@ "metadata": {}, "outputs": [], "source": [ - "import qsharp" + "from qdk import qsharp" ] }, { diff --git a/samples/estimation/estimation-heisenberg-2D.ipynb b/samples/estimation/estimation-heisenberg-2D.ipynb index 68a63b6b58..7563bd04b8 100644 --- a/samples/estimation/estimation-heisenberg-2D.ipynb +++ b/samples/estimation/estimation-heisenberg-2D.ipynb @@ -45,7 +45,7 @@ }, "outputs": [], "source": [ - "import qsharp\n", + "from qdk import qsharp\n", "import pandas as pd" ] }, diff --git a/samples/estimation/estimation-hubbard-2D.ipynb b/samples/estimation/estimation-hubbard-2D.ipynb index 16b31befb9..1aaca46a75 100644 --- a/samples/estimation/estimation-hubbard-2D.ipynb +++ b/samples/estimation/estimation-hubbard-2D.ipynb @@ -45,7 +45,7 @@ }, "outputs": [], "source": [ - "import qsharp\n", + "from qdk import qsharp\n", "import pandas as pd" ] }, diff --git a/samples/estimation/estimation-ising-2D.ipynb b/samples/estimation/estimation-ising-2D.ipynb index 87f1ad8a58..3019041d5f 100644 --- a/samples/estimation/estimation-ising-2D.ipynb +++ b/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" ] }, diff --git a/samples/estimation/estimation-openqasm.ipynb b/samples/estimation/estimation-openqasm.ipynb index 4818a736d2..b991720062 100644 --- a/samples/estimation/estimation-openqasm.ipynb +++ b/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)" ] diff --git a/samples/estimation/estimation-qiskit.ipynb b/samples/estimation/estimation-qiskit.ipynb index fa201b977f..12524b5f79 100644 --- a/samples/estimation/estimation-qiskit.ipynb +++ b/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)" ] diff --git a/samples/estimation/estimation-random-circuit.ipynb b/samples/estimation/estimation-random-circuit.ipynb index 5bfc323322..4294cd2ce1 100644 --- a/samples/estimation/estimation-random-circuit.ipynb +++ b/samples/estimation/estimation-random-circuit.ipynb @@ -16,7 +16,7 @@ "metadata": {}, "outputs": [], "source": [ - "import qsharp" + "from qdk import qsharp" ] }, { diff --git a/samples/notebooks/azure_submission.ipynb b/samples/notebooks/azure_submission.ipynb index 28768e48dc..61335afdb5 100644 --- a/samples/notebooks/azure_submission.ipynb +++ b/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" ] diff --git a/samples/notebooks/benzene_molecule/benzene.ipynb b/samples/notebooks/benzene_molecule/benzene.ipynb index 505dbf824f..118839e24c 100644 --- a/samples/notebooks/benzene_molecule/benzene.ipynb +++ b/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", diff --git a/samples/notebooks/carbon_error_correction/decoder.py b/samples/notebooks/carbon_error_correction/decoder.py index 87acc5ad3f..fa6a501695 100644 --- a/samples/notebooks/carbon_error_correction/decoder.py +++ b/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", diff --git a/samples/notebooks/circuits.ipynb b/samples/notebooks/circuits.ipynb index 13c158f813..c32a3708d1 100644 --- a/samples/notebooks/circuits.ipynb +++ b/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))" ] diff --git a/samples/notebooks/iterative_phase_estimation.ipynb b/samples/notebooks/iterative_phase_estimation.ipynb index a6803fc325..c244024465 100644 --- a/samples/notebooks/iterative_phase_estimation.ipynb +++ b/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", diff --git a/samples/notebooks/noise.ipynb b/samples/notebooks/noise.ipynb index 105177eaf7..42e1a15642 100644 --- a/samples/notebooks/noise.ipynb +++ b/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))" ] } ], diff --git a/samples/notebooks/openqasm.ipynb b/samples/notebooks/openqasm.ipynb index 9dffc29438..c208282bf4 100644 --- a/samples/notebooks/openqasm.ipynb +++ b/samples/notebooks/openqasm.ipynb @@ -29,7 +29,7 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.openqasm import run\n", + "from qdk.openqasm import run\n", "\n", "source = \"\"\"\n", " include \"stdgates.inc\";\n", @@ -60,10 +60,9 @@ "metadata": {}, "outputs": [], "source": [ - "import qsharp\n", - "from qsharp import DepolarizingNoise\n", - "from qsharp.openqasm import run\n", - "from qsharp_widgets import Histogram\n", + "from qdk import DepolarizingNoise\n", + "from qdk.openqasm import run\n", + "from qdk.widgets import Histogram\n", "\n", "source = \"\"\"\n", " include \"stdgates.inc\";\n", @@ -94,7 +93,7 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.openqasm import compile\n", + "from qdk.openqasm import compile\n", "\n", "source = \"\"\"\n", " include \"stdgates.inc\";\n", @@ -119,7 +118,7 @@ "\n", "### Run OpenQASM 3 Code in interactive session\n", "\n", - "Import the `qsharp` module.\n", + "Import `init` method from qdk.\n", "\n", "This initializes a QDK interpreter singleton." ] @@ -131,8 +130,8 @@ "metadata": {}, "outputs": [], "source": [ - "import qsharp\n", - "qsharp.init(target_profile=qsharp.TargetProfile.Base)" + "from qdk import init, TargetProfile\n", + "init(target_profile=TargetProfile.Base)" ] }, { @@ -150,7 +149,7 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.openqasm import import_openqasm, ProgramType\n", + "from qdk.openqasm import import_openqasm, ProgramType\n", "\n", "source = \"\"\"\n", " include \"stdgates.inc\";\n", @@ -179,7 +178,9 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.code.qasm_import import bell\n", + "from qdk import code\n", + "bell = code.qasm_import.bell\n", + "\n", "bell()" ] }, @@ -211,7 +212,7 @@ "id": "6578cadc", "metadata": {}, "source": [ - "This also unlocks all of the other `qsharp` package functionality. Like noisy simulation. Here we'll use the `run` function showing how we can call into the program from Python and display a histogram:" + "This also unlocks all of the other `qdk` module functionality. Like noisy simulation. Here we'll use the `run` function showing how we can call into the program from Python and display a histogram:" ] }, { @@ -221,9 +222,9 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp import DepolarizingNoise\n", - "from qsharp.openqasm import run\n", - "from qsharp_widgets import Histogram\n", + "from qdk import DepolarizingNoise\n", + "from qdk.openqasm import run\n", + "from qdk.widgets import Histogram\n", "\n", "Histogram(run(bell, shots=1000, noise=DepolarizingNoise(0.01)))" ] @@ -243,7 +244,8 @@ "metadata": {}, "outputs": [], "source": [ - "qsharp.circuit(bell)" + "from qdk.openqasm import circuit\n", + "circuit(bell)" ] }, { @@ -261,9 +263,9 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp_widgets import Circuit\n", + "from qdk.widgets import Circuit\n", "\n", - "Circuit(qsharp.circuit(bell))" + "Circuit(circuit(bell))" ] }, { @@ -281,7 +283,8 @@ "metadata": {}, "outputs": [], "source": [ - "print(qsharp.compile(bell))" + "from qdk.openqasm import compile\n", + "print(compile(bell))" ] }, { @@ -357,7 +360,7 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp import init, TargetProfile\n", + "from qdk import init, TargetProfile\n", "\n", "source = \"\"\"\n", "include \"stdgates.inc\";\n", @@ -380,8 +383,11 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.code.qasm_import import parameterized_program\n", - "from qsharp.openqasm import compile\n", + "from qdk import code\n", + "from qdk.openqasm import compile\n", + "\n", + "qasm_import = code.qasm_import\n", + "parameterized_program = qasm_import.parameterized_program\n", "\n", "print(compile(parameterized_program, 1.57))" ] @@ -412,7 +418,8 @@ "\n", "import_openqasm(source, name=\"measure2\", program_type=ProgramType.File)\n", "\n", - "from qsharp.code.qasm_import import measure2\n", + "from qdk import code\n", + "measure2 = code.qasm_import.measure2\n", "\n", "Histogram(run(measure2, shots=1000, qubit_loss=0.1))" ] @@ -443,7 +450,7 @@ "\n", "import_openqasm(source, name=\"mresetz_checked_example\", program_type=ProgramType.File)\n", "\n", - "from qsharp.code.qasm_import import mresetz_checked_example\n", + "mresetz_checked_example = code.qasm_import.mresetz_checked_example\n", "\n", "Histogram(run(mresetz_checked_example, shots=1000, qubit_loss=0.1))\n" ] @@ -465,7 +472,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.14" + "version": "3.14.3" } }, "nbformat": 4, diff --git a/samples/notebooks/project.ipynb b/samples/notebooks/project.ipynb index 0c3da1c4bf..f319c076c0 100644 --- a/samples/notebooks/project.ipynb +++ b/samples/notebooks/project.ipynb @@ -14,7 +14,7 @@ "metadata": {}, "outputs": [], "source": [ - "import qsharp\n", + "from qdk import qsharp\n", "\n", "qsharp.init(project_root='./test_project')\n" ] @@ -48,7 +48,7 @@ "id": "5fad86c4", "metadata": {}, "source": [ - "The callables from the project are also available under `qsharp.code` and can be called or imported from Python." + "The callables from the project are also available under `qdk.code` and can be called or imported from Python." ] }, { @@ -58,8 +58,8 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.code.Sample import Main\n", - "\n", + "from qdk import code\n", + "Main = code.Sample.Main\n", "res = Main()\n", "print(f\"Got return value from Q# code: {res}\")" ] @@ -81,7 +81,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.11" + "version": "3.14.3" } }, "nbformat": 4, diff --git a/samples/notebooks/repeat_until_success.ipynb b/samples/notebooks/repeat_until_success.ipynb index 13093e7071..57966cfa25 100644 --- a/samples/notebooks/repeat_until_success.ipynb +++ b/samples/notebooks/repeat_until_success.ipynb @@ -52,7 +52,7 @@ }, "outputs": [], "source": [ - "import qsharp\n", + "from qdk import qsharp\n", "\n", "qsharp.init(target_profile=qsharp.TargetProfile.Adaptive_RI)" ] diff --git a/samples/notebooks/sample.ipynb b/samples/notebooks/sample.ipynb index 6547bc8540..f5bff787aa 100644 --- a/samples/notebooks/sample.ipynb +++ b/samples/notebooks/sample.ipynb @@ -17,7 +17,7 @@ "metadata": {}, "outputs": [], "source": [ - "import qsharp\n" + "from qdk import qsharp" ] }, { @@ -83,7 +83,7 @@ "id": "19f4ef6d", "metadata": {}, "source": [ - "`qsharp.code` provides direct access to simulating callables defined in Q#." + "`qdk.code` provides direct access to simulating callables defined in Q#." ] }, { @@ -93,7 +93,8 @@ "metadata": {}, "outputs": [], "source": [ - "qsharp.code.Main()" + "import qdk\n", + "qdk.code.Main()" ] }, { @@ -133,7 +134,7 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp import QSharpError\n", + "from qdk.qsharp import QSharpError\n", "\n", "try:\n", " qsharp.eval(\n", @@ -448,7 +449,8 @@ " }\n", " \"\"\")\n", "\n", - "from qsharp.code import AddTwoInts\n", + "from qdk import code\n", + "AddTwoInts = code.AddTwoInts\n", "\n", "print(AddTwoInts(2, 3))\n", "\n", @@ -499,7 +501,8 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.code.MyNamespace import MyOperation\n", + "from qdk import code\n", + "MyOperation = code.MyNamespace.MyOperation\n", "\n", "MyOperation()" ] diff --git a/samples/python_interop/eval_single_file/run.py b/samples/python_interop/eval_single_file/run.py index 9eed91c649..0d8316e4b6 100644 --- a/samples/python_interop/eval_single_file/run.py +++ b/samples/python_interop/eval_single_file/run.py @@ -1,8 +1,8 @@ from pathlib import Path -import qsharp +from qdk import qsharp # Import the Q# code from the teleport.qs file -code = (Path(__file__).parent / "sample.qs").read_text() +code = (Path(__file__).parent / "sample.qs").read_text(encoding="utf-8") qsharp.eval(code) # Directly invoke the Main operation defined in the loaded file diff --git a/samples/python_interop/generating_n_random_bits/RunGenerateRandom.py b/samples/python_interop/generating_n_random_bits/RunGenerateRandom.py index 8e9434ef0a..4186415810 100644 --- a/samples/python_interop/generating_n_random_bits/RunGenerateRandom.py +++ b/samples/python_interop/generating_n_random_bits/RunGenerateRandom.py @@ -1,10 +1,12 @@ from pathlib import Path -import qsharp +from qdk import qsharp this_dir = Path(__file__).parent qsharp.init(project_root=this_dir) -from qsharp.code.GenerateRandomNumbers import GenerateRandomNumbers +from qdk import code + +GenerateRandomNumbers = code.GenerateRandomNumbers.GenerateRandomNumbers nQubits = input("Enter the number of random bits to be generated: ") (results, number) = GenerateRandomNumbers(int(nQubits)) diff --git a/samples/python_interop/qiskit.ipynb b/samples/python_interop/qiskit.ipynb index 697a2f4877..c82ac6ce50 100644 --- a/samples/python_interop/qiskit.ipynb +++ b/samples/python_interop/qiskit.ipynb @@ -71,7 +71,7 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.interop.qiskit import QSharpBackend\n", + "from qdk.qiskit import QSharpBackend\n", "\n", "backend = QSharpBackend()\n", "job = backend.run(circuit)\n", @@ -148,8 +148,8 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp import QSharpError, TargetProfile\n", - "from qsharp.interop.qiskit import QSharpBackend\n", + "from qdk.qsharp import QSharpError, TargetProfile\n", + "from qdk.qiskit import QSharpBackend\n", "\n", "circuit = get_parameterized_circuit(3)\n", "backend = QSharpBackend()\n", @@ -174,7 +174,7 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.interop.qiskit import QSharpBackend\n", + "from qdk.qiskit import QSharpBackend\n", "\n", "circuit = get_parameterized_circuit(3)\n", "backend = QSharpBackend()\n", @@ -219,7 +219,7 @@ " QuantumCircuit,\n", ")\n", "\n", - "from qsharp import QSharpError, TargetProfile\n", + "from qdk.qsharp import QSharpError, TargetProfile\n", "\n", "qreg = QuantumRegister(3, name=\"q\")\n", "creg = ClassicalRegister(3, name=\"c\")\n", @@ -329,7 +329,7 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.interop.qiskit import QasmError\n", + "from qdk.qiskit import QasmError\n", "\n", "try:\n", " circuit = QuantumCircuit(2)\n", @@ -355,7 +355,7 @@ "metadata": {}, "outputs": [], "source": [ - "from qsharp.interop.qiskit import QasmError\n", + "from qdk.qiskit import QasmError\n", "\n", "try:\n", " q = QuantumRegister(2, name=\"q\")\n", @@ -457,10 +457,10 @@ } ], "metadata": { - "language_info": { - "name": "python" - } - }, + "language_info": { + "name": "python" + } + }, "nbformat": 4, "nbformat_minor": 5 } diff --git a/samples/python_interop/teleportation_project/RunTeleport.py b/samples/python_interop/teleportation_project/RunTeleport.py index 872c8c2580..8afa16848a 100644 --- a/samples/python_interop/teleportation_project/RunTeleport.py +++ b/samples/python_interop/teleportation_project/RunTeleport.py @@ -1,5 +1,5 @@ from pathlib import Path -import qsharp +from qdk import qsharp # set the root folder for the Q# project # the root folder of a Q# project is where the qsharp.json file is located diff --git a/samples/qre/0_getting_started.ipynb b/samples/qre/0_getting_started.ipynb index 268fca6083..0aa45b0a17 100644 --- a/samples/qre/0_getting_started.ipynb +++ b/samples/qre/0_getting_started.ipynb @@ -71,7 +71,7 @@ "outputs": [], "source": [ "# Evaluate the Q# application into the scope\n", - "qsharp.eval(Path(\"../algorithms/Ising/Simple1dIsingOrder1.qs\").read_text())\n", + "qsharp.eval(Path(\"../algorithms/Ising/Simple1dIsingOrder1.qs\").read_text(encoding=\"utf-8\"))\n", "\n", "# The entry point in the Q# code above is called Main\n", "app = QSharpApplication(qdk.code.Main)" diff --git a/samples/qre/1_qre_input.ipynb b/samples/qre/1_qre_input.ipynb index d3ed86cfd9..a6f07d2d9d 100644 --- a/samples/qre/1_qre_input.ipynb +++ b/samples/qre/1_qre_input.ipynb @@ -135,7 +135,7 @@ " / \"source\" / \"pip\" / \"tests-integration\" / \"resources\"\n", " / \"adaptive_ri\" / \"output\" / \"HiddenShiftNISQ.ll\"\n", ")\n", - "qir_app = QIRApplication(qir_file.read_text())" + "qir_app = QIRApplication(qir_file.read_text(encoding=\"utf-8\"))" ] }, { diff --git a/samples/testing/classical_values/test_classical_values.py b/samples/testing/classical_values/test_classical_values.py index 458e9ffc7d..98bc8a305a 100644 --- a/samples/testing/classical_values/test_classical_values.py +++ b/samples/testing/classical_values/test_classical_values.py @@ -1,7 +1,7 @@ from pathlib import Path from random import randint import pytest -import qsharp +from qdk import qsharp @pytest.fixture(autouse=True) diff --git a/samples/testing/operations/test_operations.py b/samples/testing/operations/test_operations.py index a7f1a03dc4..c732ea6abf 100644 --- a/samples/testing/operations/test_operations.py +++ b/samples/testing/operations/test_operations.py @@ -3,8 +3,8 @@ from pathlib import Path import pytest -import qsharp -from qsharp.utils import dump_operation +from qdk import qsharp +from qdk.qsharp import dump_operation @pytest.fixture(autouse=True) diff --git a/samples/testing/states/test_states.py b/samples/testing/states/test_states.py index 1519090998..954c32f242 100644 --- a/samples/testing/states/test_states.py +++ b/samples/testing/states/test_states.py @@ -1,5 +1,5 @@ import pytest -import qsharp +from qdk import qsharp @pytest.fixture(autouse=True) def setup(): diff --git a/source/pip/README.md b/source/pip/README.md index 15cc6765b0..dfc229221d 100644 --- a/source/pip/README.md +++ b/source/pip/README.md @@ -17,7 +17,7 @@ pip install qsharp First, import the `qsharp` module: ```python -import qsharp +from qdk import qsharp ``` Then, use the `%%qsharp` cell magic to run Q# directly in Jupyter notebook cells: diff --git a/source/pip/qsharp/interop/qiskit/__init__.py b/source/pip/qsharp/interop/qiskit/__init__.py index 47efd0ed95..480e2761b7 100644 --- a/source/pip/qsharp/interop/qiskit/__init__.py +++ b/source/pip/qsharp/interop/qiskit/__init__.py @@ -105,4 +105,5 @@ def estimate( "estimate", "EstimatorParams", "EstimatorResult", + "QasmError", ] diff --git a/source/pip/qsharp/qre/interop/_qsharp.py b/source/pip/qsharp/qre/interop/_qsharp.py index 83c2cee60d..e8a8e8fe12 100644 --- a/source/pip/qsharp/qre/interop/_qsharp.py +++ b/source/pip/qsharp/qre/interop/_qsharp.py @@ -144,7 +144,7 @@ def trace_from_entry_expr_cached( Trace: A trace representing the resource profile of the program. """ if cache_path and cache_path.exists(): - return Trace.from_json(cache_path.read_text()) + return Trace.from_json(cache_path.read_text(encoding="utf-8")) trace = trace_from_entry_expr(entry_expr, *args) diff --git a/source/pip/tests/qre/test_interop.py b/source/pip/tests/qre/test_interop.py index 6f3cf37713..99416d6bb7 100644 --- a/source/pip/tests/qre/test_interop.py +++ b/source/pip/tests/qre/test_interop.py @@ -31,7 +31,7 @@ def test_trace_from_qir(ll_file): # QIR output without errors, rather than checking specific properties of the # trace. try: - app = QIRApplication(ll_file.read_text()) + app = QIRApplication(ll_file.read_text(encoding="utf-8")) _ = app.get_trace() except ValueError as e: # The only reason of failure is presence of control flow diff --git a/source/vscode/skills/qdk-programming/python.md b/source/vscode/skills/qdk-programming/python.md index 1b2bcbd409..904739f0c0 100644 --- a/source/vscode/skills/qdk-programming/python.md +++ b/source/vscode/skills/qdk-programming/python.md @@ -151,7 +151,7 @@ results = qsharp.run("CNOT_Measure()", 100, seed=42) from pathlib import Path # Load and evaluate a .qs file -code = Path("sample.qs").read_text() +code = Path("sample.qs").read_text(encoding="utf-8") qsharp.eval(code) # Run an operation defined in that file diff --git a/source/widgets/README.md b/source/widgets/README.md index 9eb0d1e54f..1128473ab0 100644 --- a/source/widgets/README.md +++ b/source/widgets/README.md @@ -27,8 +27,8 @@ code such as that shown below: ```python # Cell-1 : Import the modules and generate some estimates -import qsharp -from qsharp_widgets import SpaceChart, EstimateDetails +from qdk import qsharp +from qdk.widgets import SpaceChart, EstimateDetails with open("sample.qs", "r") as f: contents = f.read() diff --git a/source/widgets/src/qsharp_widgets/__init__.py b/source/widgets/src/qsharp_widgets/__init__.py index 0b56139ae2..5f5e172c7e 100644 --- a/source/widgets/src/qsharp_widgets/__init__.py +++ b/source/widgets/src/qsharp_widgets/__init__.py @@ -186,7 +186,7 @@ def __init__( ) def run(self, entry_expr, shots): - import qsharp + from qdk import qsharp self._new_buckets = {} self._new_count = 0