qadence 1.5.0__tar.gz → 1.5.1__tar.gz

{qadence-1.5.0 → qadence-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qadence
-Version: 1.5.0
+Version: 1.5.1
 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>
 License: Apache 2.0

{qadence-1.5.0 → qadence-1.5.1}/pyproject.toml

@@ -20,7 +20,7 @@ authors = [
 ]
 requires-python = ">=3.9,<3.13"
 license = {text = "Apache 2.0"}
-version = "1.5.0"
+version = "1.5.1"
 classifiers=[
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",

{qadence-1.5.0 → qadence-1.5.1}/qadence/backend.py

@@ -26,7 +26,6 @@ from qadence.mitigations import Mitigations
 from qadence.noise import Noise
 from qadence.parameters import stringify
 from qadence.types import ArrayLike, BackendName, DiffMode, Endianness, Engine, ParamDictType
-from qadence.utils import validate_values_and_state
 
 logger = get_logger(__file__)
 
@@ -259,29 +258,6 @@ class Backend(ABC):
         """
         raise NotImplementedError
 
-    @abstractmethod
-    def _run(
-        self,
-        circuit: ConvertedCircuit,
-        param_values: dict[str, ArrayLike] = {},
-        state: ArrayLike | None = None,
-        endianness: Endianness = Endianness.BIG,
-    ) -> ArrayLike:
-        """Run a circuit and return the resulting wave function.
-
-        Arguments:
-            circuit: A converted circuit as returned by `backend.circuit`.
-            param_values: _**Already embedded**_ parameters of the circuit. See
-                [`embedding`][qadence.blocks.embedding.embedding] for more info.
-            state: Initial state.
-            endianness: Endianness of the resulting wavefunction.
-
-        Returns:
-            A list of Counter objects where each key represents a bitstring
-            and its value the number of times it has been sampled from the given wave function.
-        """
-        raise NotImplementedError
-
     def run(
         self,
         circuit: ConvertedCircuit,
@@ -304,8 +280,7 @@ class Backend(ABC):
             A list of Counter objects where each key represents a bitstring
             and its value the number of times it has been sampled from the given wave function.
         """
-        validate_values_and_state(state, circuit.abstract.n_qubits, param_values)
-        return self._run(circuit, param_values, state, endianness, *args, **kwargs)
+        raise NotImplementedError
 
     @abstractmethod
     def run_dm(

{qadence-1.5.0 → qadence-1.5.1}/qadence/backends/braket/backend.py

@@ -88,7 +88,7 @@ class Backend(BackendInterface):
         ).squeeze(0)
         return ConvertedObservable(native=native, abstract=obs, original=obs)
 
-    def _run(
+    def run(
         self,
         circuit: ConvertedCircuit,
         param_values: dict[str, Tensor] = {},

{qadence-1.5.0 → qadence-1.5.1}/qadence/backends/horqrux/backend.py

@@ -66,7 +66,7 @@ class Backend(BackendInterface):
         hq_obs = convert_observable(block, n_qubits=n_qubits, config=self.config)
         return ConvertedObservable(native=hq_obs, abstract=block, original=observable)
 
-    def _run(
+    def run(
         self,
         circuit: ConvertedCircuit,
         param_values: ParamDictType = {},

{qadence-1.5.0 → qadence-1.5.1}/qadence/backends/pulser/backend.py

@@ -200,7 +200,7 @@ class Backend(BackendInterface):
 
         return circuit.native.build(**numpy_param_values)
 
-    def _run(
+    def run(
         self,
         circuit: ConvertedCircuit,
         param_values: dict[str, Tensor] = {},

{qadence-1.5.0 → qadence-1.5.1}/qadence/backends/pyqtorch/backend.py

@@ -80,7 +80,7 @@ class Backend(BackendInterface):
         (native,) = convert_observable(block, n_qubits=n_qubits, config=self.config)
         return ConvertedObservable(native=native, abstract=block, original=observable)
 
-    def _run(
+    def run(
         self,
         circuit: ConvertedCircuit,
         param_values: dict[str, Tensor] = {},

{qadence-1.5.0 → qadence-1.5.1}/qadence/ml_tools/models.py

@@ -289,11 +289,23 @@ class TransformedModule(torch.nn.Module):
     def to(self, *args: Any, **kwargs: Any) -> TransformedModule:
         try:
             self.model = self.model.to(*args, **kwargs)
-            self._input_scaling = self._input_scaling.to(*args, **kwargs)
-            self._input_shifting = self._input_shifting.to(*args, **kwargs)
-            self._output_scaling = self._output_scaling.to(*args, **kwargs)
-            self._output_shifting = self._output_shifting.to(*args, **kwargs)
-
+            if isinstance(self.model, QuantumModel):
+                device = self.model._circuit.native.device
+                dtype = (
+                    torch.float64
+                    if self.model._circuit.native.dtype == torch.cdouble
+                    else torch.float32
+                )
+
+                self._input_scaling = self._input_scaling.to(device=device, dtype=dtype)
+                self._input_shifting = self._input_shifting.to(device=device, dtype=dtype)
+                self._output_scaling = self._output_scaling.to(device=device, dtype=dtype)
+                self._output_shifting = self._output_shifting.to(device=device, dtype=dtype)
+            elif isinstance(self.model, torch.nn.Module):
+                self._input_scaling = self._input_scaling.to(*args, **kwargs)
+                self._input_shifting = self._input_shifting.to(*args, **kwargs)
+                self._output_scaling = self._output_scaling.to(*args, **kwargs)
+                self._output_shifting = self._output_shifting.to(*args, **kwargs)
             logger.debug(f"Moved {self} to {args}, {kwargs}.")
         except Exception as e:
             logger.warning(f"Unable to move {self} to {args}, {kwargs} due to {e}.")

{qadence-1.5.0 → qadence-1.5.1}/qadence/ml_tools/train_grad.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import Callable, Union
 
 from rich.progress import BarColumn, Progress, TaskProgressColumn, TextColumn, TimeRemainingColumn
+from torch import complex128, float32, float64
 from torch import device as torch_device
 from torch import dtype as torch_dtype
 from torch.nn import DataParallel, Module
@@ -110,17 +111,17 @@ def train(
     train_with_grad(model, data, optimizer, config, loss_fn=loss_fn)
     ```
     """
+    # load available checkpoint
+    init_iter = 0
+    if config.folder:
+        model, optimizer, init_iter = load_checkpoint(config.folder, model, optimizer)
+        logger.debug(f"Loaded model and optimizer from {config.folder}")
 
     # Move model to device before optimizer is loaded
     if isinstance(model, DataParallel):
         model = model.module.to(device=device, dtype=dtype)
     else:
         model = model.to(device=device, dtype=dtype)
-    # load available checkpoint
-    init_iter = 0
-    if config.folder:
-        model, optimizer, init_iter = load_checkpoint(config.folder, model, optimizer)
-        logger.debug(f"Loaded model and optimizer from {config.folder}")
     # initialize tensorboard
     writer = SummaryWriter(config.folder, purge_step=init_iter)
 
@@ -131,7 +132,9 @@ def train(
         TaskProgressColumn(),
         TimeRemainingColumn(elapsed_when_finished=True),
     )
-
+    data_dtype = None
+    if dtype:
+        data_dtype = float64 if dtype == complex128 else float32
     with progress:
         dl_iter = iter(dataloader) if dataloader is not None else None
 
@@ -143,7 +146,12 @@ def train(
                 # which do not have classical input data (e.g. chemistry)
                 if dataloader is None:
                     loss, metrics = optimize_step(
-                        model=model, optimizer=optimizer, loss_fn=loss_fn, xs=None, device=device
+                        model=model,
+                        optimizer=optimizer,
+                        loss_fn=loss_fn,
+                        xs=None,
+                        device=device,
+                        dtype=data_dtype,
                     )
                     loss = loss.item()
 
@@ -154,6 +162,7 @@ def train(
                         loss_fn=loss_fn,
                         xs=next(dl_iter),  # type: ignore[arg-type]
                         device=device,
+                        dtype=data_dtype,
                     )
 
                 else:

{qadence-1.5.0 → qadence-1.5.1}/qadence/models/quantum_model.py

@@ -342,9 +342,10 @@ class QuantumModel(nn.Module):
         return self.backend.assign_parameters(self._circuit, params)
 
     def to(self, *args: Any, **kwargs: Any) -> QuantumModel:
+        from pyqtorch import QuantumCircuit as PyQCircuit
+
         try:
-            if isinstance(self._circuit.native, torch.nn.Module):
-                # Backends which are not torch-based cannot be moved to 'device'
+            if isinstance(self._circuit.native, PyQCircuit):
                 self._circuit.native = self._circuit.native.to(*args, **kwargs)
                 if self._observable is not None:
                     if isinstance(self._observable, ConvertedObservable):
@@ -359,6 +360,8 @@ class QuantumModel(nn.Module):
                     else torch.float32,
                 )
                 logger.debug(f"Moved {self} to {args}, {kwargs}.")
+            else:
+                logger.debug("QuantumModel.to only supports pyqtorch.QuantumCircuits.")
         except Exception as e:
             logger.warning(f"Unable to move {self} to {args}, {kwargs} due to {e}.")
         return self