yirgacheffe 1.7.7__py3-none-any.whl → 1.7.9__py3-none-any.whl

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/_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/_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/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/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.7.dist-info → yirgacheffe-1.7.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yirgacheffe
-Version: 1.7.7
+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
@@ -8,24 +8,34 @@ Project-URL: Homepage, https://github.com/quantifyearth/yirgacheffe
 Project-URL: Repository, https://github.com/quantifyearth/yirgacheffe.git
 Project-URL: Issues, https://github.com/quantifyearth/yirgacheffe/issues
 Project-URL: Changelog, https://github.com/quantifyearth/yirgacheffe/blob/main/CHANGES.md
-Keywords: gdal,numpy,math
+Keywords: gdal,gis,geospatial,declarative
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Science/Research
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Scientific/Engineering :: GIS
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy
-Requires-Dist: gdal[numpy]
-Requires-Dist: scikit-image
+Requires-Dist: numpy<3.0,>=1.24
+Requires-Dist: gdal[numpy]<4.0,>=3.8
+Requires-Dist: scikit-image<1.0,>=0.20
 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.7.dist-info → yirgacheffe-1.7.9.dist-info}/RECORD

@@ -1,26 +1,27 @@
 yirgacheffe/__init__.py,sha256=pY9dqmHHARfY44T-7-7y6Ah97qQHj9_0pgYTItI5TR8,567
 yirgacheffe/_core.py,sha256=hnACrthBI8OFNoi88-Qnj-4aizBGZstFO7kj-5g9MSU,6083
-yirgacheffe/_operators.py,sha256=wI0JPbIQyYjPKAlkfaBfshNx5JVNaTohvjucytWaFw4,35607
+yirgacheffe/_operators.py,sha256=63KZZKTW-Pz0eOBRZUuolWxNNQvPC_sHruAdyo6J5dc,36238
 yirgacheffe/constants.py,sha256=uCWJwec3-ND-zVxYbsk1sdHKANl3ToNCTPg7MZb0j2g,434
 yirgacheffe/operators.py,sha256=nw-BpnAwTjCwFtjosa8wKd2MGUuC0PJR5jACFdLhqCg,412
+yirgacheffe/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 yirgacheffe/rounding.py,sha256=ggBG4lMyLMtHLW3dBxr3gBCcF2qhRrY5etZiFGlIoqA,2258
 yirgacheffe/window.py,sha256=Oxf8VcslLxNacqjUcDHqZLvdMaTnIwuNwjsm1WEOc0g,9503
 yirgacheffe/_backends/__init__.py,sha256=jN-2iRrHStnPI6cNL7XhwhsROtI0EaGfIrbF5c-ECV0,334
 yirgacheffe/_backends/enumeration.py,sha256=Jrce2p2n4Wlk5tHBkiWntDnpLSD_0H-bnwgsKXHjkwQ,1018
-yirgacheffe/_backends/mlx.py,sha256=kEWcJOhhUQSHkRPljv6s0MYlxcuu-LzLL55Fdd8tIqc,6171
-yirgacheffe/_backends/numpy.py,sha256=IdAgK8oFZxjzK1I_-_yXYu_G935920GxpB6oZoJvWvQ,4110
+yirgacheffe/_backends/mlx.py,sha256=6a0S80JCxwiq72hWv-83238NaQykn-vQw_IDRBIBbbw,6173
+yirgacheffe/_backends/numpy.py,sha256=N-Ygpw1lgJJI7xGoRJnB480rR0tst75cOIowubGnSjw,4112
 yirgacheffe/layers/__init__.py,sha256=mYKjw5YTcMNv_hMy7a6K4yRzIuNUbR8WuBTw4WIAmSk,435
-yirgacheffe/layers/area.py,sha256=OFOM1_dMblzXLW29TwEqfdgSecl6aNs04bKJwUydLH0,3914
+yirgacheffe/layers/area.py,sha256=LeLSinB-z2k4ODSfiNJvQnSnMfa8Gn7VnkJrLt50zVU,3970
 yirgacheffe/layers/base.py,sha256=-7QIfAI3iGlzt-dDLztpRaLrL2sSqB1y2Yw2TdJ9VJM,14426
 yirgacheffe/layers/constant.py,sha256=8wfyw1JOxr5FQv_M9Jzbd6vW2rjK3AJHmoe-ftDmPlM,1457
 yirgacheffe/layers/group.py,sha256=hK84oCAweaX2eQP0DXPd_uHj1aVdTD9F-gaCRPfjxmY,16202
 yirgacheffe/layers/h3layer.py,sha256=t8yC3c8pXU5qbFqsfP76ZX8UHkW9lK4ZgnNm4pwTjls,9886
-yirgacheffe/layers/rasters.py,sha256=9Wgvr-WeavU7VELTz5Q-rwWQIN3g5E9TbEY8-yERpjk,13586
+yirgacheffe/layers/rasters.py,sha256=M2DG5-UPbhKsCHL5B2LDncqgb7VP6yzeDfXv_U6EaZo,13610
 yirgacheffe/layers/rescaled.py,sha256=jbr2GxFy3I29vudX0oyMaFRTimrbEcAPI6dnHvjWpfU,3377
 yirgacheffe/layers/vectors.py,sha256=c8QWeKF1umBGo5BYyJPl-CN_EfjxdTGNaQJDfAkvTIM,20139
-yirgacheffe-1.7.7.dist-info/licenses/LICENSE,sha256=dNSHwUCJr6axStTKDEdnJtfmDdFqlE3h1NPCveqPfnY,757
-yirgacheffe-1.7.7.dist-info/METADATA,sha256=FfXMda6MkjVV05yZkV3iBa72wHAu36xvyQQkXb_GQUU,23134
-yirgacheffe-1.7.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yirgacheffe-1.7.7.dist-info/entry_points.txt,sha256=j4KgHXbVGbGyfTySc1ypBdERpfihO4WNjppvCdE9HjE,52
-yirgacheffe-1.7.7.dist-info/top_level.txt,sha256=9DBFlKO2Ld3hG6TuE3qOTd3Tt8ugTiXil4AN4Wr9_y0,12
-yirgacheffe-1.7.7.dist-info/RECORD,,
+yirgacheffe-1.7.9.dist-info/licenses/LICENSE,sha256=dNSHwUCJr6axStTKDEdnJtfmDdFqlE3h1NPCveqPfnY,757
+yirgacheffe-1.7.9.dist-info/METADATA,sha256=cfrQwtndmOW5MTb28UoWG73U-1j4ufa1SyqoLACr2SA,23618
+yirgacheffe-1.7.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yirgacheffe-1.7.9.dist-info/entry_points.txt,sha256=j4KgHXbVGbGyfTySc1ypBdERpfihO4WNjppvCdE9HjE,52
+yirgacheffe-1.7.9.dist-info/top_level.txt,sha256=9DBFlKO2Ld3hG6TuE3qOTd3Tt8ugTiXil4AN4Wr9_y0,12
+yirgacheffe-1.7.9.dist-info/RECORD,,