emu-mps 2.4.3__py3-none-any.whl → 2.5.0__py3-none-any.whl

emu_mps/__init__.py

@@ -36,4 +36,4 @@ __all__ = [
     "EntanglementEntropy",
 ]
 
-__version__ = "2.4.3"
+__version__ = "2.5.0"

emu_mps/mps.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 import math
 from collections import Counter
 from typing import List, Optional, Sequence, TypeVar, Mapping
-
+import logging
 import torch
 
 from pulser.backend.state import State, Eigenstate
@@ -481,7 +481,9 @@ class MPS(State[complex, torch.Tensor]):
             accum_mps += amplitude * MPS(factors, eigenstates=eigenstates)
         norm = accum_mps.norm()
         if not math.isclose(1.0, norm, rel_tol=1e-5, abs_tol=0.0):
-            print("\nThe state is not normalized, normalizing it for you.")
+            logging.getLogger("emulators").warning(
+                "\nThe state is not normalized, normalizing it for you."
+            )
             accum_mps *= 1 / norm
 
         return accum_mps, amplitudes

emu_mps/mps_backend.py

@@ -1,10 +1,10 @@
 from pulser.backend import EmulatorBackend, Results
 from emu_mps.mps_config import MPSConfig
+from emu_base import init_logging
 from emu_mps.mps_backend_impl import create_impl, MPSBackendImpl
 import pickle
 import os
 import time
-import logging
 import pathlib
 
 
@@ -34,9 +34,9 @@ class MPSBackend(EmulatorBackend):
 
         impl.autosave_file = autosave_file
         impl.last_save_time = time.time()
-        impl.config.init_logging()  # FIXME: might be best to take logger object out of config.
+        init_logging(impl.config.log_level, impl.config.log_file)
 
-        logging.getLogger("global_logger").warning(
+        impl.config.logger.warning(
             f"Resuming simulation from file {autosave_file}\n"
             f"Saving simulation state every {impl.config.autosave_dt} seconds"
         )

emu_mps/mps_backend_impl.py

@@ -119,6 +119,7 @@ class MPSBackendImpl:
         self.phi = pulser_data.phi
         self.timestep_count: int = self.omega.shape[0]
         self.has_lindblad_noise = pulser_data.has_lindblad_noise
+        self.eigenstates = pulser_data.eigenstates
         self.dim = pulser_data.dim
         self.lindblad_noise = torch.zeros(self.dim, self.dim, dtype=dtype)
         self.qubit_permutation = (
@@ -220,6 +221,7 @@ class MPSBackendImpl:
                 precision=self.config.precision,
                 max_bond_dim=self.config.max_bond_dim,
                 num_gpus_to_use=self.resolved_num_gpus,
+                eigenstates=self.eigenstates,
             )
             return
 
@@ -268,6 +270,7 @@ class MPSBackendImpl:
             ),
             hamiltonian_type=self.hamiltonian_type,
             num_gpus_to_use=self.resolved_num_gpus,
+            dim=self.dim,
         )
 
         update_H(
@@ -342,6 +345,7 @@ class MPSBackendImpl:
                 config=self.config,
                 orth_center_right=orth_center_right,
                 is_hermitian=not self.has_lindblad_noise,
+                dim=self.dim,
             )
 
             self.state.orthogonality_center = r if orth_center_right else l
@@ -616,7 +620,7 @@ class NoisyMPSBackendImpl(MPSBackendImpl):
         # The below is used for batch computation of noise collapse weights.
         self.aggregated_lindblad_ops = stacked.conj().transpose(1, 2) @ stacked
 
-        self.lindblad_noise = compute_noise_from_lindbladians(self.lindblad_ops)
+        self.lindblad_noise = compute_noise_from_lindbladians(self.lindblad_ops, self.dim)
 
     def set_jump_threshold(self, bound: float) -> None:
         self.jump_threshold = random.uniform(0.0, bound)

emu_mps/mps_config.py

@@ -3,6 +3,7 @@ from types import MethodType
 
 import copy
 
+from emu_base import init_logging
 from emu_mps.mps import MPS, DEFAULT_MAX_BOND_DIM, DEFAULT_PRECISION
 from emu_mps.mpo import MPO
 from emu_mps.solver import Solver
@@ -24,7 +25,6 @@ from pulser.backend import (
 )
 import logging
 import pathlib
-import sys
 
 
 class MPSConfig(EmulationConfig):
@@ -90,7 +90,7 @@ class MPSConfig(EmulationConfig):
         max_krylov_dim: int = 100,
         extra_krylov_tolerance: float = 1e-3,
         num_gpus_to_use: int | None = None,
-        optimize_qubit_ordering: bool = False,
+        optimize_qubit_ordering: bool = True,
         interaction_cutoff: float = 0.0,
         log_level: int = logging.INFO,
         log_file: pathlib.Path | None = None,
@@ -116,8 +116,6 @@ class MPSConfig(EmulationConfig):
             solver=solver,
             **kwargs,
         )
-        if self.optimize_qubit_ordering:
-            self.check_permutable_observables()
 
         MIN_AUTOSAVE_DT = 10
         assert (
@@ -125,20 +123,8 @@ class MPSConfig(EmulationConfig):
         ), f"autosave_dt must be larger than {MIN_AUTOSAVE_DT} seconds"
 
         self.monkeypatch_observables()
+        self.logger = init_logging(log_level, log_file)
 
-        self.logger = logging.getLogger("global_logger")
-        if log_file is None:
-            logging.basicConfig(
-                level=log_level, format="%(message)s", stream=sys.stdout, force=True
-            )  # default to stream = sys.stderr
-        else:
-            logging.basicConfig(
-                level=log_level,
-                format="%(message)s",
-                filename=str(log_file),
-                filemode="w",
-                force=True,
-            )
         if (self.noise_model.runs != 1 and self.noise_model.runs is not None) or (
             self.noise_model.samples_per_run != 1
             and self.noise_model.samples_per_run is not None
@@ -146,6 +132,9 @@ class MPSConfig(EmulationConfig):
             self.logger.warning(
                 "Warning: The runs and samples_per_run values of the NoiseModel are ignored!"
             )
+        self._backend_options[
+            "optimize_qubit_ordering"
+        ] &= self.check_permutable_observables()
 
     def _expected_kwargs(self) -> set[str]:
         return super()._expected_kwargs() | {
@@ -191,21 +180,7 @@ class MPSConfig(EmulationConfig):
             obs_list.append(obs_copy)
         self.observables = tuple(obs_list)
 
-    def init_logging(self) -> None:
-        if self.log_file is None:
-            logging.basicConfig(
-                level=self.log_level, format="%(message)s", stream=sys.stdout, force=True
-            )  # default to stream = sys.stderr
-        else:
-            logging.basicConfig(
-                level=self.log_level,
-                format="%(message)s",
-                filename=str(self.log_file),
-                filemode="w",
-                force=True,
-            )
-
-    def check_permutable_observables(self) -> None:
+    def check_permutable_observables(self) -> bool:
         allowed_permutable_obs = set(
             [
                 "bitstrings",
@@ -221,10 +196,10 @@ class MPSConfig(EmulationConfig):
         actual_obs = set([obs._base_tag for obs in self.observables])
         not_allowed = actual_obs.difference(allowed_permutable_obs)
         if not_allowed:
-            raise ValueError(
+            self.logger.warning(
                 f"emu-mps allows only {allowed_permutable_obs} observables with"
                 " `optimize_qubit_ordering = True`."
                 f" you provided unsupported {not_allowed}"
-                " To use other observables, please set"
-                " `optimize_qubit_ordering = False` in `MPSConfig()`."
+                " using `optimize_qubit_ordering = False` instead."
             )
+        return not_allowed == set()

emu_mps/solver_utils.py

@@ -14,6 +14,7 @@ def make_op(
     state_factors: Sequence[torch.Tensor],
     baths: tuple[torch.Tensor, torch.Tensor],
     ham_factors: Sequence[torch.Tensor],
+    dim: int = 2,
 ) -> tuple[torch.Tensor, torch.device, Callable[[torch.Tensor], torch.Tensor]]:
     assert len(state_factors) == 2
     assert len(baths) == 2
@@ -35,7 +36,7 @@ def make_op(
 
     combined_state_factors = torch.tensordot(
         left_state_factor, right_state_factor, dims=1
-    ).reshape(left_bond_dim, 4, right_bond_dim)
+    ).reshape(left_bond_dim, dim**2, right_bond_dim)
 
     deallocate_tensor(left_state_factor)
     deallocate_tensor(right_state_factor)
@@ -48,7 +49,7 @@ def make_op(
         torch.tensordot(left_ham_factor, right_ham_factor, dims=1)
         .transpose(2, 3)
         .contiguous()
-        .view(left_ham_factor.shape[0], 4, 4, -1)
+        .view(left_ham_factor.shape[0], dim**2, dim**2, -1)
     )
 
     def op(x: torch.Tensor) -> torch.Tensor:
@@ -151,6 +152,7 @@ def evolve_pair(
     orth_center_right: bool,
     is_hermitian: bool,
     config: MPSConfig,
+    dim: int = 2,
 ) -> tuple[torch.Tensor, torch.Tensor]:
     """
     Time evolution of a pair of tensors of a tensor train using baths and truncated SVD.
@@ -165,6 +167,7 @@ def evolve_pair(
         state_factors=state_factors,
         baths=baths,
         ham_factors=ham_factors,
+        dim=dim,
     )
     left_bond_dim = combined_state_factors.shape[0]
     right_bond_dim = combined_state_factors.shape[-1]
@@ -176,7 +179,7 @@ def evolve_pair(
         norm_tolerance=config.precision * config.extra_krylov_tolerance,
         max_krylov_dim=config.max_krylov_dim,
         is_hermitian=is_hermitian,
-    ).view(left_bond_dim * 2, 2 * right_bond_dim)
+    ).view(left_bond_dim * dim, dim * right_bond_dim)
 
     l, r = split_matrix(
         evol,
@@ -186,7 +189,9 @@ def evolve_pair(
         preserve_norm=not is_hermitian,  # only relevant for computing jump times
     )
 
-    return l.view(left_bond_dim, 2, -1), r.view(-1, 2, right_bond_dim).to(right_device)
+    return l.view(left_bond_dim, dim, -1), r.view(-1, dim, right_bond_dim).to(
+        right_device
+    )
 
 
 def evolve_single(

{emu_mps-2.4.3.dist-info → emu_mps-2.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emu-mps
-Version: 2.4.3
+Version: 2.5.0
 Summary: Pasqal MPS based pulse emulator built on PyTorch
 Project-URL: Documentation, https://pasqal-io.github.io/emulators/
 Project-URL: Repository, https://github.com/pasqal-io/emulators
@@ -25,7 +25,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
-Requires-Dist: emu-base==2.4.3
+Requires-Dist: emu-base==2.5.0
 Description-Content-Type: text/markdown
 
 <div align="center">

{emu_mps-2.4.3.dist-info → emu_mps-2.5.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
-emu_mps/__init__.py,sha256=avViacgzWmSfTtWIUvoxlaE_1p7LRXPb9Hh5sWv8ND4,708
+emu_mps/__init__.py,sha256=att-gSzRc9t4OvllrmSVf_vPjP2WlmqT_sBJ020sv0c,708
 emu_mps/algebra.py,sha256=VZ5uaX5PYWGqDCpRKKr819BLMMtT0pKDxc2HrlLCdgU,5423
 emu_mps/custom_callback_implementations.py,sha256=WeczmO6qkvBIipvXLqX45i3D7M4ovOrepusIGs6d2Ts,2420
 emu_mps/hamiltonian.py,sha256=OM0bPNZV7J5Egk6aTUwt4GaWqiUOP68ujZBTuqlBY1k,16289
 emu_mps/mpo.py,sha256=WmGDGkCMhlODmydd0b09YcSRlsk6Bg5xYQ4rXSNJvnY,9703
-emu_mps/mps.py,sha256=1aMvY4NQSBeAwzTwHRegXncGQqm-1g05W00OimFNzt8,21630
-emu_mps/mps_backend.py,sha256=bS83qFxvdoK-c12_1WaPw6O7xUc7vdWifZNHUzNP5sM,2091
-emu_mps/mps_backend_impl.py,sha256=LMvi7KpfnsNmbiwQHuCtoA2lsK3Pf1vETuipL7BlG5U,30688
-emu_mps/mps_config.py,sha256=j7rho3edFzDxPO_VX7j5jc0Drw9wO2NWRymkqZ9hzmU,9128
+emu_mps/mps.py,sha256=9LcneNCGMLYQJfiTQrDzBKz-YQmcL76P9l-A-3_bXOI,21707
+emu_mps/mps_backend.py,sha256=dXcW5Fa2AAL_WlHUgr30WS2l3qiDJgBVebiVpyYWpPM,2064
+emu_mps/mps_backend_impl.py,sha256=WyB1PpC61rzrnr_c3epVZOhDtXLOdhQLsMgUtZQWCYg,30851
+emu_mps/mps_config.py,sha256=btlygf6VDFna9TQus-zOmUqB6pfe_aoQmNoivfvxABk,8251
 emu_mps/observables.py,sha256=4C_ewkd3YkJP0xghTrGUTgXUGvJRCQcetb8cU0SjMl0,1900
 emu_mps/solver.py,sha256=M9xkHhlEouTBvoPw2UYVu6kij7CO4Z1FXw_SiGFtdgo,85
-emu_mps/solver_utils.py,sha256=CklWjVvhngpyElpJyfUTncr4ErBP6VbUE3Z9nf8s3mM,8762
+emu_mps/solver_utils.py,sha256=Q1SY8E3Kipe_RfKE8lAMRfD4mSG2VkkkPmk-fU7eAgY,8852
 emu_mps/utils.py,sha256=rL75H55hB5lDMjy8a_O2PpJq51iZKjSx91X4euxB3mY,7293
 emu_mps/optimatrix/__init__.py,sha256=fBXQ7-rgDro4hcaBijCGhx3J69W96qcw5_3mWc7tND4,364
 emu_mps/optimatrix/optimiser.py,sha256=k9suYmKLKlaZ7ozFuIqvXHyCBoCtGgkX1mpen9GOdOo,6977
 emu_mps/optimatrix/permutations.py,sha256=9DDMZtrGGZ01b9F3GkzHR3paX4qNtZiPoI7Z_Kia3Lc,3727
-emu_mps-2.4.3.dist-info/METADATA,sha256=hq605tOeTSfyZa9cNwSkVUH72t5ZTHfLo19Kll9-sxU,3587
-emu_mps-2.4.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-emu_mps-2.4.3.dist-info/RECORD,,
+emu_mps-2.5.0.dist-info/METADATA,sha256=La-IngskVDu8pMUaqmyqS_4Fe1qPAnOKfErnPsVpAiQ,3587
+emu_mps-2.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+emu_mps-2.5.0.dist-info/RECORD,,