yirgacheffe 1.3.0__tar.gz → 1.3.1__tar.gz

{yirgacheffe-1.3.0/yirgacheffe.egg-info → yirgacheffe-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.3.0
+Version: 1.3.1
 Summary: Abstraction of gdal datasets for doing basic math operations
 Author-email: Michael Dales <mwd24@cam.ac.uk>
 License-Expression: ISC

{yirgacheffe-1.3.0 → yirgacheffe-1.3.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "yirgacheffe"
-version = "1.3.0"
+version = "1.3.1"
 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.0 → yirgacheffe-1.3.1}/tests/test_auto_windowing.py

@@ -2,7 +2,9 @@ import os
 import tempfile
 
 import numpy as np
+import pytest
 
+import yirgacheffe
 from helpers import gdal_dataset_with_data, make_vectors_with_mutlile_ids
 from yirgacheffe.layers import ConstantLayer, RasterLayer, VectorLayer, area
 from yirgacheffe.window import Area
@@ -248,3 +250,35 @@ def test_vector_layers_multiply() -> None:
 
 		expected = np.array([[2, 0], [0, 8]])
 		assert (expected == actual).all()
+
+@pytest.mark.skipif(yirgacheffe.backends.BACKEND != "NUMPY", reason="Only applies for numpy")
+def test_parallel_save_windows() -> None:
+	data1 = np.array([[1, 2], [3, 4]])
+	data2 = np.array([[10, 20, 30, 40], [50, 60, 70, 80], [90, 100, 110, 120], [130, 140, 150, 160]])
+
+	with tempfile.TemporaryDirectory() as tempdir:
+		layer1_filename = os.path.join(tempdir, "layer1.tif")
+		layer1_dataset = gdal_dataset_with_data((0.0, 0.0), 0.02, data1, filename=layer1_filename)
+		layer1_dataset.Close()
+
+		layer2_filename = os.path.join(tempdir, "layer2.tif")
+		layer2_dataset = gdal_dataset_with_data((0.0, 0.0), 0.02, data2, filename=layer2_filename)
+		layer2_dataset.Close()
+
+		layer1 = RasterLayer.layer_from_file(layer1_filename)
+		layer2 = RasterLayer.layer_from_file(layer2_filename)
+
+		assert layer1.area != layer2.area
+		assert layer1.window != layer2.window
+
+		calc = layer1 + layer2
+
+		assert calc.area == layer2.area
+		assert calc.window == layer2.window
+
+		result = RasterLayer.empty_raster_layer_like(calc)
+		calc.parallel_save(result)
+
+		expected = np.array([[11, 22, 30, 40], [53, 64, 70, 80], [90, 100, 110, 120], [130, 140, 150, 160]])
+		actual = result.read_array(0, 0, 4, 4)
+		assert (expected == actual).all()

{yirgacheffe-1.3.0 → yirgacheffe-1.3.1}/yirgacheffe/operators.py

@@ -529,7 +529,7 @@ class LayerOperation(LayerMathMixin):
 
         return total if and_sum else None
 
-    def _parallel_worker(self, index, shared_mem, sem, np_dtype, width, input_queue, output_queue):
+    def _parallel_worker(self, index, shared_mem, sem, np_dtype, width, input_queue, output_queue, computation_window):
         arr = np.ndarray((self.ystep, width), dtype=np_dtype, buffer=shared_mem.buf)
 
         try:
@@ -549,7 +549,7 @@ class LayerOperation(LayerMathMixin):
                     break
                 yoffset, step = task
 
-                result = self._eval(self.area, yoffset, step)
+                result = self._eval(self.area, yoffset, step, computation_window)
                 backend.eval_op(result)
 
                 arr[:step] = backend.demote_array(result)
@@ -650,7 +650,8 @@ class LayerOperation(LayerMathMixin):
                     np_dtype,
                     computation_window.xsize,
                     source_queue,
-                    result_queue
+                    result_queue,
+                    computation_window
                 )) for i in range(worker_count)]
                 for worker in workers:
                     worker.start()

{yirgacheffe-1.3.0 → yirgacheffe-1.3.1/yirgacheffe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.3.0
+Version: 1.3.1
 Summary: Abstraction of gdal datasets for doing basic math operations
 Author-email: Michael Dales <mwd24@cam.ac.uk>
 License-Expression: ISC