NetKet 3.12.2__tar.gz → 3.12.4__tar.gz

{netket-3.12.2 → netket-3.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: NetKet
-Version: 3.12.2
+Version: 3.12.4
 Summary: Netket : Machine Learning toolbox for many-body quantum systems.
 Project-URL: homepage, https://www.netket.org
 Project-URL: documentation, https://netket.readthedocs.io/en/latest/#

{netket-3.12.2 → netket-3.12.4}/netket/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.12.2'
-__version_tuple__ = version_tuple = (3, 12, 2)
+__version__ = version = '3.12.4'
+__version_tuple__ = version_tuple = (3, 12, 4)

{netket-3.12.2 → netket-3.12.4}/netket/callbacks/earlystopping.py

@@ -78,7 +78,7 @@ class EarlyStopping(struct.Pytree, mutable=True):
         self.baseline = baseline
         self.monitor = monitor
 
-        self._best_val = np.infty
+        self._best_val = np.inf
         self._best_iter = 0
         self._best_patience_counter = 0
 

{netket-3.12.2 → netket-3.12.4}/netket/experimental/operator/_fermion_operator_2nd_base.py

@@ -488,7 +488,7 @@ class FermionOperator2ndBase(DiscreteOperator):
         del concrete
 
         # if operator is real dtype, then just return a copy
-        if not np.issubdtype(self.dtype, np.complex_):
+        if not np.issubdtype(self.dtype, np.complexfloating):
             return self.copy()
         else:
             new = type(self)(self.hilbert, dtype=self.dtype, cutoff=self._cutoff)

{netket-3.12.2 → netket-3.12.4}/netket/hilbert/random/base.py

@@ -23,7 +23,9 @@ import numpy as np
 from netket.utils.dispatch import dispatch
 from netket.jax.sharding import sharding_decorator
 
-Dim = Union[tuple[int], tuple[int, int], tuple[int, int, int]]
+Dim = Union[
+    tuple[int], tuple[int, int], tuple[int, int, int], tuple[int, int, int, int]
+]
 
 
 @dispatch
@@ -88,17 +90,6 @@ def random_state(hilb, key, size: int, *, dtype):  # noqa: F811
     )
 
 
-@dispatch
-def random_state(hilb, key, size: None, *, dtype):  # noqa: F811
-    return random_state(hilb, key, 1, dtype=dtype)[0]
-
-
-@dispatch
-def random_state(hilb, key, size: Dim, *, dtype):  # noqa: F811
-    n = int(np.prod(size))
-    return random_state(hilb, key, n, dtype=dtype).reshape(*size, -1)
-
-
 def flip_state(hilb, key, state, indices):
     r"""
     Given a state `σ` and an index `i`, randomly flips `σ[i]` so that

{netket-3.12.2 → netket-3.12.4}/netket/operator/_hamiltonian.py

@@ -27,46 +27,38 @@ class SpecialHamiltonian(DiscreteOperator):
     def __add__(self, other):
         if type(self) is type(other):
             res = self.copy()
-            res += other
-            return res
+            res = res.__iadd__(other)
+            if res is not NotImplemented:
+                return res
 
-        return self.to_local_operator().__add__(other)
+        return self.to_local_operator() + other
 
     def __sub__(self, other):
         if type(self) is type(other):
             res = self.copy()
-            res -= other
-            return res
+            res = res.__isub__(other)
+            if res is not NotImplemented:
+                return res
 
-        return self.to_local_operator().__sub__(other)
+        return self.to_local_operator() - other
 
     def __radd__(self, other):
-        if type(self) is type(other):
-            res = self.copy()
-            res += other
-            return res
-
         return self.to_local_operator().__radd__(other)
 
     def __rsub__(self, other):
-        if type(self) is type(other):
-            res = self.copy()
-            res -= other
-            return res
-
         return self.to_local_operator().__rsub__(other)
 
     def __iadd__(self, other):
         if type(self) is type(other):
-            self._iadd_same_hamiltonian(other)
-            return self
+            res = self._iadd_same_hamiltonian(other)
+            return res
 
         return NotImplemented
 
     def __isub__(self, other):
         if type(self) is type(other):
-            self._isub_same_hamiltonian(other)
-            return self
+            res = self._isub_same_hamiltonian(other)
+            return res
 
         return NotImplemented
 
@@ -81,6 +73,9 @@ class SpecialHamiltonian(DiscreteOperator):
             other = other.to_local_operator()
         return self.to_local_operator().__matmul__(other)
 
+    def __neg__(self):
+        return -1 * self.to_local_operator()
+
     def _op__rmatmul__(self, other):
         if hasattr(other, "to_local_operator"):
             other = other.to_local_operator()

{netket-3.12.2 → netket-3.12.4}/netket/operator/_ising/base.py

@@ -184,9 +184,12 @@ class IsingBase(SpecialHamiltonian):
             raise NotImplementedError(
                 "Cannot add hamiltonians on different hilbert spaces"
             )
+        if not np.allclose(self.edges, other.edges):
+            return NotImplemented
 
         self._h += other.h
         self._J += other.J
+        return self
 
     def _isub_same_hamiltonian(self, other):
         if self.hilbert != other.hilbert:
@@ -194,8 +197,12 @@ class IsingBase(SpecialHamiltonian):
                 "Cannot add hamiltonians on different hilbert spaces"
             )
 
+        if not np.allclose(self.edges, other.edges):
+            return NotImplemented
+
         self._h -= other.h
         self._J -= other.J
+        return self
 
     def __repr__(self):
         return (

{netket-3.12.2 → netket-3.12.4}/netket/operator/_local_operator/base.py

@@ -317,7 +317,6 @@ class LocalOperatorBase(DiscreteOperator):
             self._reset_caches()
             self._constant += other
             return self
-
         return NotImplemented
 
     def __truediv__(self, other):

{netket-3.12.2 → netket-3.12.4}/netket/optimizer/qgt/qgt_jacobian_common.py

@@ -59,12 +59,14 @@ def sanitize_diag_shift(diag_shift, diag_scale, rescale_shift):
 
 
 def to_shift_offset(diag_shift, diag_scale):
-    if diag_scale == 0.0:
-        return diag_shift, None
+    if not isinstance(diag_scale, jax.Array):
+        if diag_scale == 0.0:
+            return diag_shift, None
+        else:
+            return diag_scale, diag_shift / diag_scale
     else:
         return diag_scale, diag_shift / diag_scale
 
-
 @partial(jax.jit, static_argnames="ndims")
 def rescale(centered_oks, offset, *, ndims: int = 1):
     """