qadence 1.6.1__tar.gz → 1.7.0__tar.gz

{qadence-1.6.1 → qadence-1.7.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.3
 Name: qadence
-Version: 1.6.1
+Version: 1.7.0
 Summary: Pasqal interface for circuit-based quantum computing SDKs
-Author-email: Aleksander Wennersteen <aleksander.wennersteen@pasqal.com>, Gert-Jan Both <gert-jan.both@pasqal.com>, Niklas Heim <niklas.heim@pasqal.com>, Mario Dagrada <mario.dagrada@pasqal.com>, Vincent Elfving <vincent.elfving@pasqal.com>, Dominik Seitz <dominik.seitz@pasqal.com>, Roland Guichard <roland.guichard@pasqal.com>, "Joao P. Moutinho" <joao.moutinho@pasqal.com>, Vytautas Abramavicius <vytautas.abramavicius@pasqal.com>, Gergana Velikova <gergana.velikova@pasqal.com>, Eduardo Maschio <eduardo.maschio@pasqal.com>
+Author-email: Aleksander Wennersteen <aleksander.wennersteen@pasqal.com>, Gert-Jan Both <gert-jan.both@pasqal.com>, Niklas Heim <niklas.heim@pasqal.com>, Mario Dagrada <mario.dagrada@pasqal.com>, Vincent Elfving <vincent.elfving@pasqal.com>, Dominik Seitz <dominik.seitz@pasqal.com>, Roland Guichard <roland.guichard@pasqal.com>, "Joao P. Moutinho" <joao.moutinho@pasqal.com>, Vytautas Abramavicius <vytautas.abramavicius@pasqal.com>, Gergana Velikova <gergana.velikova@pasqal.com>, Eduardo Maschio <eduardo.maschio@pasqal.com>, Smit Chaudhary <smit.chaudhary@pasqal.com>
 License: Apache 2.0
 License-File: LICENSE
 Classifier: License :: OSI Approved :: Apache Software License
@@ -22,7 +22,7 @@ Requires-Dist: matplotlib
 Requires-Dist: nevergrad
 Requires-Dist: numpy
 Requires-Dist: openfermion
-Requires-Dist: pyqtorch==1.1.2
+Requires-Dist: pyqtorch==1.2.1
 Requires-Dist: pyyaml
 Requires-Dist: rich
 Requires-Dist: scipy
@@ -53,7 +53,7 @@ Requires-Dist: qadence-libs; extra == 'libs'
 Provides-Extra: protocols
 Requires-Dist: qadence-protocols; extra == 'protocols'
 Provides-Extra: pulser
-Requires-Dist: pasqal-cloud==0.8.1; extra == 'pulser'
+Requires-Dist: pasqal-cloud==0.10.1; extra == 'pulser'
 Requires-Dist: pulser-core==0.18.1; extra == 'pulser'
 Requires-Dist: pulser-simulation==0.18.1; extra == 'pulser'
 Provides-Extra: visualization
@@ -149,6 +149,15 @@ brew install graphviz
 conda install python-graphviz
 ```
 
+On Windows Linux Subsystem (WSL2) it has been reported that in some cases "wslutilities" must be installed.
+Please follow instructions [here](https://wslutiliti.es/wslu/install.html) for your flavour.
+For example on Ubuntu 22.04 LTS and later you must run:
+```
+sudo add-apt-repository ppa:wslutilities/wslu
+sudo apt update
+sudo apt install wslu
+```
+
 ## Contributing
 
 Before making a contribution, please review our [code of conduct](docs/getting_started/CODE_OF_CONDUCT.md).
@@ -179,6 +188,8 @@ install it from source using `pip`:
 python -m pip install -e .
 ```
 
+Users also report problems running Hatch on Windows, we suggest using WSL2.
+
 ## Citation
 
 If you use Qadence for a publication, we kindly ask you to cite our work using the following BibTex entry:

{qadence-1.6.1 → qadence-1.7.0}/README.md

@@ -87,6 +87,15 @@ brew install graphviz
 conda install python-graphviz
 ```
 
+On Windows Linux Subsystem (WSL2) it has been reported that in some cases "wslutilities" must be installed.
+Please follow instructions [here](https://wslutiliti.es/wslu/install.html) for your flavour.
+For example on Ubuntu 22.04 LTS and later you must run:
+```
+sudo add-apt-repository ppa:wslutilities/wslu
+sudo apt update
+sudo apt install wslu
+```
+
 ## Contributing
 
 Before making a contribution, please review our [code of conduct](docs/getting_started/CODE_OF_CONDUCT.md).
@@ -117,6 +126,8 @@ install it from source using `pip`:
 python -m pip install -e .
 ```
 
+Users also report problems running Hatch on Windows, we suggest using WSL2.
+
 ## Citation
 
 If you use Qadence for a publication, we kindly ask you to cite our work using the following BibTex entry:

{qadence-1.6.1 → qadence-1.7.0}/mkdocs.yml

@@ -41,6 +41,7 @@ nav:
     - Variational quantum algorithms:
       - tutorials/qml/index.md
       - Training tools: tutorials/qml/ml_tools.md
+      - Configuring a QNN: tutorials/qml/config_qnn.md
       - Quantum circuit learning: tutorials/qml/qcl.md
       - Solving MaxCut with QAOA: tutorials/qml/qaoa.md
       - Solving a 1D ODE: tutorials/qml/dqc_1d.md

{qadence-1.6.1 → qadence-1.7.0}/pyproject.toml

@@ -14,15 +14,16 @@ authors = [
     { name = "Vincent Elfving", email = "vincent.elfving@pasqal.com" },
     { name = "Dominik Seitz", email = "dominik.seitz@pasqal.com" },
     { name = "Roland Guichard", email = "roland.guichard@pasqal.com" },
-    { name = "Joao P. Moutinho", email = "joao.moutinho@pasqal.com"},
+    { name = "Joao P. Moutinho", email = "joao.moutinho@pasqal.com" },
     { name = "Vytautas Abramavicius", email = "vytautas.abramavicius@pasqal.com" },
     { name = "Gergana Velikova", email = "gergana.velikova@pasqal.com" },
     { name = "Eduardo Maschio", email = "eduardo.maschio@pasqal.com" },
+    { name = "Smit Chaudhary", email = "smit.chaudhary@pasqal.com" },
 ]
 requires-python = ">=3.9"
-license = {text = "Apache 2.0"}
-version = "1.6.1"
-classifiers=[
+license = { text = "Apache 2.0" }
+version = "1.7.0"
+classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
@@ -44,7 +45,7 @@ dependencies = [
     "jsonschema",
     "nevergrad",
     "scipy",
-    "pyqtorch==1.1.2",
+    "pyqtorch==1.2.1",
     "pyyaml",
     "matplotlib",
     "Arpeggio==2.0.2",
@@ -55,13 +56,17 @@ allow-direct-references = true
 allow-ambiguous-features = true
 
 [project.optional-dependencies]
-pulser = ["pulser-core==0.18.1", "pulser-simulation==0.18.1","pasqal-cloud==0.8.1"]
+pulser = [
+    "pulser-core==0.18.1",
+    "pulser-simulation==0.18.1",
+    "pasqal-cloud==0.10.1",
+]
 braket = ["amazon-braket-sdk<1.71.2"]
 visualization = [
-  "graphviz",
-  # FIXME: will be needed once we support latex labels
-  # "latex2svg @ git+https://github.com/Moonbase59/latex2svg.git#egg=latex2svg",
-  # "scour",
+    "graphviz",
+    # FIXME: will be needed once we support latex labels
+    # "latex2svg @ git+https://github.com/Moonbase59/latex2svg.git#egg=latex2svg",
+    # "scour",
 ]
 horqrux = [
     "horqrux==0.6.0",
@@ -70,35 +75,30 @@ horqrux = [
     "optax",
     "jaxopt",
     "einops",
-    "sympy2jax"]
+    "sympy2jax",
+]
 protocols = ["qadence-protocols"]
 libs = ["qadence-libs"]
 dlprof = ["nvidia-pyindex", "nvidia-dlprof[pytorch]"]
-all = [
-  "pulser",
-  "braket",
-  "visualization",
-  "protocols",
-  "libs",
-]
+all = ["pulser", "braket", "visualization", "protocols", "libs"]
 
 [tool.hatch.envs.default]
 dependencies = [
-  "flaky",
-  "hypothesis",
-  "pytest",
-  "pytest-cov",
-  "pytest-mypy",
-  "pytest-xdist",
-  "types-PyYAML",
-  "ipykernel",
-  "pre-commit",
-  "black",
-  "isort",
-  "ruff",
-  "pydocstringformatter",
+    "flaky",
+    "hypothesis",
+    "pytest",
+    "pytest-cov",
+    "pytest-mypy",
+    "pytest-xdist",
+    "types-PyYAML",
+    "ipykernel",
+    "pre-commit",
+    "black",
+    "isort",
+    "ruff",
+    "pydocstringformatter",
 ]
-features = ["pulser", "braket","visualization", "horqrux"]
+features = ["pulser", "braket", "visualization", "horqrux"]
 
 [tool.hatch.envs.default.scripts]
 test = "pytest -n auto --cov-report lcov --cov-config=pyproject.toml --cov=qadence --cov=tests --ignore=./tests/test_examples.py {args}"
@@ -108,34 +108,32 @@ test-docs = "mkdocs build --clean --strict"
 test-all = "pytest -n auto {args}  && mkdocs build --clean --strict"
 
 [tool.pytest.ini_options]
-markers = [
-  "slow: marks tests as slow (deselect with '-m \"not slow\"')",
-]
+markers = ["slow: marks tests as slow (deselect with '-m \"not slow\"')"]
 testpaths = ["tests"]
 addopts = """-vvv"""
 xfail_strict = true
 filterwarnings = [
-  "ignore:Call to deprecated create function FieldDescriptor",
-  "ignore:Call to deprecated create function Descriptor",
-  "ignore:Call to deprecated create function EnumDescriptor",
-  "ignore:Call to deprecated create function EnumValueDescriptor",
-  "ignore:Call to deprecated create function FileDescriptor",
-  "ignore:Call to deprecated create function OneofDescriptor",
-  "ignore:distutils Version classes are deprecated.",
-  "ignore::DeprecationWarning"
+    "ignore:Call to deprecated create function FieldDescriptor",
+    "ignore:Call to deprecated create function Descriptor",
+    "ignore:Call to deprecated create function EnumDescriptor",
+    "ignore:Call to deprecated create function EnumValueDescriptor",
+    "ignore:Call to deprecated create function FileDescriptor",
+    "ignore:Call to deprecated create function OneofDescriptor",
+    "ignore:distutils Version classes are deprecated.",
+    "ignore::DeprecationWarning",
 ]
 
 
 [tool.hatch.envs.docs]
 dependencies = [
-  "mkdocs",
-  "mkdocs-material",
-  "mkdocstrings",
-  "mkdocstrings-python",
-  "mkdocs-section-index",
-  "mkdocs-exclude",
-  "markdown-exec",
-  "mike",
+    "mkdocs",
+    "mkdocs-material",
+    "mkdocstrings",
+    "mkdocstrings-python",
+    "mkdocs-section-index",
+    "mkdocs-exclude",
+    "markdown-exec",
+    "mike",
 ]
 features = ["pulser", "braket", "horqrux", "visualization"]
 
@@ -151,12 +149,12 @@ features = ["all"]
 
 [tool.hatch.build.targets.sdist]
 exclude = [
-  "/.gitignore",
-  "/.gitlab-ci-yml",
-  "/.pre-commit-config.yml",
-  "/tests",
-  "/docs",
-  "/examples",
+    "/.gitignore",
+    "/.gitlab-ci-yml",
+    "/.pre-commit-config.yml",
+    "/tests",
+    "/docs",
+    "/examples",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -167,15 +165,11 @@ branch = true
 parallel = true
 
 [tool.coverage.report]
-exclude_lines = [
-  "no cov",
-  "if __name__ == .__main__.:",
-  "if TYPE_CHECKING:",
-]
+exclude_lines = ["no cov", "if __name__ == .__main__.:", "if TYPE_CHECKING:"]
 
 [tool.ruff]
 select = ["E", "F", "I", "Q"]
-extend-ignore = ["F841","F403"]
+extend-ignore = ["F841", "F403"]
 line-length = 100
 
 [tool.ruff.isort]
@@ -183,8 +177,12 @@ required-imports = ["from __future__ import annotations"]
 
 [tool.ruff.per-file-ignores]
 "__init__.py" = ["F401", "E402"]
-"qadence/operations/primitive.py" = ["E742"]  # Avoid ambiguous class name warning for identity.
-"qadence/backends/horqrux/convert_ops.py" = ["E741"]  # Avoid ambiguous class name warning for 0.
+"qadence/operations/primitive.py" = [
+    "E742",
+] # Avoid ambiguous class name warning for identity.
+"qadence/backends/horqrux/convert_ops.py" = [
+    "E741",
+] # Avoid ambiguous class name warning for 0.
 "examples/*" = ["E402"] # Allow torch seed to be set before qadence imports
 
 [tool.ruff.mccabe]

{qadence-1.6.1 → qadence-1.7.0}/qadence/__init__.py

@@ -49,7 +49,7 @@ from .exceptions import *
 from .execution import *
 from .measurements import *
 from .ml_tools import *
-from .models import *
+from .model import *
 from .noise import *
 from .operations import *
 from .overlap import *
@@ -82,7 +82,7 @@ list_of_submodules = [
     ".execution",
     ".measurements",
     ".ml_tools",
-    ".models",
+    ".model",
     ".operations",
     ".overlap",
     ".parameters",

{qadence-1.6.1 → qadence-1.7.0}/qadence/backends/gpsr.py

@@ -48,7 +48,13 @@ def single_gap_psr(
     Returns:
         Tensor: tensor containing derivative values
     """
-
+    device = torch.device("cpu")
+    try:
+        device = [v.device for v in param_dict.values()][0]
+    except Exception:
+        pass
+    spectral_gap = spectral_gap.to(device=device)
+    shift = shift.to(device=device)
     # + pi/2 shift
     shifted_params = param_dict.copy()
     shifted_params[param_name] = shifted_params[param_name] + shift
@@ -89,11 +95,17 @@ def multi_gap_psr(
 
     # get shift values
     shifts = shift_prefac * torch.linspace(PI / 2 - PI / 5, PI / 2 + PI / 5, n_eqs)
-
+    device = torch.device("cpu")
+    try:
+        device = [v.device for v in param_dict.values()][0]
+    except Exception:
+        pass
+    spectral_gaps = spectral_gaps.to(device=device)
+    shifts = shifts.to(device=device)
     # calculate F vector and M matrix
     # (see: https://arxiv.org/pdf/2108.01218.pdf on p. 4 for definitions)
     F = []
-    M = torch.empty((n_eqs, n_eqs))
+    M = torch.empty((n_eqs, n_eqs)).to(device=device)
     n_obs = 1
     for i in range(n_eqs):
         # + shift

{qadence-1.6.1 → qadence-1.7.0}/qadence/backends/pyqtorch/backend.py

@@ -31,10 +31,10 @@ from qadence.transpile import (
     transpile,
 )
 from qadence.types import BackendName, Endianness, Engine
-from qadence.utils import infer_batchsize, int_to_basis
+from qadence.utils import infer_batchsize
 
 from .config import Configuration, default_passes
-from .convert_ops import convert_block, convert_observable
+from .convert_ops import convert_block
 
 logger = getLogger(__name__)
 
@@ -77,8 +77,13 @@ class Backend(BackendInterface):
             scale_primitive_blocks_only,
         ]
         block = transpile(*transpilations)(observable)  # type: ignore[call-overload]
-
-        (native,) = convert_observable(block, n_qubits=n_qubits, config=self.config)
+        operations = convert_block(block, n_qubits, self.config)
+        obs_cls = (
+            pyq.DiagonalObservable
+            if block._is_diag_pauli and not block.is_parametric
+            else pyq.Observable
+        )
+        native = obs_cls(n_qubits=n_qubits, operations=operations)
         return ConvertedObservable(native=native, abstract=block, original=observable)
 
     def run(
@@ -99,7 +104,7 @@ class Backend(BackendInterface):
             validate_state(state, n_qubits)
             # pyqtorch expects input shape [2] * n_qubits + [batch_size]
             state = pyqify(state, n_qubits) if pyqify_state else state
-        state = circuit.native.run(state, param_values)
+        state = circuit.native.run(state=state, values=param_values)
         state = unpyqify(state) if unpyqify_state else state
         state = invert_endianness(state) if endianness != self.native_endianness else state
         return state
@@ -208,46 +213,26 @@ class Backend(BackendInterface):
         noise: Noise | None = None,
         mitigation: Mitigations | None = None,
         endianness: Endianness = Endianness.BIG,
+        pyqify_state: bool = True,
     ) -> list[Counter]:
-        if n_shots < 1:
-            raise ValueError("You can only call sample with n_shots>0.")
-
-        def _sample(_probs: Tensor, n_shots: int, endianness: Endianness, n_qubits: int) -> Counter:
-            return Counter(
-                {
-                    int_to_basis(k=k, n_qubits=n_qubits, endianness=endianness): count.item()
-                    for k, count in enumerate(
-                        torch.bincount(
-                            torch.multinomial(input=_probs, num_samples=n_shots, replacement=True)
-                        )
-                    )
-                    if count > 0
-                }
-            )
-
-        with torch.no_grad():
-            wf = self.run(circuit=circuit, param_values=param_values, state=state)
-            probs = torch.abs(torch.pow(wf, 2))
-            samples = list(
-                map(
-                    lambda _probs: _sample(
-                        _probs=_probs,
-                        n_shots=n_shots,
-                        endianness=endianness,
-                        n_qubits=circuit.abstract.n_qubits,
-                    ),
-                    probs,
-                )
+        if state is None:
+            state = circuit.native.init_state(batch_size=infer_batchsize(param_values))
+        elif state is not None and pyqify_state:
+            n_qubits = circuit.abstract.n_qubits
+            state = pyqify(state, n_qubits) if pyqify_state else state
+        samples: list[Counter] = circuit.native.sample(
+            state=state, values=param_values, n_shots=n_shots
+        )
+        samples = invert_endianness(samples) if endianness != Endianness.BIG else samples
+        if noise is not None:
+            samples = apply_noise(noise=noise, samples=samples)
+        if mitigation is not None:
+            logger.warning(
+                "Mitigation protocol is deprecated. Use qadence-protocols instead.",
             )
-            if noise is not None:
-                samples = apply_noise(noise=noise, samples=samples)
-            if mitigation is not None:
-                logger.warning(
-                    "Mitigation protocol is deprecated. Use qadence-protocols instead.",
-                )
-                assert noise
-                samples = apply_mitigation(noise=noise, mitigation=mitigation, samples=samples)
-            return samples
+            assert noise
+            samples = apply_mitigation(noise=noise, mitigation=mitigation, samples=samples)
+        return samples
 
     def assign_parameters(self, circuit: ConvertedCircuit, param_values: dict[str, Tensor]) -> Any:
         raise NotImplementedError