Merge branch 'devitocodes:main' into master

Author: ZoeLeibowitz

devito/ir/support/properties.py

@@ -296,13 +296,22 @@ def inbound(self, dims):
         return self.add(dims, INBOUND)
 
     def init_core_shm(self, dims):
-        return self.add(dims, INIT_CORE_SHM)
+        properties = self.add(dims, INIT_CORE_SHM)
+        properties = properties.drop(properties={INIT_HALO_LEFT_SHM,
+                                                 INIT_HALO_RIGHT_SHM})
+        return properties
 
     def init_halo_left_shm(self, dims):
-        return self.add(dims, INIT_HALO_LEFT_SHM)
+        properties = self.add(dims, INIT_HALO_LEFT_SHM)
+        properties = properties.drop(properties={INIT_CORE_SHM,
+                                                 INIT_HALO_RIGHT_SHM})
+        return properties
 
     def init_halo_right_shm(self, dims):
-        return self.add(dims, INIT_HALO_RIGHT_SHM)
+        properties = self.add(dims, INIT_HALO_RIGHT_SHM)
+        properties = properties.drop(properties={INIT_CORE_SHM,
+                                                 INIT_HALO_LEFT_SHM})
+        return properties
 
     def is_parallel(self, dims):
         return any(len(self[d] & {PARALLEL, PARALLEL_INDEP}) > 0

devito/symbolics/extended_dtypes.py

@@ -13,8 +13,8 @@
 limits_mapper = {
     np.int32: Bunch(min=ValueLimit('INT_MIN'), max=ValueLimit('INT_MAX')),
     np.int64: Bunch(min=ValueLimit('LONG_MIN'), max=ValueLimit('LONG_MAX')),
-    np.float32: Bunch(min=-ValueLimit('FLT_MIN'), max=ValueLimit('FLT_MAX')),
-    np.float64: Bunch(min=-ValueLimit('DBL_MIN'), max=ValueLimit('DBL_MAX')),
+    np.float32: Bunch(min=-ValueLimit('FLT_MAX'), max=ValueLimit('FLT_MAX')),
+    np.float64: Bunch(min=-ValueLimit('DBL_MAX'), max=ValueLimit('DBL_MAX')),
 }
 
 

devito/types/dense.py

@@ -5,7 +5,6 @@
 
 import numpy as np
 import sympy
-from psutil import virtual_memory
 from functools import cached_property
 
 from devito.builtins import assign
@@ -1380,14 +1379,6 @@ def __init_finalize__(self, *args, **kwargs):
         self._time_order = kwargs.get('time_order', 1)
         super().__init_finalize__(*args, **kwargs)
 
-        # Check we won't allocate too much memory for the system
-        available_mem = virtual_memory().available
-        required_mem = np.dtype(self.dtype).itemsize * self.size
-        if required_mem > available_mem:
-            raise MemoryError(
-                f"Trying to allocate more memory ({humanbytes(required_mem)}) "
-                f"for `{self.name}` than available ({humanbytes(available_mem)})"
-            )
         if not isinstance(self.time_order, int):
             raise TypeError("`time_order` must be int")