ocf-data-sampler 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

ocf_data_sampler/load/nwp/providers/gfs.py

@@ -31,6 +31,6 @@ def open_gfs(zarr_path: str | list[str]) -> xr.DataArray:
     check_time_unique_increasing(nwp.init_time_utc)
     nwp = make_spatial_coords_increasing(nwp, x_coord="longitude", y_coord="latitude")
 
-    nwp = nwp.transpose("init_time_utc", "step", "channel", "latitude", "longitude")
+    nwp = nwp.transpose("init_time_utc", "step", "channel", "longitude", "latitude")
 
     return nwp

ocf_data_sampler/load/nwp/providers/icon.py

@@ -41,6 +41,6 @@ def open_icon_eu(zarr_path: str) -> xr.Dataset:
     nwp = nwp.isel(step=slice(0, 78))
     nwp = remove_isobaric_lelvels_from_coords(nwp)
     nwp = nwp.to_array().rename({"variable": "channel"})
-    nwp = nwp.transpose("init_time_utc", "step", "channel", "latitude", "longitude")
+    nwp = nwp.transpose("init_time_utc", "step", "channel", "longitude", "latitude")
     nwp = make_spatial_coords_increasing(nwp, x_coord="longitude", y_coord="latitude")
     return nwp

ocf_data_sampler/load/utils.py

@@ -1,5 +1,6 @@
 """Utility functions for working with xarray objects."""
 
+import numpy as np
 import pandas as pd
 import xarray as xr
 
@@ -22,8 +23,12 @@ def make_spatial_coords_increasing(ds: xr.Dataset, x_coord: str, y_coord: str) -
     # Make sure the coords are in increasing order
     if ds[x_coord][0] > ds[x_coord][-1]:
         ds = ds.isel({x_coord: slice(None, None, -1)})
+        # Below we the coord values so we don't have numpy array with negative strides
+        # Numpy arrays with negative strides cannot be converted to torch Tensor
+        ds[x_coord] = np.ascontiguousarray(ds[x_coord].values)
     if ds[y_coord][0] > ds[y_coord][-1]:
         ds = ds.isel({y_coord: slice(None, None, -1)})
+        ds[y_coord] = np.ascontiguousarray(ds[y_coord].values)
 
     # Check the coords are all increasing now
     if not (ds[x_coord].diff(dim=x_coord) > 0).all():

{ocf_data_sampler-0.2.4.dist-info → ocf_data_sampler-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ocf-data-sampler
-Version: 0.2.4
+Version: 0.2.6
 Author: James Fulton, Peter Dudfield
 Author-email: Open Climate Fix team <info@openclimatefix.org>
 License: MIT License

{ocf_data_sampler-0.2.4.dist-info → ocf_data_sampler-0.2.6.dist-info}/RECORD

@@ -10,14 +10,14 @@ ocf_data_sampler/load/gsp.py,sha256=keB3Nv_CNK1P6pS9Kdfc8PoZXTI1_YFN-spsvEv_Ewc,
 ocf_data_sampler/load/load_dataset.py,sha256=0NyDxCDfgE_esKVW3s-rZEe16WB30FQ74ClWlrIo72M,1602
 ocf_data_sampler/load/satellite.py,sha256=E7Ln7Y60Qr1RTV-_R71YoxXQM-Ca7Y1faIo3oKB2eFk,2292
 ocf_data_sampler/load/site.py,sha256=zOzlWk6pYZBB5daqG8URGksmDXWKrkutUvN8uALAIh8,1468
-ocf_data_sampler/load/utils.py,sha256=Jwbr1rpEa3cefjw-OTVRaxnIHyGixYB3TlTlta0BOdU,1727
+ocf_data_sampler/load/utils.py,sha256=sZ0-zzconcLkVQwAkCYrqKDo98Hrh5ChdiQJv5Bh91g,2040
 ocf_data_sampler/load/nwp/__init__.py,sha256=SmcrnbygO5xtCKmGR4wtHrj-HI7nOAvnAtfuvRufBGQ,25
 ocf_data_sampler/load/nwp/nwp.py,sha256=OUK6thsKfEcqGUj4WoxDiyqGcVwwoujePdmQRis8H8I,1076
 ocf_data_sampler/load/nwp/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ocf_data_sampler/load/nwp/providers/cloudcasting.py,sha256=mGsEqo5nVGQhfIK1KC-ywLsaFKU18-UFKqQVtB8gpnw,1564
 ocf_data_sampler/load/nwp/providers/ecmwf.py,sha256=5AzktPJgertCx6oij6aePRosPuZHGFznMxTgtkk_mgc,994
-ocf_data_sampler/load/nwp/providers/gfs.py,sha256=JSDeh4YG1wibV8--P3X-zTO8LP0dsJcpFvIyglBbhi0,979
-ocf_data_sampler/load/nwp/providers/icon.py,sha256=yYUrs5HgjU0C5pMHBB6FGn3tLjswi990IY6QCXS1Zmw,1569
+ocf_data_sampler/load/nwp/providers/gfs.py,sha256=pPqVqZqC9eK1gKfRsvR_hB-eiQ1V9LeYB15DVJElUX0,979
+ocf_data_sampler/load/nwp/providers/icon.py,sha256=q2ZJIKYptXFvoHzb9y3iNKSJZ0PNtnH54h2gwYbgIJ8,1569
 ocf_data_sampler/load/nwp/providers/ukv.py,sha256=-0v8JCLH8ypz8GMXZ6Rrx-I0LoHuHO8sXFupbC1RpM0,1013
 ocf_data_sampler/load/nwp/providers/utils.py,sha256=cJZ9JA4W_ZeTcLQ5z71w46_DJaPcW_2JMmBdjP9r3qs,835
 ocf_data_sampler/numpy_sample/__init__.py,sha256=nY5C6CcuxiWZ_jrXRzWtN7WyKXhJImSiVTIG6Rz4B_4,401
@@ -52,7 +52,7 @@ ocf_data_sampler/torch_datasets/utils/merge_and_fill_utils.py,sha256=we7BTxRH7B7
 ocf_data_sampler/torch_datasets/utils/valid_time_periods.py,sha256=xcy75cVxl0WrglnX5YUAFjXXlO2GwEBHWyqo8TDuiOA,4714
 scripts/refactor_site.py,sha256=skzvsPP0Cn9yTKndzkilyNcGz4DZ88ctvCJ0XrBdc2A,3135
 utils/compute_icon_mean_stddev.py,sha256=a1oWMRMnny39rV-dvu8rcx85sb4bXzPFrR1gkUr4Jpg,2296
-ocf_data_sampler-0.2.4.dist-info/METADATA,sha256=FC4sEcGWlkOdXRxqoiln0f-aYqXa5c9bRt7nVeNVuBI,11594
-ocf_data_sampler-0.2.4.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-ocf_data_sampler-0.2.4.dist-info/top_level.txt,sha256=LEFU4Uk-PEo72QGLAfnVZIUEm37Q8mKuMeg_Xk-p33g,31
-ocf_data_sampler-0.2.4.dist-info/RECORD,,
+ocf_data_sampler-0.2.6.dist-info/METADATA,sha256=ukSZN_SjzikTkSkCNpRHFUcE-BO6EPxSUXnUxLZUBz4,11594
+ocf_data_sampler-0.2.6.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+ocf_data_sampler-0.2.6.dist-info/top_level.txt,sha256=LEFU4Uk-PEo72QGLAfnVZIUEm37Q8mKuMeg_Xk-p33g,31
+ocf_data_sampler-0.2.6.dist-info/RECORD,,