yirgacheffe 1.3.2__tar.gz → 1.3.3__tar.gz

{yirgacheffe-1.3.2/yirgacheffe.egg-info → yirgacheffe-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.3.2
+Version: 1.3.3
 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 → yirgacheffe-1.3.3}/README.md

@@ -280,9 +280,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
@@ -290,6 +292,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 → yirgacheffe-1.3.3}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "yirgacheffe"
-version = "1.3.2"
+version = "1.3.3"
 description = "Abstraction of gdal datasets for doing basic math operations"
 readme = "README.md"
 authors = [{ name = "Michael Dales", email = "mwd24@cam.ac.uk" }]

{yirgacheffe-1.3.2 → yirgacheffe-1.3.3}/tests/test_operators.py

@@ -1332,3 +1332,87 @@ def test_simple_conv2d_over_calculated_result(skip) -> None:
 
                 # Torch and MLX give slightly different rounding
                 assert np.isclose(expected, actual).all()
+
+def test_floor_method() -> None:
+    data1 = np.array([[1.0, 1.2, 1.5, 1.7], [-1.0, -1.2, -1.5, -1.7]])
+    layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
+    result = RasterLayer.empty_raster_layer_like(layer1)
+
+    comp = layer1.floor()
+    comp.save(result)
+
+    expected = backend.floor_op(backend.promote(data1))
+    backend.eval_op(expected)
+
+    actual = result.read_array(0, 0, 4, 2)
+    assert (expected == actual).all()
+
+def test_floor_module() -> None:
+    data1 = np.array([[1.0, 1.2, 1.5, 1.7], [-1.0, -1.2, -1.5, -1.7]])
+    layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
+    result = RasterLayer.empty_raster_layer_like(layer1)
+
+    comp = LayerOperation.floor(layer1)
+    comp.save(result)
+
+    expected = backend.floor_op(backend.promote(data1))
+    backend.eval_op(expected)
+
+    actual = result.read_array(0, 0, 4, 2)
+    assert (expected == actual).all()
+
+def test_round_method() -> None:
+    data1 = np.array([[1.0, 1.2, 1.5, 1.7], [-1.0, -1.2, -1.5, -1.7]])
+    layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
+    result = RasterLayer.empty_raster_layer_like(layer1)
+
+    comp = layer1.round()
+    comp.save(result)
+
+    expected = backend.round_op(backend.promote(data1))
+    backend.eval_op(expected)
+
+    actual = result.read_array(0, 0, 4, 2)
+    assert (expected == actual).all()
+
+def test_round_module() -> None:
+    data1 = np.array([[1.0, 1.2, 1.5, 1.7], [-1.0, -1.2, -1.5, -1.7]])
+    layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
+    result = RasterLayer.empty_raster_layer_like(layer1)
+
+    comp = LayerOperation.round(layer1)
+    comp.save(result)
+
+    expected = backend.round_op(backend.promote(data1))
+    backend.eval_op(expected)
+
+    actual = result.read_array(0, 0, 4, 2)
+    assert (expected == actual).all()
+
+def test_ceil_method() -> None:
+    data1 = np.array([[1.0, 1.2, 1.5, 1.7], [-1.0, -1.2, -1.5, -1.7]])
+    layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
+    result = RasterLayer.empty_raster_layer_like(layer1)
+
+    comp = layer1.ceil()
+    comp.save(result)
+
+    expected = backend.ceil_op(backend.promote(data1))
+    backend.eval_op(expected)
+
+    actual = result.read_array(0, 0, 4, 2)
+    assert (expected == actual).all()
+
+def test_ceil_module() -> None:
+    data1 = np.array([[1.0, 1.2, 1.5, 1.7], [-1.0, -1.2, -1.5, -1.7]])
+    layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
+    result = RasterLayer.empty_raster_layer_like(layer1)
+
+    comp = LayerOperation.ceil(layer1)
+    comp.save(result)
+
+    expected = backend.ceil_op(backend.promote(data1))
+    backend.eval_op(expected)
+
+    actual = result.read_array(0, 0, 4, 2)
+    assert (expected == actual).all()

{yirgacheffe-1.3.2 → yirgacheffe-1.3.3}/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-1.3.2 → yirgacheffe-1.3.3}/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-1.3.2 → yirgacheffe-1.3.3}/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-1.3.2 → yirgacheffe-1.3.3}/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,
@@ -765,3 +786,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 → yirgacheffe-1.3.3/yirgacheffe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.3.2
+Version: 1.3.3
 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: