Merge pull request #332 from openclimatefix/numpy2

Update to numpy 2

Author: dfulu

ocf_datapipes/transform/numpy_batch/add_fourier_space_time.py

@@ -127,7 +127,7 @@ def compute_fourier_features(
     )
     fourier_features = np.full(
         shape=array.shape + (n_fourier_features,),
-        fill_value=np.NaN,
+        fill_value=np.nan,
         dtype=array.dtype,
     )
 

ocf_datapipes/transform/numpy_batch/add_topographic_data.py

@@ -75,7 +75,7 @@ def _get_surface_height_for_satellite(
     """
     num_examples = satellite.shape[0]
     surface_height = surface_height.rename("surface_height")
-    surface_height_for_batch = np.full_like(satellite.values, fill_value=np.NaN)
+    surface_height_for_batch = np.full_like(satellite.values, fill_value=np.nan)
     for example_idx in range(num_examples):
         satellite_example = satellite.isel(example=example_idx)
         msg = "Satellite imagery must start in the top-left!"

ocf_datapipes/transform/numpy_batch/sun_position.py

@@ -25,8 +25,8 @@ def _get_azimuth_and_elevation(lon, lat, dt, must_be_finite):
         if must_be_finite:
             raise ValueError(f"Non-finite (lon, lat) = ({lon}, {lat}")
         return (
-            np.full_like(dt, fill_value=np.NaN).astype(np.float32),
-            np.full_like(dt, fill_value=np.NaN).astype(np.float32),
+            np.full_like(dt, fill_value=np.nan).astype(np.float32),
+            np.full_like(dt, fill_value=np.nan).astype(np.float32),
         )
 
     else:
@@ -156,8 +156,8 @@ def __iter__(self):
                 assert lons.shape == (time_utc.shape[0],)
                 assert lats.shape == (time_utc.shape[0],)
 
-                azimuth = np.full_like(time_utc, fill_value=np.NaN).astype(np.float32)
-                elevation = np.full_like(time_utc, fill_value=np.NaN).astype(np.float32)
+                azimuth = np.full_like(time_utc, fill_value=np.nan).astype(np.float32)
+                elevation = np.full_like(time_utc, fill_value=np.nan).astype(np.float32)
 
                 # Loop round each example to get the Sun's elevation and azimuth
                 for example_idx, (lon, lat, dt) in enumerate(zip(lons, lats, times)):

ocf_datapipes/utils/utils.py

@@ -28,7 +28,7 @@ def datetime64_to_float(datetimes: np.ndarray, dtype=np.float64) -> np.ndarray:
     """
     nums = datetimes.astype("datetime64[s]").astype(dtype)
     mask = np.isfinite(datetimes)
-    return np.where(mask, nums, np.NaN)
+    return np.where(mask, nums, np.nan)
 
 
 def is_sorted(array: np.ndarray) -> bool:

requirements.txt

@@ -25,3 +25,4 @@ scipy
 pytorch_lightning
 pvlive-api
 pydantic
+cftime