wolfhece 2.1.129__py3-none-any.whl → 2.2.2__py3-none-any.whl

wolfhece/wolf_array.py

@@ -10,13 +10,15 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 
 import os
 import sys
+
+import numpy as np
+import numpy.ma as ma
+
 from typing import Union, Literal
 from matplotlib.axis import Axis
 from matplotlib.figure import Figure
 import matplotlib.pyplot as plt
 from matplotlib.colors import Colormap
-import numpy as np
-import numpy.ma as ma
 import math as m
 import logging
 import json
@@ -40,7 +42,6 @@ import re
 import wx
 from scipy.interpolate import interp2d, griddata
 from scipy.ndimage import laplace, label, sum_labels
-import pygltflib
 from shapely.geometry import Point, LineString, MultiLineString, Polygon, MultiPolygon, MultiPoint
 from shapely.ops import linemerge, substring, polygonize_full
 from shapely import contains, contains_properly, contains_xy, touches, prepare, destroy_prepared, is_prepared
@@ -56,12 +57,6 @@ except ImportError as e:
     print(e)
     raise Exception(_('Error importing modules'))
 
-try:
-    from osgeo import gdal
-except ImportError as e:
-    print(e)
-    raise Exception(_('Error importing GDAL library'))
-
 try:
     from .Coordinates_operations import reproject_and_resample_raster
 except ImportError as e:
@@ -132,6 +127,13 @@ VERSION_RGB = 3
 
 from numba import jit
 
+try:
+    from osgeo import gdal, osr
+    gdal.UseExceptions()
+except ImportError as e:
+    print(e)
+    raise Exception(_('Error importing GDAL library'))
+
 @jit(nopython=True)
 def custom_gradient(array: np.ndarray):
     """ Calculate the gradient manually """
@@ -878,7 +880,7 @@ class header_wolf():
         locpath = Path(filename)
 
         if filename.endswith('.tif') or filename.endswith('.tiff') :
-            from osgeo import gdal
+            # from osgeo import gdal
 
             raster:gdal.Dataset
             raster = gdal.Open(filename)
@@ -932,7 +934,7 @@ class header_wolf():
 
         elif filename.endswith('.vrt'):
             # Virtual raster
-            from osgeo import gdal
+            # from osgeo import gdal
 
             raster:gdal.Dataset
             raster = gdal.Open(filename)
@@ -6058,7 +6060,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         Statistics on Selected data or the whole array if no selection
 
         :param inside_polygon: vector or Polygon to select data inside the polygon
-        :return: mean, std, median, sum, values
+        :return: mean, std, median, sum, volume (sum*dx*dy), values
         """
 
         if inside_polygon is not None:
@@ -6074,8 +6076,9 @@ class WolfArray(Element_To_Draw, header_wolf):
         std = np.std(vals)
         median = np.median(vals)
         sum = np.sum(vals)
+        vol = sum * self.dx * self.dy
 
-        return {_('Mean'): mean, _('Std'): std, _('Median'): median, _('Sum'): sum, _('Values'): vals}
+        return {_('Mean'): mean, _('Std'): std, _('Median'): median, _('Sum'): sum, _('Volume'): vol, _('Values'): vals}
 
     def export_geotif(self, outdir:str= '', extent:str= '', EPSG:int = 31370):
         """
@@ -6098,7 +6101,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         :param extent: suffix to add to the filename before the extension '.tif' (only if outdir is provided)
         :param EPSG: EPSG code, by default 31370 (Lambert 72)
         """
-        from osgeo import gdal, osr, gdalconst
+        # from osgeo import gdal, osr, gdalconst
 
         outdir = str(outdir)
         extent = str(extent)
@@ -6377,7 +6380,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         :param which: band to import
         :param crop: crop the data - [xmin, xmax, ymin, ymax]
         """
-        from osgeo import gdal, osr, gdalconst
+        # from osgeo import gdal, osr, gdalconst
 
         if fn !='':
             pass
@@ -7830,9 +7833,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array + other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array + other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(self.array + other.array, self.array.mask)
+            newArray.array = np.ma.masked_array(self.array + other.array, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7859,9 +7862,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array * other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array * other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(self.array * other.array, self.array.mask)
+            newArray.array = np.ma.masked_array(self.array * other.array, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7888,9 +7891,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array - other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array - other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(self.array - other.array, self.array.mask)
+            newArray.array = np.ma.masked_array(self.array - other.array, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7915,7 +7918,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             newArray.origz = self.origz
             newArray.translz = self.translz
 
-        newArray.array = np.ma.masked_array(self.array ** other, self.array.mask)
+        newArray.array = np.ma.masked_array(self.array ** other, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7942,9 +7945,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array / other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array / other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(np.where(other == 0., 0., self.array / other.array), self.array.mask)
+            newArray.array = np.ma.masked_array(np.where(other == 0., 0., self.array / other.array), self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')

wolfhece/wolfresults_2D.py

@@ -45,31 +45,32 @@ from .mesh2d.wolf2dprev import prev_parameters_simul, blocks_file
 from .GraphNotebook import PlotPanel
 from .CpGrid import CpGrid
 from .matplotlib_fig import  Matplotlib_Figure
+from .tools2d_dll import Tools2DFortran
 
 
-try:
-    from .libs import wolfpy
-except Exception as ex:
-    # This convoluted error handling is here to catch an issue
-    # which was difficult to track down: wolfpy was there
-    # but its DLL were not available.
+# try:
+#     from .libs import wolfpy
+# except Exception as ex:
+#     # This convoluted error handling is here to catch an issue
+#     # which was difficult to track down: wolfpy was there
+#     # but its DLL were not available.
 
-    from importlib.util import find_spec
-    s = find_spec('wolfhece.libs.wolfpy')
+#     from importlib.util import find_spec
+#     s = find_spec('wolfhece.libs.wolfpy')
 
-    # Not too sure about this find_spec. If the root
-    # directory is not the good one, the import search may
-    # end up in the site packages, loading the wrong wolfpy.
+#     # Not too sure about this find_spec. If the root
+#     # directory is not the good one, the import search may
+#     # end up in the site packages, loading the wrong wolfpy.
 
-    base = Path(__file__).parent.parts
-    package = Path(s.origin).parent.parts
-    is_submodule = (len(base) <= len(package)) and all(i==j for i, j in zip(base, package))
+#     base = Path(__file__).parent.parts
+#     package = Path(s.origin).parent.parts
+#     is_submodule = (len(base) <= len(package)) and all(i==j for i, j in zip(base, package))
 
-    if is_submodule:
-        msg = _("wolfpy was found but we were not able to load it. It may be an issue with its DLL dependencies")
-        msg += _("The actual error was: {}").format(str(ex))
+#     if is_submodule:
+#         msg = _("wolfpy was found but we were not able to load it. It may be an issue with its DLL dependencies")
+#         msg += _("The actual error was: {}").format(str(ex))
 
-    raise Exception(msg)
+#     raise Exception(msg)
 
 from .wolf_array import WolfArray, getkeyblock, header_wolf, WolfArrayMB, WolfArrayMNAP, header_wolf, SelectionData, SelectionDataMB, VERSION_RGB
 from .mesh2d import wolf2dprev
@@ -130,6 +131,12 @@ def u_splitting(q_left, q_right, h_left, h_right):
         else:
             return (q_left/h_left + q_right/h_right) / 2.
 
+def _process_danger_map_chunk(chunk):
+    import pickle
+    obj, start, end, every = chunk
+    # Create a new instance of the class for each chunk
+    new:Wolfresults_2D = pickle.loads(pickle.dumps(obj))
+    return new.danger_map(start, end, every)
 
 class Props_Res_2D(wx.Frame):
     """
@@ -2213,6 +2220,7 @@ class Wolfresults_2D(Element_To_Draw):
                     self.filename = fname
 
                 self.filenamegen=self.filename
+                self._dll_tools = Tools2DFortran(self.filenamegen) # DLL de calculs de la classe Tools2DFortran
 
                 if exists(self.filename + '.trl'):
                     with open(self.filename + '.trl') as f:
@@ -2224,14 +2232,16 @@ class Wolfresults_2D(Element_To_Draw):
                 self.read_param_simul()
 
                 if exists(self.filename+'.head') or exists(join(dirname(self.filename),'bloc1.head')):
-                    wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
-                    nb_blocks = wolfpy.r2d_nbblocks()
+                    # wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
+                    # nb_blocks = wolfpy.r2d_nbblocks()
 
+                    nb_blocks = self._dll_tools.r2D_get_number_of_blocks()
                     for i in range(nb_blocks):
                         curblock = OneWolfResult(i, parent=self)
                         self.myblocks[getkeyblock(i)] = curblock
 
-                        nbx,nby,dx,dy,ox,oy,tx,ty = wolfpy.r2d_hblock(i+1)
+                        # nbx,nby,dx,dy,ox,oy,tx,ty = wolfpy.r2d_hblock(i+1)
+                        nbx, nby,dx,dy,ox,oy,tx,ty = self._dll_tools.r2D_get_header_one_block(i+1)
 
                         curhead = self.head_blocks[getkeyblock(i)]=header_wolf()
                         curhead.nbx = nbx
@@ -2745,8 +2755,10 @@ class Wolfresults_2D(Element_To_Draw):
         if nb == 0:
             self.times, self.timesteps = [],[]
         else:
-            wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
-            self.times, self.timesteps = wolfpy.get_times_steps(nb)
+            # wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
+            # self.times, self.timesteps = wolfpy.get_times_steps(nb)
+
+            self.times, self.timesteps = self._dll_tools.r2D_get_times_steps()
 
         return self.times, self.timesteps
 
@@ -2996,8 +3008,10 @@ class Wolfresults_2D(Element_To_Draw):
         """Récupération du nombre de pas sauvegardés --> utilisation de la librairie Fortran"""
 
         if exists(self.filename+'.head'):
-            wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
-            nb = wolfpy.r2d_getnbresults()
+            # wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
+            # nb = wolfpy.r2d_getnbresults()
+
+            nb = self._dll_tools.r2D_get_number_of_results()
             self._nb_results = nb
 
             if force_update_timessteps:
@@ -3021,8 +3035,12 @@ class Wolfresults_2D(Element_To_Draw):
             nby = block.waterdepth.nby
 
             # Fortran is 1-based --> which_step+1
-            block.waterdepth.array, block.qx.array, block.qy.array = wolfpy.r2d_getresults(which_step+1, nbx, nby, whichblock)
-            block.k.array, block.eps.array = wolfpy.r2d_getturbresults(which_step+1, nbx, nby, whichblock)
+            # block.waterdepth.array, block.qx.array, block.qy.array = wolfpy.r2d_getresults(which_step+1, nbx, nby, whichblock)
+            # block.k.array, block.eps.array = wolfpy.r2d_getturbresults(which_step+1, nbx, nby, whichblock)
+
+            block.waterdepth.array, block.qx.array, block.qy.array = self._dll_tools.r2D_get_one_result(which_step+1, whichblock)
+            block.k.array, block.eps.array = self._dll_tools.r2D_get_one_turbulent_result(which_step+1, whichblock)
+
             block._force_update_shields = True
 
     def _read_oneblockresult_withoutmask_only_h(self, which_step:int=-1,whichblock:int=-1):
@@ -3040,7 +3058,9 @@ class Wolfresults_2D(Element_To_Draw):
             nby = block.waterdepth.nby
 
             # Fortran is 1-based --> which_step+1
-            block.waterdepth.array, block.qx.array, block.qy.array = wolfpy.r2d_getresults(which_step+1, nbx, nby, whichblock)
+            # block.waterdepth.array, block.qx.array, block.qy.array = wolfpy.r2d_getresults(which_step+1, nbx, nby, whichblock)
+
+            block.waterdepth.array, block.qx.array, block.qy.array = self._dll_tools.r2D_get_one_result(which_step+1, whichblock)
             block._force_update_shields = True
 
     def read_oneblockresult(self, which_step:int=-1, whichblock:int=-1):
@@ -3114,7 +3134,7 @@ class Wolfresults_2D(Element_To_Draw):
 
         if exists(self.filename+'.head'):
             logging.info(_('Reading from results - step :{}'.format(which+1)))
-            wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
+            # wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
             for i in range(self.nb_blocks):
                 self.read_oneblockresult(which, i+1)
         else:
@@ -3137,7 +3157,7 @@ class Wolfresults_2D(Element_To_Draw):
 
         if exists(self.filename+'.head'):
             logging.info(_('Reading from results - step :{}'.format(which+1)))
-            wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
+            # wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
             for i in range(self.nb_blocks):
                 self._read_oneblockresult_only_h(which, i+1)
         else:
@@ -3175,7 +3195,7 @@ class Wolfresults_2D(Element_To_Draw):
         if exists(self.filename+'.head'):
 
             logging.info(_('Reading result step :{}'.format(self.current_result)))
-            wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
+            # wolfpy.r2d_init(self.filename.ljust(255).encode('ansi'))
 
             for i in range(self.nb_blocks):
                 self.read_oneblockresult(self.current_result, i+1)
@@ -4989,7 +5009,11 @@ class Wolfresults_2D(Element_To_Draw):
             curdanger.reset()
             curdanger.mask_reset()
 
-        for time_step in tqdm(range(start, end, every)):
+        to_compute = np.arange(start, end, every)
+        #add the end
+        if end not in to_compute:
+            to_compute = np.append(to_compute, end)
+        for time_step in tqdm(to_compute):
 
             if callback is not None:
                 callback(time_step, "Step {} / {}".format(time_step+1, end))
@@ -5066,6 +5090,111 @@ class Wolfresults_2D(Element_To_Draw):
 
         return (danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom, danger_map_matrix_z, danger_map_matrix_head)
 
+    def __getstate__(self):
+        """Get the state of the object for pickling"""
+        state = self.__dict__.copy()
+        # Remove unpicklable attributes
+
+        topop = ['mapviewer', 'properties', 'mngselection', 'myops']
+
+        for cur_pop in topop:
+            if cur_pop in state:
+                state.pop(cur_pop)
+        return state
+
+    def __setstate__(self, state):
+        """Set the state of the object after unpickling"""
+        # Restore the state of the object
+        self.__dict__.update(state)
+        # Reinitialize any attributes that were removed during pickling
+        self.mapviewer = None
+        self.properties = None
+        self.mngselection = None
+        self.myops = None
+
+    def danger_map_multiprocess(self, start:int=0, end:int=-1, every:int=1, callback=None, nb_processors:int = -1) -> Union[tuple[WolfArray, WolfArray, WolfArray, WolfArray], tuple[WolfArrayMB, WolfArrayMB, WolfArrayMB, WolfArrayMB]]:
+        """
+        Create Danger Maps using multiprocessing
+
+        :param start: start time step - 0-based
+        :param end: end time step - 0-based
+        :param every: step interval
+        :param callback: optional callback to update progress
+        """
+
+        from multiprocessing import Pool, cpu_count
+
+        if nb_processors == -1:
+            nb_processors = cpu_count()
+
+        if nb_processors > self.get_nbresults():
+            nb_processors = self.get_nbresults()
+
+        # Split the range of time steps into chunks for multiprocessing
+        if end == -1:
+            end = self.get_nbresults()
+
+        starts = [start + i * every for i in range(nb_processors)]
+        ends = [end - i * every for i in range(nb_processors-1,-1,-1)]
+
+        # pop all start above end
+        for i in range(nb_processors-1,0,-1):
+            if starts[i] >= end:
+                starts.pop(i)
+                ends.pop(i)
+
+        # set end above start
+        for i in range(len(starts)):
+            if starts[i] >= ends[i]:
+                ends[i] = starts[i] + every
+
+        chunks = [(self, start + i * every, end - (nb_processors - i) * every + 1, nb_processors) for i in range(min(nb_processors, len(starts)))]
+
+        # Create a pool of workers
+        with Pool(processes=nb_processors) as pool:
+            results = pool.map(_process_danger_map_chunk, chunks)
+
+        danger_map_matrix_h   = self.as_WolfArray(copyarray=True)
+        danger_map_matrix_v   = self.as_WolfArray(copyarray=True)
+        danger_map_matrix_mom = self.as_WolfArray(copyarray=True)
+        danger_map_matrix_z   = self.as_WolfArray(copyarray=True)
+        danger_map_matrix_head= self.as_WolfArray(copyarray=True)
+
+        danger = [danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom, danger_map_matrix_z, danger_map_matrix_head]
+
+        for curdanger in danger:
+            curdanger.nullvalue = 0.
+            curdanger.reset()
+            curdanger.mask_reset()
+
+        if self.nb_blocks>1:
+            for result in results:
+                for idx, curdanger in enumerate(danger):
+                    for i in range(self.nb_blocks):
+                        curdanger[i].array.data = np.maximum(curdanger[i].array.data, result[idx][i].array.data)
+                        curdanger[i].array.mask = np.logical_or(curdanger[i].array.mask, result[idx][i].array.mask)
+        else:
+            for result in results:
+                for idx, curdanger in enumerate(danger):
+                    curdanger.array.data[:,:] = np.maximum(curdanger.array.data, result[idx].array.data)
+                    curdanger.array.mask[:,:] = np.logical_or(curdanger.array.mask, result[idx].array.mask)
+
+        danger_map_matrix_h.mask_lower(self.epsilon)
+
+        if self.nb_blocks>1:
+            for i in range(self.nb_blocks):
+                danger_map_matrix_v[i].array.mask[:,:]   = danger_map_matrix_h[i].array.mask[:,:]
+                danger_map_matrix_mom[i].array.mask[:,:] = danger_map_matrix_h[i].array.mask[:,:]
+                danger_map_matrix_z[i].array.mask[:,:]   = danger_map_matrix_h[i].array.mask[:,:]
+                danger_map_matrix_head[i].array.mask[:,:] = danger_map_matrix_h[i].array.mask[:,:]
+        else:
+            danger_map_matrix_v.array.mask[:,:]   = danger_map_matrix_h.array.mask[:,:]
+            danger_map_matrix_mom.array.mask[:,:] = danger_map_matrix_h.array.mask[:,:]
+            danger_map_matrix_z.array.mask[:,:]   = danger_map_matrix_h.array.mask[:,:]
+            danger_map_matrix_head.array.mask[:,:] = danger_map_matrix_h.array.mask[:,:]
+
+        return (danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom, danger_map_matrix_z, danger_map_matrix_head)
+
     def danger_map_only_h(self, start:int=0, end:int=-1, every:int=1) -> WolfArray:
         """
         Create Danger Maps
@@ -5431,7 +5560,7 @@ class Wolfresults_2D(Element_To_Draw):
             curavg.mask_reset()
 
         for time_step in tqdm(range(start, end, every)):
-            
+
             if callback is not None:
                 callback(time_step, "Step {} / {}".format(time_step+1, end))
 

{wolfhece-2.1.129.dist-info → wolfhece-2.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.1.129
+Version: 2.2.2
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
@@ -19,9 +19,9 @@ Requires-Dist: colorlog==6.7.*
 Requires-Dist: intel-fortran-rt
 Requires-Dist: scikit-learn
 Requires-Dist: cryptography
-Requires-Dist: jax==0.4.30
+Requires-Dist: jax==0.5.3
 Requires-Dist: triangle
-Requires-Dist: numpy==1.23.*
+Requires-Dist: numpy==2.1.*
 Requires-Dist: pyopengl==3.1.*
 Requires-Dist: pandas
 Requires-Dist: geopandas
@@ -35,11 +35,10 @@ Requires-Dist: graphviz
 Requires-Dist: owslib
 Requires-Dist: beautifulsoup4
 Requires-Dist: requests
-Requires-Dist: notebook
-Requires-Dist: matplotlib
+Requires-Dist: matplotlib==3.10.*
 Requires-Dist: mkl
 Requires-Dist: python-gettext
-Requires-Dist: shapely==2.0.7
+Requires-Dist: shapely==2.1.*
 Requires-Dist: openpyxl
 Requires-Dist: xlrd
 Requires-Dist: openkmi
@@ -52,13 +51,13 @@ Requires-Dist: python-docx
 Requires-Dist: pygltflib
 Requires-Dist: ezdxf
 Requires-Dist: pyvista
-Requires-Dist: tqdm==4.64.*
+Requires-Dist: tqdm==4.67.*
 Requires-Dist: tifffile
-Requires-Dist: numba==0.58.*
+Requires-Dist: numba==0.61.*
 Requires-Dist: xmltodict
 Requires-Dist: opencv-python
 Requires-Dist: xarray
-Requires-Dist: rasterio==1.3.11
+Requires-Dist: rasterio==1.4.3
 Requires-Dist: h5py
 Requires-Dist: exif
 Requires-Dist: pyglm
@@ -75,9 +74,15 @@ Ce paquet contient l'interface graphique Python du logiciel WOLF (HECE - ULiège
 
 Les codes de calcul ne sont pas contenus dans ce paquet.
 
+Version 2.1.x compatible Numpy 1.23.5
+Version 2.2.x compatible Numpy 2.1.3
+
 --
 
 
 This package contains the Python graphical interface of the WOLF software (HECE - ULiège), as well as several topographic, hydraulic, and hydrological processing tools.
 
 The numerical codes are not included in this package.
+
+Version 2.1.x compatible Numpy 1.23.5
+Version 2.2.x compatible Numpy 2.1.3