qadence 1.7.7__tar.gz → 1.7.8__tar.gz

{qadence-1.7.7 → qadence-1.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qadence
-Version: 1.7.7
+Version: 1.7.8
 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>
 License: Apache 2.0
@@ -22,7 +22,7 @@ Requires-Dist: matplotlib
 Requires-Dist: nevergrad
 Requires-Dist: numpy
 Requires-Dist: openfermion
-Requires-Dist: pyqtorch==1.4.7
+Requires-Dist: pyqtorch==1.4.9
 Requires-Dist: pyyaml
 Requires-Dist: rich
 Requires-Dist: scipy
@@ -57,7 +57,7 @@ Requires-Dist: mlflow; extra == 'mlflow'
 Provides-Extra: protocols
 Requires-Dist: qadence-protocols; extra == 'protocols'
 Provides-Extra: pulser
-Requires-Dist: pasqal-cloud==0.11.4; extra == 'pulser'
+Requires-Dist: pasqal-cloud==0.12.2; extra == 'pulser'
 Requires-Dist: pulser-core==0.19.0; extra == 'pulser'
 Requires-Dist: pulser-simulation==0.19.0; extra == 'pulser'
 Provides-Extra: visualization

{qadence-1.7.7 → qadence-1.7.8}/pyproject.toml

@@ -26,7 +26,7 @@ authors = [
 ]
 requires-python = ">=3.9"
 license = { text = "Apache 2.0" }
-version = "1.7.7"
+version = "1.7.8"
 classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
@@ -50,7 +50,7 @@ dependencies = [
     "jsonschema",
     "nevergrad",
     "scipy",
-    "pyqtorch==1.4.7",
+    "pyqtorch==1.4.9",
     "pyyaml",
     "matplotlib",
     "Arpeggio==2.0.2",
@@ -64,7 +64,7 @@ allow-ambiguous-features = true
 pulser = [
     "pulser-core==0.19.0",
     "pulser-simulation==0.19.0",
-    "pasqal-cloud==0.11.4",
+    "pasqal-cloud==0.12.2",
 ]
 braket = ["amazon-braket-sdk<1.71.2"]
 visualization = [

{qadence-1.7.7 → qadence-1.7.8}/qadence/ml_tools/config.py

@@ -447,6 +447,13 @@ class FeatureMapConfig:
     assign `t, x = xs[:,0], xs[:,1]`.
     """
 
+    tag: str | None = None
+    """
+    String to indicate the name tag of the feature map.
+
+    Defaults to None, in which case no tag will be applied.
+    """
+
     def __post_init__(self) -> None:
         if self.multivariate_strategy == MultivariateStrategy.PARALLEL and self.num_features > 1:
             assert (
@@ -606,6 +613,13 @@ class AnsatzConfig:
     param_prefix: str = "theta"
     """The base bame of the variational parameter."""
 
+    tag: str | None = None
+    """
+    String to indicate the name tag of the ansatz.
+
+    Defaults to None, in which case no tag will be applied.
+    """
+
     def __post_init__(self) -> None:
         if self.ansatz_type == AnsatzType.IIA:
             assert (

{qadence-1.7.7 → qadence-1.7.8}/qadence/ml_tools/constructors.py

@@ -7,7 +7,7 @@ from qadence.backend import BackendConfiguration
 from qadence.blocks import chain, kron
 from qadence.blocks.abstract import AbstractBlock
 from qadence.blocks.composite import ChainBlock, KronBlock
-from qadence.blocks.utils import add
+from qadence.blocks.utils import add, tag
 from qadence.circuit import QuantumCircuit
 from qadence.constructors import (
     analog_feature_map,
@@ -774,10 +774,15 @@ def build_qnn_from_configs(
             fm_blocks=fm_blocks,
             ansatz_config=ansatz_config,
         )
+        if isinstance(fm_config.tag, str):
+            tag(full_fm, fm_config.tag)
         inputs = fm_config.inputs
         blocks.append(full_fm)
 
-    blocks.append(create_ansatz(register=register, config=ansatz_config))
+    ansatz = create_ansatz(register=register, config=ansatz_config)
+    if isinstance(ansatz_config.tag, str):
+        tag(ansatz, ansatz_config.tag)
+    blocks.append(ansatz)
 
     circ = QuantumCircuit(register, *blocks)
 

{qadence-1.7.7 → qadence-1.7.8}/qadence/ml_tools/train_grad.py

@@ -213,21 +213,48 @@ def train(
     ]
 
     # writing metrics
+    # we specify two writers,
+    # to write at evaluation time and before evaluation
     callbacks += [
         Callback(
             lambda opt_res: write_tracker(
                 writer,
                 opt_res.loss,
                 opt_res.metrics,
-                opt_res.iteration,
+                opt_res.iteration - 1,  # loss returned be optimized_step is at -1
+                tracking_tool=config.tracking_tool,
+            ),
+            called_every=config.write_every,
+            call_end_epoch=True,
+        ),
+        Callback(
+            lambda opt_res: write_tracker(
+                writer,
+                opt_res.loss,
+                opt_res.metrics,
+                opt_res.iteration,  # after_opt we match the right loss function
                 tracking_tool=config.tracking_tool,
             ),
             called_every=config.write_every,
-            call_before_opt=False,
+            call_end_epoch=False,
             call_after_opt=True,
-            call_during_eval=True,
-        )
+        ),
     ]
+    if perform_val:
+        callbacks += [
+            Callback(
+                lambda opt_res: write_tracker(
+                    writer,
+                    None,
+                    opt_res.metrics,
+                    opt_res.iteration,
+                    tracking_tool=config.tracking_tool,
+                ),
+                called_every=config.write_every,
+                call_before_opt=True,
+                call_during_eval=True,
+            )
+        ]
 
     # checkpointing
     if config.folder and config.checkpoint_every > 0 and not config.checkpoint_best_only:
@@ -332,17 +359,22 @@ def train(
                 logger.info("Terminating training gracefully after the current iteration.")
                 break
 
-        # Handling printing the last training loss
+        # For handling printing/writing the last training loss
         # as optimize_step does not give the loss value at the last iteration
         try:
             loss, metrics, *_ = next_loss_iter(dl_iter)
-            if iteration % config.print_every == 0 and config.verbose:
-                print_metrics(loss, metrics, iteration)
+            if isinstance(loss, Tensor):
+                loss = loss.item()
+            if perform_val:
+                # reputting val_loss as already evaluated before
+                metrics["val_loss"] = val_loss
+            print_metrics(loss, metrics, iteration)
 
         except KeyboardInterrupt:
             logger.info("Terminating training gracefully after the current iteration.")
 
     # Final callbacks, by default checkpointing and writing
+    opt_result = OptimizeResult(iteration, model, optimizer, loss, metrics)
     callbacks_after_opt = [callback for callback in callbacks if callback.call_after_opt]
     run_callbacks(callbacks_after_opt, opt_result, is_last_iteration=True)