yirgacheffe 1.7.8__tar.gz → 1.7.9__tar.gz

{yirgacheffe-1.7.8/yirgacheffe.egg-info → yirgacheffe-1.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.7.8
+Version: 1.7.9
 Summary: Abstraction of gdal datasets for doing basic math operations
 Author-email: Michael Dales <mwd24@cam.ac.uk>
 License-Expression: ISC
@@ -26,13 +26,16 @@ Requires-Dist: torch
 Requires-Dist: dill
 Requires-Dist: deprecation
 Requires-Dist: tomli
+Requires-Dist: h3
+Provides-Extra: mlx
+Requires-Dist: mlx; extra == "mlx"
 Provides-Extra: dev
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
-Requires-Dist: h3; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: mlx; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 Dynamic: license-file
 
 # Yirgacheffe: a gdal wrapper that does the tricky bits

{yirgacheffe-1.7.8 → yirgacheffe-1.7.9}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "yirgacheffe"
-version = "1.7.8"
+version = "1.7.9"
 description = "Abstraction of gdal datasets for doing basic math operations"
 readme = "README.md"
 authors = [{ name = "Michael Dales", email = "mwd24@cam.ac.uk" }]
@@ -28,12 +28,23 @@ dependencies = [
     "torch",
     "dill",
     "deprecation",
-    "tomli"
+    "tomli",
+    "h3",
 ]
 requires-python = ">=3.10"
 
 [project.optional-dependencies]
-dev = ["mypy", "pylint", "pytest", "h3", "pytest-cov", "mlx"]
+mlx = [
+    "mlx",
+]
+dev = [
+    "mypy",
+    "pylint",
+    "pytest",
+    "pytest-cov",
+    "build",
+    "twine",
+]
 
 [project.urls]
 Homepage = "https://github.com/quantifyearth/yirgacheffe"

{yirgacheffe-1.7.8 → yirgacheffe-1.7.9}/tests/test_datatypes.py

@@ -22,7 +22,7 @@ from tests.helpers import gdal_dataset_with_data
 ])
 def test_round_trip(gtype) -> None:
     ytype = DataType.of_gdal(gtype)
-    backend_type = backend.dtype_to_backed(ytype)
+    backend_type = backend.dtype_to_backend(ytype)
     assert backend.backend_to_dtype(backend_type) == ytype
 
 @pytest.mark.parametrize("ytype", [
@@ -42,7 +42,7 @@ def test_round_trip_from_gdal(ytype) -> None:
     assert DataType.of_gdal(gtype) == ytype
 
 def test_round_trip_float64() -> None:
-    backend_type = backend.dtype_to_backed(DataType.Float64)
+    backend_type = backend.dtype_to_backend(DataType.Float64)
     ytype = backend.backend_to_dtype(backend_type)
     match BACKEND:
         case "NUMPY":

{yirgacheffe-1.7.8 → yirgacheffe-1.7.9}/tests/test_operators.py

@@ -1428,18 +1428,34 @@ def test_ceil_module() -> None:
     actual = result.read_array(0, 0, 4, 2)
     assert (expected == actual).all()
 
-def test_to_geotiff_on_layer() -> None:
+def test_to_geotiff_on_int_layer() -> None:
     data1 = np.array([[1, 2, 3, 4], [5, 6, 7, 8]])
     layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
+    assert layer1.datatype == DataType.Int64
 
     with tempfile.TemporaryDirectory() as tempdir:
         filename = os.path.join(tempdir, "test.tif")
         layer1.to_geotiff(filename)
 
         with RasterLayer.layer_from_file(filename) as result:
+            assert result.datatype == DataType.Int64
             actual = result.read_array(0, 0, 4, 2)
             assert (data1 == actual).all()
 
+def test_to_geotiff_on_float_layer() -> None:
+    data1 = np.array([[1.1, 2.1, 3.1, 4.1], [5.1, 6.1, 7.1, 8.1]])
+    layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))
+    assert layer1.datatype == DataType.Float64
+
+    with tempfile.TemporaryDirectory() as tempdir:
+        filename = os.path.join(tempdir, "test.tif")
+        layer1.to_geotiff(filename)
+
+        with RasterLayer.layer_from_file(filename) as result:
+            assert result.datatype == DataType.Float64
+            actual = result.read_array(0, 0, 4, 2)
+            assert np.isclose(data1, actual).all()
+
 def test_to_geotiff_single_thread() -> None:
     data1 = np.array([[1, 2, 3, 4], [5, 6, 7, 8]])
     layer1 = RasterLayer(gdal_dataset_with_data((0.0, 0.0), 0.02, data1))

{yirgacheffe-1.7.8 → yirgacheffe-1.7.9}/yirgacheffe/_backends/mlx.py

@@ -131,7 +131,7 @@ def conv2d_op(data, weights):
     return res[0]
 
 
-def dtype_to_backed(dt):
+def dtype_to_backend(dt):
     match dt:
         case dtype.Float32:
             return mx.float32
@@ -182,7 +182,7 @@ def backend_to_dtype(val):
             raise ValueError
 
 def astype_op(data, datatype):
-    return data.astype(dtype_to_backed(datatype))
+    return data.astype(dtype_to_backend(datatype))
 
 operator_map : Dict[op,Callable] = {
     op.ADD: mx.array.__add__,

{yirgacheffe-1.7.8 → yirgacheffe-1.7.9}/yirgacheffe/_backends/numpy.py

@@ -67,7 +67,7 @@ def conv2d_op(data, weights):
     res = conv(preped_data)
     return res.detach().numpy()[0][0]
 
-def dtype_to_backed(dt):
+def dtype_to_backend(dt):
     match dt:
         case dtype.Float32:
             return np.float32
@@ -120,7 +120,7 @@ def backend_to_dtype(val):
             raise ValueError
 
 def astype_op(data, datatype):
-    return data.astype(dtype_to_backed(datatype))
+    return data.astype(dtype_to_backend(datatype))
 
 operator_map : Dict[op,Callable] = {
     op.ADD: np.ndarray.__add__,

{yirgacheffe-1.7.8 → yirgacheffe-1.7.9}/yirgacheffe/_operators.py

@@ -12,7 +12,7 @@ from enum import Enum
 from multiprocessing import Semaphore, Process
 from multiprocessing.managers import SharedMemoryManager
 from pathlib import Path
-from typing import Callable, Dict, Optional, Union
+from typing import Callable, Dict, List, Optional, Union
 
 import deprecation
 import numpy as np
@@ -26,6 +26,8 @@ from .window import Area, PixelScale, MapProjection, Window
 from ._backends import backend
 from ._backends.enumeration import operators as op
 from ._backends.enumeration import dtype as DataType
+from ._backends.numpy import dtype_to_backend as dtype_to_numpy
+from ._backends.numpy import backend_to_dtype as numpy_to_dtype
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.WARNING)
@@ -47,6 +49,11 @@ class LayerConstant:
     def _eval(self, _area, _projection, _index, _step, _target_window):
         return self.val
 
+    @property
+    def datatype(self) -> DataType:
+        numpy_type = np.result_type(self.val)
+        return numpy_to_dtype(numpy_type)
+
     @property
     def area(self) -> Area:
         return Area.world()
@@ -475,8 +482,16 @@ class LayerOperation(LayerMathMixin):
 
     @property
     def datatype(self) -> DataType:
-        # TODO: Work out how to indicate type promotion via numpy
-        return self.lhs.datatype
+        internal_types: List[DataType] = [
+            self.lhs.datatype
+        ]
+        if self.rhs is not None:
+            internal_types.append(self.rhs.datatype)
+        if self.other is not None:
+            internal_types.append(self.other.datatype)
+        internal_types_as_numpy_types = [dtype_to_numpy(x) for x in internal_types]
+        coerced_type = np.result_type(*internal_types_as_numpy_types)
+        return numpy_to_dtype(coerced_type)
 
     @property
     @deprecation.deprecated(

{yirgacheffe-1.7.8 → yirgacheffe-1.7.9}/yirgacheffe/layers/area.py

@@ -1,5 +1,6 @@
 from math import ceil, floor
-from typing import Any, Optional
+from pathlib import Path
+from typing import Any, Optional, Union
 
 import numpy
 from osgeo import gdal
@@ -18,7 +19,7 @@ class UniformAreaLayer(RasterLayer):
     """
 
     @staticmethod
-    def generate_narrow_area_projection(source_filename: str, target_filename: str) -> None:
+    def generate_narrow_area_projection(source_filename: Union[Path,str], target_filename: Union[Path,str]) -> None:
         source = gdal.Open(source_filename, gdal.GA_ReadOnly)
         if source is None:
             raise FileNotFoundError(source_filename)

{yirgacheffe-1.7.8 → yirgacheffe-1.7.9}/yirgacheffe/layers/rasters.py

@@ -27,7 +27,7 @@ class RasterLayer(YirgacheffeLayer):
         area: Area,
         scale: PixelScale,
         datatype: Union[int, DataType],
-        filename: Optional[str]=None,
+        filename: Optional[Union[Path,str]]=None,
         projection: str=WGS_84_PROJECTION,
         name: Optional[str]=None,
         compress: bool=True,
@@ -165,7 +165,7 @@ class RasterLayer(YirgacheffeLayer):
         cls,
         source: RasterLayer,
         new_pixel_scale: PixelScale,
-        filename: Optional[str]=None,
+        filename: Optional[Union[Path,str]]=None,
         compress: bool=True,
         algorithm: int=gdal.GRA_NearestNeighbour,
     ) -> RasterLayer:

{yirgacheffe-1.7.8 → yirgacheffe-1.7.9/yirgacheffe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.7.8
+Version: 1.7.9
 Summary: Abstraction of gdal datasets for doing basic math operations
 Author-email: Michael Dales <mwd24@cam.ac.uk>
 License-Expression: ISC
@@ -26,13 +26,16 @@ Requires-Dist: torch
 Requires-Dist: dill
 Requires-Dist: deprecation
 Requires-Dist: tomli
+Requires-Dist: h3
+Provides-Extra: mlx
+Requires-Dist: mlx; extra == "mlx"
 Provides-Extra: dev
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
-Requires-Dist: h3; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: mlx; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 Dynamic: license-file
 
 # Yirgacheffe: a gdal wrapper that does the tricky bits

{yirgacheffe-1.7.8 → yirgacheffe-1.7.9}/yirgacheffe.egg-info/requires.txt

@@ -5,11 +5,15 @@ torch
 dill
 deprecation
 tomli
+h3
 
 [dev]
 mypy
 pylint
 pytest
-h3
 pytest-cov
+build
+twine
+
+[mlx]
 mlx