yirgacheffe 1.3.2__py3-none-any.whl → 1.3.4__py3-none-any.whl

yirgacheffe/backends/enumeration.py

@@ -35,7 +35,9 @@ class operators(Enum):
     CONV2D = 30
     ABS = 31
     ASTYPE = 32
-
+    FLOOR = 33
+    ROUND = 34
+    CEIL = 35
 
 class dtype(Enum):
     Float32 = gdal.GDT_Float32

yirgacheffe/backends/mlx.py

@@ -45,6 +45,9 @@ allclose = mx.allclose
 remainder_op = mx.remainder
 floordiv_op = mx.array.__floordiv__
 abs_op = mx.abs
+floor_op = mx.floor
+round_op = mx.round
+ceil_op = mx.ceil
 
 def sum_op(a):
     # There are weird issues around how MLX overflows int8, so just promote the data ahead of summing
@@ -211,4 +214,7 @@ operator_map = {
     op.CONV2D: conv2d_op,
     op.ABS: mx.abs,
     op.ASTYPE: astype_op,
+    op.FLOOR: mx.floor,
+    op.ROUND: mx.round,
+    op.CEIL: mx.ceil,
 }

yirgacheffe/backends/numpy.py

@@ -48,6 +48,9 @@ allclose = np.allclose
 remainder_op = np.ndarray.__mod__
 floordiv_op = np.ndarray.__floordiv__
 abs_op = np.abs
+floor_op = np.floor
+round_op = np.round
+ceil_op = np.ceil
 
 def conv2d_op(data, weights):
     # torch wants to process dimensions of channels of width of height
@@ -149,4 +152,7 @@ operator_map = {
     op.CONV2D: conv2d_op,
     op.ABS: np.abs,
     op.ASTYPE: astype_op,
+    op.FLOOR: np.floor,
+    op.ROUND: np.round,
+    op.CEIL: np.ceil,
 }

yirgacheffe/operators.py

@@ -121,6 +121,27 @@ class LayerMathMixin:
             window_op=WindowOperation.NONE,
         )
 
+    def floor(self):
+        return LayerOperation(
+            self,
+            op.FLOOR,
+            window_op=WindowOperation.NONE,
+        )
+
+    def round(self):
+        return LayerOperation(
+            self,
+            op.ROUND,
+            window_op=WindowOperation.NONE,
+        )
+
+    def ceil(self):
+        return LayerOperation(
+            self,
+            op.CEIL,
+            window_op=WindowOperation.NONE,
+        )
+
     def log(self):
         return LayerOperation(
             self,
@@ -500,9 +521,17 @@ class LayerOperation(LayerMathMixin):
         except AttributeError as exc:
             raise ValueError("Layer must be a raster backed layer") from exc
 
-        computation_window = self.window
         destination_window = destination_layer.window
 
+        # If we're calculating purely from a constant layer, then we don't have a window or area
+        # so we should use the destination raster details.
+        try:
+            computation_window = self.window
+            computation_area = self.area
+        except AttributeError:
+            computation_window = destination_window
+            computation_area = destination_layer.area
+
         if (computation_window.xsize != destination_window.xsize) \
                 or (computation_window.ysize != destination_window.ysize):
             raise ValueError("Destination raster window size does not match input raster window size.")
@@ -515,7 +544,7 @@ class LayerOperation(LayerMathMixin):
             step=self.ystep
             if yoffset+step > computation_window.ysize:
                 step = computation_window.ysize - yoffset
-            chunk = self._eval(self.area, yoffset, step, computation_window)
+            chunk = self._eval(computation_area, yoffset, step, computation_window)
             if isinstance(chunk, (float, int)):
                 chunk = backend.full((step, destination_window.xsize), chunk)
             band.WriteArray(
@@ -578,7 +607,18 @@ class LayerOperation(LayerMathMixin):
 
     def _parallel_save(self, destination_layer, and_sum=False, callback=None, parallelism=None, band=1):
         assert (destination_layer is not None) or and_sum
-        computation_window = self.window
+        try:
+            computation_window = self.window
+        except AttributeError:
+            # This is most likely because the calculation is on a constant layer (or combination of only constant
+            # layers) and there's no real benefit to parallel saving then, so to keep this code from getting yet
+            # more complicated just fall back to the single threaded path
+            if destination_layer:
+                return self.save(destination_layer, and_sum, callback, band)
+            elif and_sum:
+                return self.sum()
+            else:
+                assert False
 
         worker_count = parallelism or multiprocessing.cpu_count()
         work_blocks = len(range(0, computation_window.ysize, self.ystep))
@@ -765,3 +805,6 @@ exp2 = LayerOperation.exp2
 nan_to_num = LayerOperation.nan_to_num
 isin = LayerOperation.isin
 abs = LayerOperation.abs # pylint: disable=W0622
+floor = LayerOperation.floor
+round = LayerOperation.round # pylint: disable=W0622
+ceil = LayerOperation.ceil

{yirgacheffe-1.3.2.dist-info → yirgacheffe-1.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.3.2
+Version: 1.3.4
 Summary: Abstraction of gdal datasets for doing basic math operations
 Author-email: Michael Dales <mwd24@cam.ac.uk>
 License-Expression: ISC
@@ -304,9 +304,11 @@ with RasterLayer.layer_from_file('test1.tif') as layer1:
 The following math operators common to numpy and other libraries are currently supported:
 
 * abs
+* ceil
 * clip
 * exp
 * exp2
+* floor
 * isin
 * log
 * log2
@@ -314,6 +316,7 @@ The following math operators common to numpy and other libraries are currently s
 * maximum
 * minimum
 * nan_to_num
+* round
 
 Typically these can be invoked either on a layer as a method:
 

{yirgacheffe-1.3.2.dist-info → yirgacheffe-1.3.4.dist-info}/RECORD

@@ -1,13 +1,13 @@
 yirgacheffe/__init__.py,sha256=U5AoPk_iWreSCexG2ID-tmSXiJz4_9Lvzbf42DMvT7k,658
 yirgacheffe/constants.py,sha256=WccPcISG1FqL_Kw1tI72BJGjHy6RvEcGEx_I9RK776U,42
 yirgacheffe/h3layer.py,sha256=MT2hm6n64hzHSeRPvjn-CwErru937ntKXbEU7CIlPSU,91
-yirgacheffe/operators.py,sha256=f72xFsH6KmmWhrbsU0V7g_jgTJQ4BAaZzDhV7i-wPio,27607
+yirgacheffe/operators.py,sha256=KIMYmRl0uJG9LYnmX_uwHhGNfCNOEZlfaXZU7kD1aL4,29081
 yirgacheffe/rounding.py,sha256=ggBG4lMyLMtHLW3dBxr3gBCcF2qhRrY5etZiFGlIoqA,2258
 yirgacheffe/window.py,sha256=0XZdwD4mz0bRU9eBhFY1Xk1hQt6FqCKp3BnUgxZup3c,5224
 yirgacheffe/backends/__init__.py,sha256=149-fg1PVXC36cgyuSZsU8SYOm65fzUmYN_MHZtEyrY,313
-yirgacheffe/backends/enumeration.py,sha256=v1CsWSq97LNS4QXgUc59OyaBQWF5dAG5cDrMY2NWx1o,960
-yirgacheffe/backends/mlx.py,sha256=Bt0Jlt96ECHZmBwI7kqJ6kSVsLDU-6rq0E7oUt7EzOg,5969
-yirgacheffe/backends/numpy.py,sha256=t8rPDqkghE5UfkJi8r6ZUg14f1nL2lsPp61FGqUJwCg,3887
+yirgacheffe/backends/enumeration.py,sha256=pADawllxpW_hW-IVVvZpHWIKzvEMs9aaqfkZRD1zjnY,1003
+yirgacheffe/backends/mlx.py,sha256=3HSKU7ZU846trdxeVhPj2OPkFWrCxfbjB65-NpnmANQ,6097
+yirgacheffe/backends/numpy.py,sha256=qQYvff1oHIuGUimV04rcFyPxnwEf0acvVd3ijeom4T4,4015
 yirgacheffe/layers/__init__.py,sha256=GR_TJlhPKDK1212CG2T99X2FdBlNo_G8q2zQ6nJbiO4,1534
 yirgacheffe/layers/area.py,sha256=yIRXzeeLi3MMyuh4LG_VgZrKNWe5xwZgDGdgaoYRpP0,3805
 yirgacheffe/layers/base.py,sha256=vVxumZgFLTYXFtVxJEiBVV1QqtQWa5kwL10ckUF-ykE,11617
@@ -17,9 +17,9 @@ yirgacheffe/layers/h3layer.py,sha256=Cyrw_6nXc1a_Twsb0FfexKhHAbegKXStL3J5LLk2AX8
 yirgacheffe/layers/rasters.py,sha256=8mAbH49RtKIoA3h9mxWNbPzo8NJWDSfoRPT7fpkTJ4I,12328
 yirgacheffe/layers/rescaled.py,sha256=kWJlu7DuUB3nRDt3VtbJKiqBDQb2Ba8xzIIXTvOGdK8,2945
 yirgacheffe/layers/vectors.py,sha256=JOqM7Ym53ZdxWKpBJac-opPp2N_ynMfet1Xtsi85dpM,15087
-yirgacheffe-1.3.2.dist-info/licenses/LICENSE,sha256=dNSHwUCJr6axStTKDEdnJtfmDdFqlE3h1NPCveqPfnY,757
-yirgacheffe-1.3.2.dist-info/METADATA,sha256=Nb9n3FKLxFJXTZZqrdWZAdfYbCogEMxWrrEEw96zE3M,20473
-yirgacheffe-1.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yirgacheffe-1.3.2.dist-info/entry_points.txt,sha256=j4KgHXbVGbGyfTySc1ypBdERpfihO4WNjppvCdE9HjE,52
-yirgacheffe-1.3.2.dist-info/top_level.txt,sha256=9DBFlKO2Ld3hG6TuE3qOTd3Tt8ugTiXil4AN4Wr9_y0,12
-yirgacheffe-1.3.2.dist-info/RECORD,,
+yirgacheffe-1.3.4.dist-info/licenses/LICENSE,sha256=dNSHwUCJr6axStTKDEdnJtfmDdFqlE3h1NPCveqPfnY,757
+yirgacheffe-1.3.4.dist-info/METADATA,sha256=tKSbYq3ZonA4FTn9AeYFgAB9AcZOnMBdky7oZ_Vcz60,20496
+yirgacheffe-1.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yirgacheffe-1.3.4.dist-info/entry_points.txt,sha256=j4KgHXbVGbGyfTySc1ypBdERpfihO4WNjppvCdE9HjE,52
+yirgacheffe-1.3.4.dist-info/top_level.txt,sha256=9DBFlKO2Ld3hG6TuE3qOTd3Tt8ugTiXil4AN4Wr9_y0,12
+yirgacheffe-1.3.4.dist-info/RECORD,,