qadence 1.11.0__py3-none-any.whl → 1.11.1__py3-none-any.whl

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/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/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/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/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/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/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(),
         }
 

{qadence-1.11.0.dist-info → qadence-1.11.1.dist-info}/METADATA

@@ -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.dist-info → qadence-1.11.1.dist-info}/RECORD

@@ -8,14 +8,14 @@ qadence/extensions.py,sha256=Bx2cMsBq3sNTnmwPoqQF-7Tks-FspXb1fTl6zncJFUE,6068
 qadence/libs.py,sha256=HetkKO8TCTlVCViQdVQJvxwBekrhd-y_iMox4UJMY1M,410
 qadence/log_config.yaml,sha256=QiwoB1bnRdk9NpxnvfgWX2PjN7EDfYlrc3GVD38rtdI,739
 qadence/logger.py,sha256=Hb76pK3VyQjVjJb4_NqFlOJgjYJVa8t7DHJFlzOM86M,407
-qadence/model.py,sha256=OH61_Ij_c7PRywiXf16tJ5mnK9iYNbBTdRiHeG8PZ54,21623
+qadence/model.py,sha256=88zou7mge3JVFhed_X9Zr83QRh3Bq17GRCzVbru-B44,22581
 qadence/overlap.py,sha256=ekaUnIcQWdF4hSFuUWpRjaxo43JyDGFOayP7vMXCZpw,16821
 qadence/parameters.py,sha256=RDYklyW5EQZTjsAazEXa4lLGDOdmUUU53hLj385uSaI,12687
 qadence/pasqal_cloud_connection.py,sha256=1lz_AJRo54-YMnsYGJD_SFpUK-0_ZzJRWr9Qqa_pBZU,9675
 qadence/protocols.py,sha256=bcYTxSjgMPV-a-D6yv90jCpnGik8myzaNpFv9z1gzJ0,442
 qadence/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qadence/qubit_support.py,sha256=Nkn1Q01RVViTcggSIom7EFKdWpAuM4TMGwBZ5feCUxA,2120
-qadence/register.py,sha256=mwmvS6PcTY0F9cIhTUXG3NT73FIagfMCwVqYa4DrQrk,13001
+qadence/register.py,sha256=MlI1-L1P_e7ugjelhH-1YdxrfPsgmLmX5m-dueawuWQ,13172
 qadence/serial_expr_grammar.peg,sha256=z5ytL7do9kO8o4h-V5GrsDuLdso0KsRcMuIYURFfmAY,328
 qadence/serialization.py,sha256=qEET6Gu9u2aSibPve3bJrqDzK2_gO3RPDJjt4ZY8GbE,15596
 qadence/states.py,sha256=Aj28aNHGWkZrFw_mKpHrxCA1bDXlkFhw18D70tg0RF0,15953
@@ -62,7 +62,7 @@ qadence/blocks/utils.py,sha256=_V43qD7kQNK8JS3gxfpkRn56ZIF_GGrhAnARn1hq2hk,17772
 qadence/constructors/__init__.py,sha256=LiFkGzgMa27LrY1LhINfmj3UWfrjoUk9wwRM9a54rK0,1211
 qadence/constructors/ala.py,sha256=76rdD_vMki5F_r_Iq-68zU3NHrJiebVmr-e7L4lIDAo,8359
 qadence/constructors/feature_maps.py,sha256=BaAxFi6fSKwjsfFjqZ8T7lyZfjotcgH2OW3b0j67YVk,8644
-qadence/constructors/hamiltonians.py,sha256=FR0WDDI2c6zqv8U1DI786xsbKEpvvcyc3xFxX72mcEw,12543
+qadence/constructors/hamiltonians.py,sha256=SSo_Cd1wr8ryXz_DN2xSPlQNauXwYhDQPzP35tmYdtM,12800
 qadence/constructors/hea.py,sha256=EJveIvEAwOGWfMQ08LUdZkjTRFoqQioXjQXimv4-VUs,11702
 qadence/constructors/iia.py,sha256=wYcvR-4U-C1WkyK_EN8Rz2g3kZpWb1-302X3h60PtWw,7946
 qadence/constructors/qft.py,sha256=2LpgQ-z1HUxB3rqHzYsbjqpdU63gyuuaUVCbNEFbjo8,7688
@@ -75,7 +75,7 @@ qadence/constructors/daqc/gen_parser.py,sha256=taZMJ9BNp672qXqsNSQ8RY71tN2gMV4Rb
 qadence/constructors/daqc/utils.py,sha256=1T83veISoOXhJYUWXhfocbISpfIgsrKrdDHCMbskGoQ,1067
 qadence/draw/__init__.py,sha256=A2lU7_CfCjwZCnMRojG5CsoWm-7aWKpUYGyaJ9qBZIQ,2319
 qadence/draw/themes.py,sha256=VV4YtC8X3UI63AuJO2D0fLMTLbdDUjIyXQcKuDuIVmI,5533
-qadence/draw/utils.py,sha256=4Hk-vwGz6ZRLKYnV26r1g3zBvOONvlFiN4Kh6toUsI0,12107
+qadence/draw/utils.py,sha256=Xr9XIFzsdux9Z2GrPL6RYf_5RYohQiavI0R3eF-FaHk,12152
 qadence/draw/vizbackend.py,sha256=BKq1fjW7zgEhaIhrmi-i6XV9ZWY7NmlmdDo9-tfP0Hk,14997
 qadence/draw/assets/dark/measurement.png,sha256=hSMhZZCFKHNO2tCpYTTSYIF-nsAfNalRunRUIyhygC0,502
 qadence/draw/assets/dark/measurement.svg,sha256=6ALGjaCX3xZ1NqB6RW6yzOchzZV-j8ukW4aGhEWe4Lk,7282
@@ -103,14 +103,14 @@ qadence/mitigations/protocols.py,sha256=0TeHvlGTN8_88XNEwrjA97C5BUlrh34wYmx0w6-5
 qadence/mitigations/readout.py,sha256=nI-voV5N0R7630Cn8t8x9EdV9iB76P0LDkRosy1s0Ec,6631
 qadence/ml_tools/__init__.py,sha256=Z744FRFAzU5iw-4JC5YC43mDQD6rTa5ApdkWbUFuTbQ,970
 qadence/ml_tools/config.py,sha256=0qN0FVXRwYNMLGKgvk70cHTnEbl5_p83dU85sIyXls4,22728
-qadence/ml_tools/constructors.py,sha256=tzKCWX4RL-M3HOoEh2Q5Y-Bl16AsFXJS4lL7Oy5GgsA,27842
+qadence/ml_tools/constructors.py,sha256=L_oai1uOUK_jQW0G18lgBS2vZ5QJtmT4mvCnjGsHvzc,27938
 qadence/ml_tools/data.py,sha256=-HUQk3-0UHOBA4KMFQ63tlt3si4W66psbgR1DAjtoVE,5481
-qadence/ml_tools/models.py,sha256=H-UY3bShlc4QX9jUytFkamwuTsypH8jIecDhxvGHR7g,19303
+qadence/ml_tools/models.py,sha256=v3zRLuLN2IyTaL3eTNbdS65E1UeQV-mcZD3uIPJ6Eng,19112
 qadence/ml_tools/optimize_step.py,sha256=21m2Wxmxkj_kMHQnKygOWqFdcO-wi5CnMnIZTGEw9IM,3300
 qadence/ml_tools/parameters.py,sha256=gew2Kq_5-RgRpaTvs8eauVhgo0sTqqDQEV6WHFEiLGM,1301
 qadence/ml_tools/stages.py,sha256=qW2phMIvQBLM3tn2UoGN-ePiBnZoNq5k844eHVnnn8Y,1407
 qadence/ml_tools/tensors.py,sha256=xZ9ZRzOqEaMgLUGWQf1najDmL6iLuN1ojCGVFs1Tm94,1337
-qadence/ml_tools/trainer.py,sha256=dXXkywtyPTtq2bbZSGBS2XUKGtGT8GGaCP7kP3UWU5A,35412
+qadence/ml_tools/trainer.py,sha256=rAm4hpXpPSt1pCWUtMenVBsRXiodwBpUpmWWMP1duDs,34914
 qadence/ml_tools/utils.py,sha256=PW8FyoV0mG_DtN1U8njTDV5qxZ0EK4mnFwMAsLBArfk,1410
 qadence/ml_tools/callbacks/__init__.py,sha256=pTdfjulDGNKca--9BgrdmMyvJSah_0spp929Th6RzC8,913
 qadence/ml_tools/callbacks/callback.py,sha256=JVY1BtPItCx11oAa1-3wICZyDfDLFdc5pmjTbfASHqA,29929
@@ -144,7 +144,7 @@ qadence/transpile/flatten.py,sha256=k4HAfVzvDV40HyfaukiEHyJtAtvFRIcyDbAWiCL8tf0,
 qadence/transpile/invert.py,sha256=IeyidgBwECCKB0i7Ym0KkLyfcx42LyT2mbqkfbK1H8M,4843
 qadence/transpile/noise.py,sha256=LDcDJtQGkgUPkL2t69gg6AScTb-p3J3SxCDZbYOu1L8,1668
 qadence/transpile/transpile.py,sha256=xnzkHA6Qdb-Y5Fv9Latrolrpw44N6_OKc7_QGt70f0I,2713
-qadence-1.11.0.dist-info/METADATA,sha256=y7-SPjq9bkVeTmytdaL_BeWQwvAXA16JdXKss6MNxjI,10211
-qadence-1.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qadence-1.11.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-qadence-1.11.0.dist-info/RECORD,,
+qadence-1.11.1.dist-info/METADATA,sha256=BrS9vWyf87UbydethjWshIbhObTb9Nu5DleYwC8q154,10211
+qadence-1.11.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qadence-1.11.1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+qadence-1.11.1.dist-info/RECORD,,