qadence 1.6.0__tar.gz → 1.6.3__tar.gz

{qadence-1.6.0 → qadence-1.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qadence
-Version: 1.6.0
+Version: 1.6.3
 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>
 License: Apache 2.0
@@ -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
@@ -30,13 +30,11 @@ Requires-Dist: sympytorch>=0.1.2
 Requires-Dist: tensorboard>=2.12.0
 Requires-Dist: torch
 Provides-Extra: all
-Requires-Dist: amazon-braket-sdk<1.71.2; extra == 'all'
-Requires-Dist: graphviz; extra == 'all'
+Requires-Dist: braket; extra == 'all'
 Requires-Dist: libs; extra == 'all'
-Requires-Dist: pasqal-cloud==0.8.1; extra == 'all'
 Requires-Dist: protocols; extra == 'all'
-Requires-Dist: pulser-core==0.18.0; extra == 'all'
-Requires-Dist: pulser-simulation==0.18.0; extra == 'all'
+Requires-Dist: pulser; extra == 'all'
+Requires-Dist: visualization; extra == 'all'
 Provides-Extra: braket
 Requires-Dist: amazon-braket-sdk<1.71.2; extra == 'braket'
 Provides-Extra: dlprof
@@ -55,9 +53,9 @@ 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: pulser-core==0.18.0; extra == 'pulser'
-Requires-Dist: pulser-simulation==0.18.0; 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
 Requires-Dist: graphviz; extra == 'visualization'
 Description-Content-Type: text/markdown
@@ -151,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).
@@ -181,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.0 → qadence-1.6.3}/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.0 → qadence-1.6.3}/pyproject.toml

@@ -21,7 +21,7 @@ authors = [
 ]
 requires-python = ">=3.9"
 license = {text = "Apache 2.0"}
-version = "1.6.0"
+version = "1.6.3"
 classifiers=[
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
@@ -44,7 +44,7 @@ dependencies = [
     "jsonschema",
     "nevergrad",
     "scipy",
-    "pyqtorch==1.1.2",
+    "pyqtorch==1.2.1",
     "pyyaml",
     "matplotlib",
     "Arpeggio==2.0.2",
@@ -55,7 +55,7 @@ allow-direct-references = true
 allow-ambiguous-features = true
 
 [project.optional-dependencies]
-pulser = ["pulser-core==0.18.0", "pulser-simulation==0.18.0","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",
@@ -75,16 +75,11 @@ protocols = ["qadence-protocols"]
 libs = ["qadence-libs"]
 dlprof = ["nvidia-pyindex", "nvidia-dlprof[pytorch]"]
 all = [
-  "pulser-core==0.18.0",
-  "pulser-simulation==0.18.0",
-  "pasqal-cloud==0.8.1",
-  "amazon-braket-sdk<1.71.2",
-  "graphviz",
+  "pulser",
+  "braket",
+  "visualization",
   "protocols",
   "libs",
-  # FIXME: will be needed once we support latex labels
-  # "latex2svg @ git+https://github.com/Moonbase59/latex2svg.git#egg=latex2svg",
-  # "scour",
 ]
 
 [tool.hatch.envs.default]

{qadence-1.6.0 → qadence-1.6.3}/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.0 → qadence-1.6.3}/qadence/backends/horqrux/backend.py

@@ -195,28 +195,6 @@ class Backend(BackendInterface):
         if n_shots < 1:
             raise ValueError("You can only call sample with n_shots>0.")
 
-        def _sample(
-            _probs: ArrayLike, n_shots: int, endianness: Endianness, n_qubits: int
-        ) -> Counter:
-            _logits = jax.vmap(lambda _p: jnp.log(_p / (1 - _p)))(_probs)
-
-            def _smple(accumulator: ArrayLike, i: int) -> tuple[ArrayLike, None]:
-                accumulator = accumulator.at[i].set(
-                    jax.random.categorical(jax.random.PRNGKey(i), _logits)
-                )
-                return accumulator, None
-
-            samples = jax.lax.scan(
-                _smple, jnp.empty_like(jnp.arange(n_shots)), jnp.arange(n_shots)
-            )[0]
-            return Counter(
-                {
-                    int_to_basis(k=k, n_qubits=n_qubits, endianness=endianness): count.item()
-                    for k, count in enumerate(jnp.bincount(samples))
-                    if count > 0
-                }
-            )
-
         wf = self.run(
             circuit=circuit,
             param_values=param_values,
@@ -225,16 +203,26 @@ class Backend(BackendInterface):
             unhorqify_state=False,
         )
         probs = jnp.abs(jnp.float_power(wf, 2.0)).ravel()
-        samples = [
-            _sample(
-                _probs=probs,
-                n_shots=n_shots,
-                endianness=endianness,
-                n_qubits=circuit.abstract.n_qubits,
-            ),
-        ]
+        key = jax.random.PRNGKey(0)
+        # JAX handles pseudo random number generation by tracking an explicit state via a random key
+        # For more details, see https://jax.readthedocs.io/en/latest/random-numbers.html
+        samples = jax.vmap(
+            lambda subkey: jax.random.choice(
+                key=subkey, a=jnp.arange(0, 2**circuit.abstract.n_qubits), p=probs
+            )
+        )(jax.random.split(key, n_shots))
 
-        return samples
+        return [
+            Counter(
+                {
+                    int_to_basis(
+                        k=k, n_qubits=circuit.abstract.n_qubits, endianness=endianness
+                    ): count.item()
+                    for k, count in enumerate(jnp.bincount(samples))
+                    if count > 0
+                }
+            )
+        ]
 
     def assign_parameters(self, circuit: ConvertedCircuit, param_values: ParamDictType) -> Any:
         raise NotImplementedError

{qadence-1.6.0 → qadence-1.6.3}/qadence/backends/pulser/backend.py

@@ -264,7 +264,10 @@ class Backend(BackendInterface):
         if isinstance(noise_probs, Iterable):
             noisy_batched_dms = []
             for noise_prob in noise_probs:
-                noisy_batched_dms.append(run_noisy_sim(noise_prob))
+                noisy_sim = run_noisy_sim(noise_prob)
+                if not param_values:
+                    noisy_sim = noisy_sim[0]
+                noisy_batched_dms.append(noisy_sim)
             noisy_batched_dms = torch.stack(noisy_batched_dms)
         else:
             noisy_batched_dms = run_noisy_sim(noise_probs)
@@ -350,10 +353,18 @@ class Backend(BackendInterface):
                 # TODO: There should be a better check for batched density matrices.
                 if dms.size()[0] > 1:
                     res_list = [
-                        [obs.native(dm, param_values, qubit_support=support) for dm in dms]
+                        [
+                            obs.native(
+                                dm.squeeze(), param_values, qubit_support=support, noise=noise
+                            )
+                            for dm in dms
+                        ]
                         for obs in observable
                     ]
-                    res = torch.stack([torch.transpose(torch.stack(res), 0, 1) for res in res_list])
+                    res = torch.stack(
+                        [torch.transpose(torch.stack(res), 0, -1) for res in res_list]
+                    )
+
                 else:
                     res_list = [
                         obs.native(dms, param_values, qubit_support=support) for obs in observable

qadence-1.6.3/qadence/backends/pulser/convert_ops.py

@@ -0,0 +1,55 @@
+from __future__ import annotations
+
+from typing import Sequence
+
+import torch
+from torch.nn import Module
+
+from qadence import Noise
+from qadence.blocks import (
+    AbstractBlock,
+)
+from qadence.blocks.block_to_tensor import (
+    block_to_tensor,
+)
+from qadence.utils import Endianness
+
+from .config import Configuration
+
+
+def convert_observable(
+    block: AbstractBlock, n_qubits: int | None, config: Configuration = None
+) -> Sequence[Module]:
+    return [PulserObservable(block, n_qubits)]
+
+
+class PulserObservable(Module):
+    def __init__(self, block: AbstractBlock, n_qubits: int | None):
+        super().__init__()
+        self.block = block
+        self.n_qubits = n_qubits if n_qubits else max(block.qubit_support) + 1
+
+        if not self.block.is_parametric:
+            block_mat = block_to_tensor(
+                self.block, {}, qubit_support=tuple(i for i in range(self.n_qubits))
+            ).squeeze(0)
+            self.register_buffer("block_mat", block_mat)
+
+    def forward(
+        self,
+        state: torch.Tensor,
+        values: dict[str, torch.Tensor] = dict(),
+        qubit_support: tuple | None = None,
+        noise: Noise | None = None,
+        endianness: Endianness = Endianness.BIG,
+    ) -> torch.Tensor:
+        if not self.block.is_parametric:
+            block_mat = self.block_mat
+        else:
+            block_mat = block_to_tensor(
+                self.block, values, qubit_support=qubit_support, endianness=endianness  # type: ignore [arg-type]  # noqa
+            ).squeeze(0)
+        if noise is None:  # Compute expectations for state vector.
+            return torch.sum(torch.matmul(state, block_mat) * state.conj(), dim=1)
+        else:  # Compute expectations for density matrices.
+            return torch.trace(torch.matmul(block_mat, state))

{qadence-1.6.0 → qadence-1.6.3}/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