PVNet 3.0.20__tar.gz → 3.0.22__tar.gz

{PVNet-3.0.20 → PVNet-3.0.22}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 3.0.20
+Version: 3.0.22
 Summary: PVNet
 Author: Peter Dudfield
 Author-email: info@openclimatefix.org
 License: MIT
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf_datapipes>=3.1.5
+Requires-Dist: ocf_datapipes>=3.3.6
 Requires-Dist: ocf_ml_metrics>=0.0.11
 Requires-Dist: numpy
 Requires-Dist: pandas

{PVNet-3.0.20 → PVNet-3.0.22}/PVNet.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 3.0.20
+Version: 3.0.22
 Summary: PVNet
 Author: Peter Dudfield
 Author-email: info@openclimatefix.org
 License: MIT
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf_datapipes>=3.1.5
+Requires-Dist: ocf_datapipes>=3.3.6
 Requires-Dist: ocf_ml_metrics>=0.0.11
 Requires-Dist: numpy
 Requires-Dist: pandas

{PVNet-3.0.20 → PVNet-3.0.22}/PVNet.egg-info/requires.txt

@@ -1,4 +1,4 @@
-ocf_datapipes>=3.1.5
+ocf_datapipes>=3.3.6
 ocf_ml_metrics>=0.0.11
 numpy
 pandas

PVNet-3.0.22/pvnet/__init__.py

@@ -0,0 +1,2 @@
+"""PVNet"""
+__version__ = "3.0.22"

{PVNet-3.0.20 → PVNet-3.0.22}/pvnet/data/datamodule.py

@@ -3,12 +3,11 @@
 import resource
 
 import torch
-from ocf_datapipes.batch import stack_np_examples_into_batch
+from ocf_datapipes.batch import batch_to_tensor, stack_np_examples_into_batch
 from ocf_datapipes.training.pvnet import pvnet_datapipe
 from torch.utils.data.datapipes.iter import FileLister
 
 from pvnet.data.base import BaseDataModule
-from pvnet.data.utils import batch_to_tensor
 
 rlimit = resource.getrlimit(resource.RLIMIT_NOFILE)
 resource.setrlimit(resource.RLIMIT_NOFILE, (2048, rlimit[1]))

{PVNet-3.0.20 → PVNet-3.0.22}/pvnet/data/pv_site_datamodule.py

@@ -1,11 +1,10 @@
 """ Data module for pytorch lightning """
 import glob
 
-from ocf_datapipes.batch import BatchKey, stack_np_examples_into_batch
+from ocf_datapipes.batch import BatchKey, batch_to_tensor, stack_np_examples_into_batch
 from ocf_datapipes.training.pvnet_site import pvnet_site_netcdf_datapipe
 
 from pvnet.data.base import BaseDataModule
-from pvnet.data.utils import batch_to_tensor
 
 
 class PVSiteDataModule(BaseDataModule):

PVNet-3.0.22/pvnet/data/utils.py

@@ -0,0 +1,19 @@
+"""Utils common between Wind and PV datamodules"""
+from ocf_datapipes.batch import BatchKey, unstack_np_batch_into_examples
+from torch.utils.data import IterDataPipe, functional_datapipe
+
+
+@functional_datapipe("split_batches")
+class BatchSplitter(IterDataPipe):
+    """Pipeline step to split batches of data and yield single examples"""
+
+    def __init__(self, source_datapipe: IterDataPipe, splitting_key: BatchKey = BatchKey.gsp):
+        """Pipeline step to split batches of data and yield single examples"""
+        self.source_datapipe = source_datapipe
+        self.splitting_key = splitting_key
+
+    def __iter__(self):
+        """Opens the NWP data"""
+        for batch in self.source_datapipe:
+            for example in unstack_np_batch_into_examples(batch):
+                yield example

{PVNet-3.0.20 → PVNet-3.0.22}/pvnet/data/wind_datamodule.py

@@ -1,11 +1,10 @@
 """ Data module for pytorch lightning """
 import glob
 
-from ocf_datapipes.batch import BatchKey, stack_np_examples_into_batch
+from ocf_datapipes.batch import BatchKey, batch_to_tensor, stack_np_examples_into_batch
 from ocf_datapipes.training.windnet import windnet_netcdf_datapipe
 
 from pvnet.data.base import BaseDataModule
-from pvnet.data.utils import batch_to_tensor
 
 
 class WindDataModule(BaseDataModule):

{PVNet-3.0.20 → PVNet-3.0.22}/requirements.txt

@@ -1,4 +1,4 @@
-ocf_datapipes>=3.1.5
+ocf_datapipes>=3.3.6
 ocf_ml_metrics>=0.0.11
 numpy
 pandas

PVNet-3.0.20/pvnet/__init__.py

@@ -1,2 +0,0 @@
-"""PVNet"""
-__version__ = "3.0.20"

PVNet-3.0.20/pvnet/data/utils.py

@@ -1,47 +0,0 @@
-"""Utils common between Wind and PV datamodules"""
-import numpy as np
-import torch
-from ocf_datapipes.batch import BatchKey, unstack_np_batch_into_examples
-from torch.utils.data import IterDataPipe, functional_datapipe
-
-
-def copy_batch_to_device(batch, device):
-    """Moves a dict-batch of tensors to new device."""
-    batch_copy = {}
-
-    for k, v in batch.items():
-        if isinstance(v, dict):
-            # Recursion to reach the nested NWP
-            batch_copy[k] = copy_batch_to_device(v, device)
-        elif isinstance(v, torch.Tensor):
-            batch_copy[k] = v.to(device)
-        else:
-            batch_copy[k] = v
-    return batch_copy
-
-
-def batch_to_tensor(batch):
-    """Moves numpy batch to a tensor"""
-    for k, v in batch.items():
-        if isinstance(v, dict):
-            # Recursion to reach the nested NWP
-            batch[k] = batch_to_tensor(v)
-        elif isinstance(v, np.ndarray) and np.issubdtype(v.dtype, np.number):
-            batch[k] = torch.as_tensor(v)
-    return batch
-
-
-@functional_datapipe("split_batches")
-class BatchSplitter(IterDataPipe):
-    """Pipeline step to split batches of data and yield single examples"""
-
-    def __init__(self, source_datapipe: IterDataPipe, splitting_key: BatchKey = BatchKey.gsp):
-        """Pipeline step to split batches of data and yield single examples"""
-        self.source_datapipe = source_datapipe
-        self.splitting_key = splitting_key
-
-    def __iter__(self):
-        """Opens the NWP data"""
-        for batch in self.source_datapipe:
-            for example in unstack_np_batch_into_examples(batch):
-                yield example