emu-base 1.2.6__py3-none-any.whl → 1.2.7__py3-none-any.whl

emu_base/__init__.py

@@ -46,4 +46,4 @@ __all__ = [
     "DEVICE_COUNT",
 ]
 
-__version__ = "1.2.6"
+__version__ = "1.2.7"

emu_base/base_classes/aggregators.py

@@ -9,9 +9,14 @@ _NUMERIC_TYPES = {int, float, complex}
 
 def mean_aggregator(
     values: list[Any],
-) -> complex | float | list[complex] | list[float] | list[list[complex]] | list[
-    list[float]
-]:  # FIXME: support tuples?
+) -> (
+    complex
+    | float
+    | list[complex]
+    | list[float]
+    | list[list[complex]]
+    | list[list[float]]
+):  # FIXME: support tuples?
     if values == []:
         raise ValueError("Cannot average 0 samples")
 

emu_base/base_classes/config.py

@@ -37,7 +37,7 @@ class BackendConfig:
         *,
         observables: list[Callback] | None = None,
         with_modulation: bool = False,
-        noise_model: NoiseModel = None,
+        noise_model: NoiseModel | None = None,
         interaction_matrix: list[list[float]] | None = None,
         interaction_cutoff: float = 0.0,
         log_level: int = logging.INFO,

emu_base/base_classes/results.py

@@ -3,11 +3,19 @@ from typing import Any, Callable, Optional
 from pathlib import Path
 import json
 import logging
+import torch
 
 from emu_base.base_classes.callback import Callback, AggregationType
 from emu_base.base_classes.aggregators import aggregation_types_definitions
 
 
+class ResultsEncoder(json.JSONEncoder):
+    def default(self, obj: Any) -> Any:
+        if isinstance(obj, torch.Tensor):
+            return obj.tolist()
+        return super().default(obj)
+
+
 @dataclass
 class Results:
     """
@@ -171,4 +179,5 @@ class Results:
                     "statistics": self.statistics,
                 },
                 file_handle,
+                cls=ResultsEncoder,
             )

emu_base/lindblad_operators.py

@@ -32,7 +32,10 @@ def get_lindblad_operators(
         ]
 
     if noise_type == "eff_noise":
-        if not all(op.shape == (2, 2) for op in noise_model.eff_noise_opers):
+        if not all(
+            isinstance(op, torch.Tensor) and op.shape == (2, 2)
+            for op in noise_model.eff_noise_opers
+        ):
             raise ValueError("Only 2 * 2 effective noise operator matrices are supported")
 
         return [

emu_base/pulser_adapter.py

@@ -5,6 +5,8 @@ import math
 from pulser.noise_model import NoiseModel
 from enum import Enum
 
+from pulser.register.base_register import BaseRegister
+
 from emu_base.base_classes.config import BackendConfig
 from emu_base.lindblad_operators import get_lindblad_operators
 from emu_base.utils import dist2, dist3
@@ -16,7 +18,7 @@ class HamiltonianType(Enum):
 
 
 def _get_qubit_positions(
-    register: pulser.Register,
+    register: BaseRegister,
 ) -> list[torch.Tensor]:
     """Conversion from pulser Register to emu-mps register (torch type).
     Each element will be given as [Rx,Ry,Rz]"""
@@ -31,7 +33,7 @@ def _get_qubit_positions(
 def _rydberg_interaction(sequence: pulser.Sequence) -> torch.Tensor:
     """
     Computes the Ising interaction matrix from the qubit positions.
-    Hᵢⱼ=C₆/Rᵢⱼ⁶ (nᵢ⊗ nⱼ)
+    Hᵢⱼ=C₆/R⁶ᵢⱼ (nᵢ⊗ nⱼ)
     """
 
     num_qubits = len(sequence.register.qubit_ids)
@@ -88,7 +90,7 @@ def _xy_interaction(sequence: pulser.Sequence) -> torch.Tensor:
 def _extract_omega_delta_phi(
     *,
     sequence: pulser.Sequence,
-    dt: int,
+    target_times: list[int],
     with_modulation: bool,
     laser_waist: float | None,
 ) -> Tuple[torch.Tensor, torch.Tensor, torch.Tensor]:
@@ -125,7 +127,7 @@ def _extract_omega_delta_phi(
 
     max_duration = sequence.get_duration(include_fall_time=with_modulation)
 
-    nsamples = math.ceil(max_duration / dt - 1 / 2)
+    nsamples = len(target_times) - 1
     omega = torch.zeros(
         nsamples,
         len(sequence.register.qubit_ids),
@@ -157,12 +159,11 @@ def _extract_omega_delta_phi(
             for slot in ch_samples.slots:
                 global_times |= set(i for i in range(slot.ti, slot.tf))
 
-    step = 0
-    t = (step + 1 / 2) * dt
     omega_1 = torch.zeros_like(omega[0])
     omega_2 = torch.zeros_like(omega[0])
 
-    while t < max_duration:
+    for i in range(nsamples):
+        t = (target_times[i] + target_times[i + 1]) / 2
         # The sampled values correspond to the start of each interval
         # To maximize the order of the solver, we need the values in the middle
         if math.ceil(t) < max_duration:
@@ -173,10 +174,10 @@ def _extract_omega_delta_phi(
                 t2 = math.ceil(t)
                 omega_1[q_pos] = locals_a_d_p[q_id]["amp"][t1]
                 omega_2[q_pos] = locals_a_d_p[q_id]["amp"][t2]
-                delta[step, q_pos] = (
+                delta[i, q_pos] = (
                     locals_a_d_p[q_id]["det"][t1] + locals_a_d_p[q_id]["det"][t2]
                 ) / 2.0
-                phi[step, q_pos] = (
+                phi[i, q_pos] = (
                     locals_a_d_p[q_id]["phase"][t1] + locals_a_d_p[q_id]["phase"][t2]
                 ) / 2.0
             # omegas at different times need to have the laser waist applied independently
@@ -184,21 +185,19 @@ def _extract_omega_delta_phi(
                 omega_1 *= waist_factors
             if t2 in global_times:
                 omega_2 *= waist_factors
-            omega[step] = 0.5 * (omega_1 + omega_2)
+            omega[i] = 0.5 * (omega_1 + omega_2)
         else:
             # We're in the final step and dt=1, approximate this using linear extrapolation
             # we can reuse omega_1 and omega_2 from before
             for q_pos, q_id in enumerate(sequence.register.qubit_ids):
-                delta[step, q_pos] = (
+                delta[i, q_pos] = (
                     3.0 * locals_a_d_p[q_id]["det"][t2] - locals_a_d_p[q_id]["det"][t1]
                 ) / 2.0
-                phi[step, q_pos] = (
+                phi[i, q_pos] = (
                     3.0 * locals_a_d_p[q_id]["phase"][t2]
                     - locals_a_d_p[q_id]["phase"][t1]
                 ) / 2.0
-            omega[step] = torch.clamp(0.5 * (3 * omega_2 - omega_1).real, min=0.0)
-        step += 1
-        t = (step + 1 / 2) * dt
+            omega[i] = torch.clamp(0.5 * (3 * omega_2 - omega_1).real, min=0.0)
 
     return omega, delta, phi
 
@@ -221,7 +220,7 @@ def _get_all_lindblad_noise_operators(
 
 
 class PulserData:
-    slm_end_time: int
+    slm_end_time: float
     full_interaction_matrix: torch.Tensor
     masked_interaction_matrix: torch.Tensor
     omega: torch.Tensor
@@ -233,12 +232,20 @@ class PulserData:
     def __init__(self, *, sequence: pulser.Sequence, config: BackendConfig, dt: int):
         self.qubit_count = len(sequence.register.qubit_ids)
 
+        # the end value is exclusive, so add +1
+        observable_times = set(torch.arange(0, sequence.get_duration() + 1, dt).tolist())
+        observable_times.add(sequence.get_duration())
+        for obs in config.callbacks:
+            observable_times |= set(obs.evaluation_times)
+        self.target_times = list(observable_times)
+        self.target_times.sort()
+
         laser_waist = (
             config.noise_model.laser_waist if config.noise_model is not None else None
         )
         self.omega, self.delta, self.phi = _extract_omega_delta_phi(
             sequence=sequence,
-            dt=dt,
+            target_times=self.target_times,
             with_modulation=config.with_modulation,
             laser_waist=laser_waist,
         )

{emu_base-1.2.6.dist-info → emu_base-1.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emu-base
-Version: 1.2.6
+Version: 1.2.7
 Summary: Pasqal base classes for emulators
 Project-URL: Documentation, https://pasqal-io.github.io/emulators/
 Project-URL: Repository, https://github.com/pasqal-io/emulators

{emu_base-1.2.6.dist-info → emu_base-1.2.7.dist-info}/RECORD

@@ -1,20 +1,20 @@
-emu_base/__init__.py,sha256=YDB_UjuJJoFfzL3gG_z09ieMTU7RvE5UAGn7POqiYbE,1186
+emu_base/__init__.py,sha256=i2Gv8rIusAD2hXepDFdFTfC5FQOOpNXtB0F1xoSd6QQ,1186
 emu_base/constants.py,sha256=41LYkKLUCz-oxPbd-j7nUDZuhIbUrnez6prT0uR0jcE,56
-emu_base/lindblad_operators.py,sha256=eXkXsLt_fV7jhF31EkxzYFU04rOJV3uWXsl6t1aTAqs,1562
-emu_base/pulser_adapter.py,sha256=Doi24xNQp09UhyrvNkS_ydXiRV4XNinoziALo6Gil2U,10456
+emu_base/lindblad_operators.py,sha256=Nsl1YrWb8IDM9Z50ucy2Ed44p_IRETnlbr6qaqAgV50,1629
+emu_base/pulser_adapter.py,sha256=SIkw3Mrob4RPTt4QNYzC8CUJ0tj-sTj-t-fEKEyRTtU,10858
 emu_base/utils.py,sha256=RM8O0qfPAJfcdqqAojwEEKV7I3ZfVDklnTisTGhUg5k,233
 emu_base/base_classes/__init__.py,sha256=Su6fHtjCyg0fw-7y7e7nbMfDASppNRQs8iGaAOkO3c4,570
-emu_base/base_classes/aggregators.py,sha256=bcvoGfZCkPKv-CI29gTma6HBphGh7bjBq2Ome77eRJM,1840
+emu_base/base_classes/aggregators.py,sha256=BDzFq12q36p12TXp2qv3g7a9cHnXbT1hhMZJLVojkDU,1862
 emu_base/base_classes/backend.py,sha256=7tnwb9MnRbwRN1_JTqliYftjqExuOE-Rrwz9AU2Pc4c,1645
 emu_base/base_classes/callback.py,sha256=JXah_ZDNM8iyPWy7IOwW481qRFyqVvlSM-0OkjBzV0A,3055
-emu_base/base_classes/config.py,sha256=Dg2CwC9sc5HYwszQAJSVjkSd3wuQrv6aEZGYBRnFl48,4098
+emu_base/base_classes/config.py,sha256=oLS2jwmxqwMbLKIPdqohK-KPIcXdtpG3sRr_Y12poNQ,4105
 emu_base/base_classes/default_callbacks.py,sha256=F44kkuwWdVcvMGZ9vJ2q7ug-_P8IQyJv-SVxSVWHW_w,9940
 emu_base/base_classes/operator.py,sha256=MJjuDUTwJLbaSJzSNCKDWGvmGCGAEIEWISLoPSSzNsU,3501
-emu_base/base_classes/results.py,sha256=7-Mz3jmFy19hd3PIA5idK610mC3b5jOf3EKBmV14Jv4,5569
+emu_base/base_classes/results.py,sha256=w4js7gThb49sNjEEDfEf0tYRwK004GrafWPeEOvyeCg,5810
 emu_base/base_classes/state.py,sha256=7iIyZmBqqJ6G4SyYZ3kyylWjAqiYIx0aW5B0T74EPZI,2707
 emu_base/math/__init__.py,sha256=6BbIytYV5uC-e5jLMtIErkcUl_PvfSNnhmVFY9Il8uQ,97
 emu_base/math/brents_root_finding.py,sha256=AVx6L1Il6rpPJWrLJ7cn6oNmJyZOPRgEaaZaubC9lsU,3711
 emu_base/math/krylov_exp.py,sha256=UCFNeq-j2ukgBsOPC9_Jiv1aqpy88SrslDLiCxIGBwk,3840
-emu_base-1.2.6.dist-info/METADATA,sha256=AKKbxP9g8y0vjIYHix98y-DxKOlAufhKRW8YQy74h_Q,3522
-emu_base-1.2.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-emu_base-1.2.6.dist-info/RECORD,,
+emu_base-1.2.7.dist-info/METADATA,sha256=JpfSGDOQtIu2hwwoHXgBNgf8ZmIkUh0MUDiwJYPZL_Q,3522
+emu_base-1.2.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+emu_base-1.2.7.dist-info/RECORD,,