polytope-python 1.0.7__tar.gz → 1.0.9__tar.gz

{polytope-python-1.0.7/polytope_python.egg-info → polytope-python-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: polytope-python
-Version: 1.0.7
+Version: 1.0.9
 Summary: Polytope datacube feature extraction library
 Home-page: https://github.com/ecmwf/polytope
 Author: ECMWF

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/datacube/backends/datacube.py

@@ -128,6 +128,7 @@ class Datacube(ABC):
         """
         path = self.fit_path(path)
         indexes = axis.find_indexes(path, self)
+
         idx_between = axis.find_indices_between(indexes, lower, upper, self, method)
 
         logging.debug(f"For axis {axis.name} between {lower} and {upper}, found indices {idx_between}")

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/datacube/transformations/datacube_mappers/datacube_mappers.py

@@ -13,8 +13,14 @@ class DatacubeMapper(DatacubeAxisTransformation):
         self.grid_resolution = mapper_options.resolution
         self.grid_axes = mapper_options.axes
         self.local_area = []
+        self.md5_hash = None
+        if mapper_options.md5_hash is not None:
+            self.md5_hash = mapper_options.md5_hash
         if mapper_options.local is not None:
             self.local_area = mapper_options.local
+        self._axis_reversed = None
+        if mapper_options.axis_reversed is not None:
+            self._axis_reversed = mapper_options.axis_reversed
         self.old_axis = name
         self._final_transformation = self.generate_final_transformation()
         self._final_mapped_axes = self._final_transformation._mapped_axes
@@ -24,9 +30,15 @@ class DatacubeMapper(DatacubeAxisTransformation):
 
     def generate_final_transformation(self):
         map_type = _type_to_datacube_mapper_lookup[self.grid_type]
-        module = import_module("polytope.datacube.transformations.datacube_mappers.mapper_types." + self.grid_type)
+        module = import_module(
+            "polytope_feature.datacube.transformations.datacube_mappers.mapper_types." + self.grid_type
+        )
         constructor = getattr(module, map_type)
-        transformation = deepcopy(constructor(self.old_axis, self.grid_axes, self.grid_resolution, self.local_area))
+        transformation = deepcopy(
+            constructor(
+                self.old_axis, self.grid_axes, self.grid_resolution, self.md5_hash, self.local_area, self._axis_reversed
+            )
+        )
         return transformation
 
     def blocked_axes(self):

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/datacube/transformations/datacube_mappers/mapper_types/healpix.py

@@ -5,7 +5,7 @@ from ..datacube_mappers import DatacubeMapper
 
 
 class HealpixGridMapper(DatacubeMapper):
-    def __init__(self, base_axis, mapped_axes, resolution, local_area=[]):
+    def __init__(self, base_axis, mapped_axes, resolution, md5_hash=None, local_area=[], axis_reversed=None):
         # TODO: if local area is not empty list, raise NotImplemented
         self._mapped_axes = mapped_axes
         self._base_axis = base_axis
@@ -13,7 +13,14 @@ class HealpixGridMapper(DatacubeMapper):
         self._axis_reversed = {mapped_axes[0]: True, mapped_axes[1]: False}
         self._first_axis_vals = self.first_axis_vals()
         self.compressed_grid_axes = [self._mapped_axes[1]]
-        self.md5_hash = md5_hash.get(resolution, None)
+        if md5_hash is not None:
+            self.md5_hash = md5_hash
+        else:
+            self.md5_hash = _md5_hash.get(resolution, None)
+        if self._axis_reversed[mapped_axes[1]]:
+            raise NotImplementedError("Healpix grid with second axis in decreasing order is not supported")
+        if not self._axis_reversed[mapped_axes[0]]:
+            raise NotImplementedError("Healpix grid with first axis in increasing order is not supported")
 
     def first_axis_vals(self):
         rad2deg = 180 / math.pi
@@ -137,4 +144,4 @@ class HealpixGridMapper(DatacubeMapper):
 
 
 # md5 grid hash in form {resolution : hash}
-md5_hash = {}
+_md5_hash = {}

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/datacube/transformations/datacube_mappers/mapper_types/healpix_nested.py

@@ -5,7 +5,7 @@ from ..datacube_mappers import DatacubeMapper
 
 
 class NestedHealpixGridMapper(DatacubeMapper):
-    def __init__(self, base_axis, mapped_axes, resolution, local_area=[]):
+    def __init__(self, base_axis, mapped_axes, resolution, md5_hash=None, local_area=[], axis_reversed=None):
         # TODO: if local area is not empty list, raise NotImplemented
         self._mapped_axes = mapped_axes
         self._base_axis = base_axis
@@ -17,7 +17,14 @@ class NestedHealpixGridMapper(DatacubeMapper):
         self.k = int(math.log2(self.Nside))
         self.Npix = 12 * self.Nside * self.Nside
         self.Ncap = (self.Nside * (self.Nside - 1)) << 1
-        self.md5_hash = md5_hash.get(resolution, None)
+        if md5_hash is not None:
+            self.md5_hash = md5_hash
+        else:
+            self.md5_hash = _md5_hash.get(resolution, None)
+        if self._axis_reversed[mapped_axes[1]]:
+            raise NotImplementedError("Healpix grid with second axis in decreasing order is not supported")
+        if not self._axis_reversed[mapped_axes[0]]:
+            raise NotImplementedError("Healpix grid with first axis in increasing order is not supported")
 
     def first_axis_vals(self):
         rad2deg = 180 / math.pi
@@ -215,4 +222,4 @@ class NestedHealpixGridMapper(DatacubeMapper):
 
 
 # md5 grid hash in form {resolution : hash}
-md5_hash = {}
+_md5_hash = {}

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/datacube/transformations/datacube_mappers/mapper_types/local_regular.py

@@ -4,7 +4,7 @@ from ..datacube_mappers import DatacubeMapper
 
 
 class LocalRegularGridMapper(DatacubeMapper):
-    def __init__(self, base_axis, mapped_axes, resolution, local_area=[]):
+    def __init__(self, base_axis, mapped_axes, resolution, md5_hash=None, local_area=[], axis_reversed=None):
         # TODO: if local area is not empty list, raise NotImplemented
         self._mapped_axes = mapped_axes
         self._base_axis = base_axis
@@ -15,19 +15,38 @@ class LocalRegularGridMapper(DatacubeMapper):
         if not isinstance(resolution, list):
             self.first_resolution = resolution
             self.second_resolution = resolution
-            self.md5_hash = md5_hash.get(resolution, None)
+            if md5_hash is not None:
+                self.md5_hash = md5_hash
+            else:
+                self.md5_hash = _md5_hash.get(resolution, None)
         else:
             self.first_resolution = resolution[0]
             self.second_resolution = resolution[1]
-            self.md5_hash = md5_hash.get(tuple(resolution), None)
+            if md5_hash is not None:
+                self.md5_hash = md5_hash
+            else:
+                self.md5_hash = _md5_hash.get(tuple(resolution), None)
         self._first_deg_increment = (local_area[1] - local_area[0]) / self.first_resolution
         self._second_deg_increment = (local_area[3] - local_area[2]) / self.second_resolution
-        self._axis_reversed = {mapped_axes[0]: True, mapped_axes[1]: False}
+        if axis_reversed is None:
+            self._axis_reversed = {mapped_axes[0]: False, mapped_axes[1]: False}
+        else:
+            assert set(axis_reversed.keys()) == set(mapped_axes)
+            self._axis_reversed = axis_reversed
         self._first_axis_vals = self.first_axis_vals()
         self.compressed_grid_axes = [self._mapped_axes[1]]
+        if self._axis_reversed[mapped_axes[1]]:
+            raise NotImplementedError("Local regular grid with second axis in decreasing order is not supported")
 
     def first_axis_vals(self):
-        first_ax_vals = [self._first_axis_max - i * self._first_deg_increment for i in range(self.first_resolution + 1)]
+        if self._axis_reversed[self._mapped_axes[0]]:
+            first_ax_vals = [
+                self._first_axis_max - i * self._first_deg_increment for i in range(self.first_resolution + 1)
+            ]
+        else:
+            first_ax_vals = [
+                self._first_axis_min + i * self._first_deg_increment for i in range(self.first_resolution + 1)
+            ]
         return first_ax_vals
 
     def map_first_axis(self, lower, upper):
@@ -73,4 +92,4 @@ class LocalRegularGridMapper(DatacubeMapper):
 
 
 # md5 grid hash in form {resolution : hash}
-md5_hash = {}
+_md5_hash = {}

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/datacube/transformations/datacube_mappers/mapper_types/octahedral.py

@@ -5,7 +5,7 @@ from ..datacube_mappers import DatacubeMapper
 
 
 class OctahedralGridMapper(DatacubeMapper):
-    def __init__(self, base_axis, mapped_axes, resolution, local_area=[]):
+    def __init__(self, base_axis, mapped_axes, resolution, md5_hash=None, local_area=[], axis_reversed=None):
         # TODO: if local area is not empty list, raise NotImplemented
         self._mapped_axes = mapped_axes
         self._base_axis = base_axis
@@ -14,8 +14,15 @@ class OctahedralGridMapper(DatacubeMapper):
         self._first_idx_map = self.create_first_idx_map()
         self._second_axis_spacing = {}
         self._axis_reversed = {mapped_axes[0]: True, mapped_axes[1]: False}
+        if self._axis_reversed[mapped_axes[1]]:
+            raise NotImplementedError("Octahedral grid with second axis in decreasing order is not supported")
+        if not self._axis_reversed[mapped_axes[0]]:
+            raise NotImplementedError("Octahedral grid with first axis in increasing order is not supported")
         self.compressed_grid_axes = [self._mapped_axes[1]]
-        self.md5_hash = md5_hash.get(resolution, None)
+        if md5_hash is not None:
+            self.md5_hash = md5_hash
+        else:
+            self.md5_hash = _md5_hash.get(resolution, None)
 
     def gauss_first_guess(self):
         i = 0
@@ -2754,6 +2761,6 @@ class OctahedralGridMapper(DatacubeMapper):
 
 
 # md5 grid hash in form {resolution : hash}
-md5_hash = {
+_md5_hash = {
     1280: "158db321ae8e773681eeb40e0a3d350f",
 }

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/datacube/transformations/datacube_mappers/mapper_types/reduced_ll.py

@@ -4,7 +4,7 @@ from ..datacube_mappers import DatacubeMapper
 
 
 class ReducedLatLonMapper(DatacubeMapper):
-    def __init__(self, base_axis, mapped_axes, resolution, local_area=[]):
+    def __init__(self, base_axis, mapped_axes, resolution, md5_hash=None, local_area=[], axis_reversed=None):
         # TODO: if local area is not empty list, raise NotImplemented
         self._mapped_axes = mapped_axes
         self._base_axis = base_axis
@@ -12,7 +12,14 @@ class ReducedLatLonMapper(DatacubeMapper):
         self._axis_reversed = {mapped_axes[0]: False, mapped_axes[1]: False}
         self._first_axis_vals = self.first_axis_vals()
         self.compressed_grid_axes = [self._mapped_axes[1]]
-        self.md5_hash = md5_hash.get(resolution, None)
+        if md5_hash is not None:
+            self.md5_hash = md5_hash
+        else:
+            self.md5_hash = _md5_hash.get(resolution, None)
+        if self._axis_reversed[mapped_axes[1]]:
+            raise NotImplementedError("Reduced lat-lon grid with second axis in decreasing order is not supported")
+        if self._axis_reversed[mapped_axes[0]]:
+            raise NotImplementedError("Reduced lat-lon grid with first axis in decreasing order is not supported")
 
     def first_axis_vals(self):
         resolution = 180 / (self._resolution - 1)
@@ -1508,4 +1515,4 @@ class ReducedLatLonMapper(DatacubeMapper):
 
 
 # md5 grid hash in form {resolution : hash}
-md5_hash = {}
+_md5_hash = {}

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/datacube/transformations/datacube_mappers/mapper_types/regular.py

@@ -4,19 +4,31 @@ from ..datacube_mappers import DatacubeMapper
 
 
 class RegularGridMapper(DatacubeMapper):
-    def __init__(self, base_axis, mapped_axes, resolution, local_area=[]):
+    def __init__(self, base_axis, mapped_axes, resolution, md5_hash=None, local_area=[], axis_reversed=None):
         # TODO: if local area is not empty list, raise NotImplemented
         self._mapped_axes = mapped_axes
         self._base_axis = base_axis
         self._resolution = resolution
         self.deg_increment = 90 / self._resolution
-        self._axis_reversed = {mapped_axes[0]: True, mapped_axes[1]: False}
+        if axis_reversed is None:
+            self._axis_reversed = {mapped_axes[0]: True, mapped_axes[1]: False}
+        else:
+            assert set(axis_reversed.keys()) == set(mapped_axes)
+            self._axis_reversed = axis_reversed
         self._first_axis_vals = self.first_axis_vals()
         self.compressed_grid_axes = [self._mapped_axes[1]]
-        self.md5_hash = md5_hash.get(resolution, None)
+        if md5_hash is not None:
+            self.md5_hash = md5_hash
+        else:
+            self.md5_hash = _md5_hash.get(resolution, None)
+        if self._axis_reversed[mapped_axes[1]]:
+            raise NotImplementedError("Regular grid with second axis in decreasing order is not supported")
 
     def first_axis_vals(self):
-        first_ax_vals = [90 - i * self.deg_increment for i in range(2 * self._resolution)]
+        if self._axis_reversed[self._mapped_axes[0]]:
+            first_ax_vals = [90 - i * self.deg_increment for i in range(2 * self._resolution)]
+        else:
+            first_ax_vals = [-90 + i * self.deg_increment for i in range(2 * self._resolution)]
         return first_ax_vals
 
     def map_first_axis(self, lower, upper):
@@ -60,4 +72,4 @@ class RegularGridMapper(DatacubeMapper):
 
 
 # md5 grid hash in form {resolution : hash}
-md5_hash = {}
+_md5_hash = {}

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/datacube/transformations/datacube_transformations.py

@@ -12,9 +12,8 @@ class DatacubeAxisTransformation(ABC):
         transformation_type = _type_to_datacube_transformation_lookup[transformation_type_key]
         transformation_file_name = _type_to_transformation_file_lookup[transformation_type_key]
         file_name = ".datacube_" + transformation_file_name
-        module = import_module("polytope.datacube.transformations" + file_name + file_name)
+        module = import_module("polytope_feature.datacube.transformations" + file_name + file_name)
         constructor = getattr(module, transformation_type)
-        # transformation_type_option = transformation_options[transformation_type_key]
         transformation_type_option = transformation_options
         new_transformation = deepcopy(constructor(name, transformation_type_option))
 

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/datacube/transformations/datacube_type_change/datacube_type_change.py

@@ -15,7 +15,7 @@ class DatacubeAxisTypeChange(DatacubeAxisTransformation):
 
     def generate_final_transformation(self):
         map_type = _type_to_datacube_type_change_lookup[self.new_type]
-        module = import_module("polytope.datacube.transformations.datacube_type_change.datacube_type_change")
+        module = import_module("polytope_feature.datacube.transformations.datacube_type_change.datacube_type_change")
         constructor = getattr(module, map_type)
         transformation = deepcopy(constructor(self.name, self.new_type))
         return transformation

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/engine/hullslicer.py

@@ -201,7 +201,6 @@ class HullSlicer(Engine):
         for p in polytopes:
             if p.is_in_union:
                 for axis in p.axes():
-                    # if axis in self.compressed_axes:
                     if axis == self.compressed_axes[-1]:
                         self.compressed_axes.remove(axis)
 

{polytope-python-1.0.7/polytope → polytope-python-1.0.9/polytope_feature}/options.py

@@ -21,7 +21,9 @@ class MapperConfig(TransformationConfig):
     type: str = ""
     resolution: Union[int, List[int]] = 0
     axes: List[str] = [""]
+    md5_hash: Optional[str] = None
     local: Optional[List[float]] = None
+    axis_reversed: Optional[Dict[str, bool]] = None
 
 
 class ReverseConfig(TransformationConfig):

polytope-python-1.0.9/polytope_feature/version.py

@@ -0,0 +1 @@
+__version__ = "1.0.9"

{polytope-python-1.0.7 → polytope-python-1.0.9/polytope_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: polytope-python
-Version: 1.0.7
+Version: 1.0.9
 Summary: Polytope datacube feature extraction library
 Home-page: https://github.com/ecmwf/polytope
 Author: ECMWF

polytope-python-1.0.9/polytope_python.egg-info/SOURCES.txt

@@ -0,0 +1,54 @@
+LICENSE
+MANIFEST.in
+pyproject.toml
+requirements.txt
+setup.py
+polytope_feature/__init__.py
+polytope_feature/options.py
+polytope_feature/polytope.py
+polytope_feature/shapes.py
+polytope_feature/version.py
+polytope_feature/datacube/__init__.py
+polytope_feature/datacube/datacube_axis.py
+polytope_feature/datacube/index_tree_pb2.py
+polytope_feature/datacube/tensor_index_tree.py
+polytope_feature/datacube/tree_encoding.py
+polytope_feature/datacube/backends/__init__.py
+polytope_feature/datacube/backends/datacube.py
+polytope_feature/datacube/backends/fdb.py
+polytope_feature/datacube/backends/mock.py
+polytope_feature/datacube/backends/xarray.py
+polytope_feature/datacube/transformations/__init__.py
+polytope_feature/datacube/transformations/datacube_transformations.py
+polytope_feature/datacube/transformations/datacube_cyclic/__init__.py
+polytope_feature/datacube/transformations/datacube_cyclic/datacube_cyclic.py
+polytope_feature/datacube/transformations/datacube_mappers/__init__.py
+polytope_feature/datacube/transformations/datacube_mappers/datacube_mappers.py
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/__init__.py
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/healpix.py
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/healpix_nested.py
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/local_regular.py
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/octahedral.py
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/reduced_ll.py
+polytope_feature/datacube/transformations/datacube_mappers/mapper_types/regular.py
+polytope_feature/datacube/transformations/datacube_merger/__init__.py
+polytope_feature/datacube/transformations/datacube_merger/datacube_merger.py
+polytope_feature/datacube/transformations/datacube_reverse/__init__.py
+polytope_feature/datacube/transformations/datacube_reverse/datacube_reverse.py
+polytope_feature/datacube/transformations/datacube_type_change/__init__.py
+polytope_feature/datacube/transformations/datacube_type_change/datacube_type_change.py
+polytope_feature/engine/__init__.py
+polytope_feature/engine/engine.py
+polytope_feature/engine/hullslicer.py
+polytope_feature/utility/__init__.py
+polytope_feature/utility/combinatorics.py
+polytope_feature/utility/exceptions.py
+polytope_feature/utility/geometry.py
+polytope_feature/utility/list_tools.py
+polytope_feature/utility/profiling.py
+polytope_python.egg-info/PKG-INFO
+polytope_python.egg-info/SOURCES.txt
+polytope_python.egg-info/dependency_links.txt
+polytope_python.egg-info/not-zip-safe
+polytope_python.egg-info/requires.txt
+polytope_python.egg-info/top_level.txt

polytope-python-1.0.9/polytope_python.egg-info/top_level.txt

@@ -0,0 +1 @@
+polytope_feature

{polytope-python-1.0.7 → polytope-python-1.0.9}/setup.py

@@ -5,7 +5,7 @@ from setuptools import find_packages, setup
 
 __version__ = re.search(
     r'__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
-    io.open("polytope/version.py", encoding="utf_8_sig").read(),
+    io.open("polytope_feature/version.py", encoding="utf_8_sig").read(),
 ).group(1)
 
 with open("requirements.txt") as f:

polytope-python-1.0.7/polytope/version.py

@@ -1 +0,0 @@
-__version__ = "1.0.7"

polytope-python-1.0.7/polytope_python.egg-info/SOURCES.txt

@@ -1,54 +0,0 @@
-LICENSE
-MANIFEST.in
-pyproject.toml
-requirements.txt
-setup.py
-polytope/__init__.py
-polytope/options.py
-polytope/polytope.py
-polytope/shapes.py
-polytope/version.py
-polytope/datacube/__init__.py
-polytope/datacube/datacube_axis.py
-polytope/datacube/index_tree_pb2.py
-polytope/datacube/tensor_index_tree.py
-polytope/datacube/tree_encoding.py
-polytope/datacube/backends/__init__.py
-polytope/datacube/backends/datacube.py
-polytope/datacube/backends/fdb.py
-polytope/datacube/backends/mock.py
-polytope/datacube/backends/xarray.py
-polytope/datacube/transformations/__init__.py
-polytope/datacube/transformations/datacube_transformations.py
-polytope/datacube/transformations/datacube_cyclic/__init__.py
-polytope/datacube/transformations/datacube_cyclic/datacube_cyclic.py
-polytope/datacube/transformations/datacube_mappers/__init__.py
-polytope/datacube/transformations/datacube_mappers/datacube_mappers.py
-polytope/datacube/transformations/datacube_mappers/mapper_types/__init__.py
-polytope/datacube/transformations/datacube_mappers/mapper_types/healpix.py
-polytope/datacube/transformations/datacube_mappers/mapper_types/healpix_nested.py
-polytope/datacube/transformations/datacube_mappers/mapper_types/local_regular.py
-polytope/datacube/transformations/datacube_mappers/mapper_types/octahedral.py
-polytope/datacube/transformations/datacube_mappers/mapper_types/reduced_ll.py
-polytope/datacube/transformations/datacube_mappers/mapper_types/regular.py
-polytope/datacube/transformations/datacube_merger/__init__.py
-polytope/datacube/transformations/datacube_merger/datacube_merger.py
-polytope/datacube/transformations/datacube_reverse/__init__.py
-polytope/datacube/transformations/datacube_reverse/datacube_reverse.py
-polytope/datacube/transformations/datacube_type_change/__init__.py
-polytope/datacube/transformations/datacube_type_change/datacube_type_change.py
-polytope/engine/__init__.py
-polytope/engine/engine.py
-polytope/engine/hullslicer.py
-polytope/utility/__init__.py
-polytope/utility/combinatorics.py
-polytope/utility/exceptions.py
-polytope/utility/geometry.py
-polytope/utility/list_tools.py
-polytope/utility/profiling.py
-polytope_python.egg-info/PKG-INFO
-polytope_python.egg-info/SOURCES.txt
-polytope_python.egg-info/dependency_links.txt
-polytope_python.egg-info/not-zip-safe
-polytope_python.egg-info/requires.txt
-polytope_python.egg-info/top_level.txt

polytope-python-1.0.7/polytope_python.egg-info/top_level.txt

@@ -1 +0,0 @@
-polytope