qadence 1.11.0__tar.gz → 1.11.1__tar.gz

{qadence-1.11.0 → qadence-1.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qadence
-Version: 1.11.0
+Version: 1.11.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>, Eduardo Maschio <eduardo.maschio@pasqal.com>, Smit Chaudhary <smit.chaudhary@pasqal.com>, Ignacio Fernández Graña <ignacio.fernandez-grana@pasqal.com>, Charles Moussa <charles.moussa@pasqal.com>, Giorgio Tosti Balducci <giorgio.tosti-balducci@pasqal.com>, Daniele Cucurachi <daniele.cucurachi@pasqal.com>, Pim Venderbosch <pim.venderbosch@pasqal.com>, Manu Lahariya <manu.lahariya@pasqal.com>
 License: Apache 2.0
@@ -23,7 +23,7 @@ Requires-Dist: nevergrad
 Requires-Dist: numpy
 Requires-Dist: openfermion
 Requires-Dist: pasqal-cloud
-Requires-Dist: pyqtorch==1.7.1
+Requires-Dist: pyqtorch==1.7.2
 Requires-Dist: pyyaml
 Requires-Dist: rich
 Requires-Dist: scipy
@@ -55,7 +55,7 @@ Requires-Dist: mlflow; extra == 'mlflow'
 Provides-Extra: protocols
 Requires-Dist: qadence-protocols; extra == 'protocols'
 Provides-Extra: pulser
-Requires-Dist: pasqal-cloud==0.13.0; extra == 'pulser'
+Requires-Dist: pasqal-cloud==0.20.2; extra == 'pulser'
 Requires-Dist: pulser-core==1.3.0; extra == 'pulser'
 Requires-Dist: pulser-simulation==1.3.0; extra == 'pulser'
 Provides-Extra: visualization

{qadence-1.11.0 → qadence-1.11.1}/pyproject.toml

@@ -28,7 +28,7 @@ authors = [
 ]
 requires-python = ">=3.9"
 license = { text = "Apache 2.0" }
-version = "1.11.0"
+version = "1.11.1"
 classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
@@ -52,7 +52,7 @@ dependencies = [
     "jsonschema",
     "nevergrad",
     "scipy",
-    "pyqtorch==1.7.1",
+    "pyqtorch==1.7.2",
     "pyyaml",
     "matplotlib",
     "Arpeggio==2.0.2",
@@ -67,7 +67,7 @@ allow-ambiguous-features = true
 pulser = [
     "pulser-core==1.3.0",
     "pulser-simulation==1.3.0",
-    "pasqal-cloud==0.13.0",
+    "pasqal-cloud==0.20.2",
 ]
 visualization = [
     "graphviz",

{qadence-1.11.0 → qadence-1.11.1}/qadence/constructors/hamiltonians.py

@@ -281,6 +281,12 @@ class ObservableConfig:
     If True, the scale and shift are VariationalParameter.
     If False, the scale and shift are FeatureParameter.
     """
+    tag: str | None = None
+    """
+    String to indicate the name tag of the observable.
+
+    Defaults to None, in which case no tag will be applied.
+    """
 
     def __post_init__(self) -> None:
         if self.interaction is None and self.detuning is None:
@@ -313,6 +319,7 @@ def total_magnetization_config(
         scale=scale,
         shift=shift,
         trainable_transform=trainable_transform,
+        tag="Total Magnetization",
     )
 
 
@@ -327,6 +334,7 @@ def zz_hamiltonian_config(
         scale=scale,
         shift=shift,
         trainable_transform=trainable_transform,
+        tag="ZZ Hamiltonian",
     )
 
 
@@ -348,8 +356,9 @@ def ising_hamiltonian_config(
 
     return ObservableConfig(
         interaction=ZZ_Z_hamiltonian,
-        detuning=Z,
+        detuning=X,
         scale=scale,
         shift=shift,
         trainable_transform=trainable_transform,
+        tag="Ising Hamiltonian",
     )

{qadence-1.11.0 → qadence-1.11.1}/qadence/draw/utils.py

@@ -147,7 +147,8 @@ def _(model: QuantumModel, *args: Any, **kwargs: Any) -> QuantumCircuitDiagram:
             raise ValueError("Cannot visualize QuantumModel with more than one observable.")
 
         obs = deepcopy(model._observable[0].original)  # type: ignore [index]
-        obs.tag = "Obs."
+        if not isinstance(obs.tag, str):
+            obs.tag = "Obs."
 
         block: AbstractBlock = chain(model._circuit.original.block, obs)
     else:

{qadence-1.11.0 → qadence-1.11.1}/qadence/ml_tools/constructors.py

@@ -733,7 +733,13 @@ def create_observable(
         interaction=config.interaction,
         detuning=config.detuning,
     )
-    return add(shifting_term, detuning_hamiltonian)
+
+    obs: AbstractBlock = add(shifting_term, detuning_hamiltonian)
+
+    if isinstance(config.tag, str):
+        tag(obs, config.tag)
+
+    return obs
 
 
 def build_qnn_from_configs(
@@ -795,7 +801,6 @@ def build_qnn_from_configs(
         if isinstance(observable_config, list)
         else create_observable(register=register, config=observable_config)
     )
-
     ufa = QNN(
         circ,
         observable,

{qadence-1.11.0 → qadence-1.11.1}/qadence/ml_tools/models.py

@@ -360,13 +360,8 @@ class QNN(QuantumModel):
             )
             observable_str = ""
             if self._observable:
-                observable_str = (
-                    "observable_config = [\n"
-                    + "\n".join(
-                        (block_to_mathematical_expression(obs.original) for obs in self._observable)
-                    )
-                    + "\n]"
-                )
+                observable_str = f"observable_config = {self.observables_to_expression()}"
+
             return f"{type(self).__name__}(\n{configs_str}\n{observable_str}\n)"
 
         return super().__str__()

{qadence-1.11.0 → qadence-1.11.1}/qadence/ml_tools/trainer.py

@@ -530,15 +530,7 @@ class Trainer(BaseTrainer):
             self.ng_params = ng_params
             loss_metrics = loss, metrics
 
-        # --------------------- FIX: Post-Optimization Loss --------------------- #
-        # Because the loss/metrics are returned before the optimization. To sync
-        # model state and current loss/metrics we calculate them again after optimization.
-        # This is not strictly necessary.
-        # TODO: Should be removed if loss can be logged at an unoptimized model state
-        with torch.no_grad():
-            post_update_loss_metrics = self.loss_fn(self.model, batch)
-
-        return self._modify_batch_end_loss_metrics(post_update_loss_metrics)
+        return self._modify_batch_end_loss_metrics(loss_metrics)
 
     @BaseTrainer.callback("val_epoch")
     def run_validation(self, dataloader: DataLoader) -> list[tuple[torch.Tensor, dict[str, Any]]]:

{qadence-1.11.0 → qadence-1.11.1}/qadence/model.py

@@ -27,6 +27,7 @@ from qadence.mitigations import Mitigations
 from qadence.noise import NoiseHandler
 from qadence.parameters import Parameter
 from qadence.types import DiffMode, Endianness
+from qadence.utils import block_to_mathematical_expression
 
 logger = getLogger(__name__)
 
@@ -568,6 +569,28 @@ class QuantumModel(nn.Module):
             logger.warning(f"Unable to move {self} to {args}, {kwargs} due to {e}.")
         return self
 
+    def observables_to_expression(self) -> dict[str, str] | str:
+        """
+            Convert the observable to a dictionary representation of Pauli terms.
+
+        If no observable is set, returns an empty dictionary. Each observable is
+        represented by its tag (if available) as the key and its mathematical expression
+        as the value.
+
+        Returns:
+            dict[str, str]: A dictionary where the keys are observable tags (or "Obs." if not provided)
+                            and the values are the corresponding mathematical expressions.
+        """
+        if self._observable is None:
+            return "No observable set."
+        else:
+            return {
+                obs.original.tag if obs.original.tag else "Obs.": block_to_mathematical_expression(
+                    obs.original
+                )
+                for obs in self._observable
+            }
+
     @property
     def device(self) -> torch.device:
         """Get device.

{qadence-1.11.0 → qadence-1.11.1}/qadence/register.py

@@ -329,8 +329,12 @@ class Register:
         return Register(g, spacing=None, device_specs=self.device_specs)
 
     def _to_dict(self) -> dict:
+        try:
+            graph_data = nx.node_link_data(self.graph, edges="links")
+        except TypeError:  # For Python 3.9 support
+            graph_data = nx.node_link_data(self.graph)
         return {
-            "graph": nx.node_link_data(self.graph),
+            "graph": graph_data,
             "device_specs": self.device_specs._to_dict(),
         }