PVNet 2.1.14__tar.gz → 2.1.16__tar.gz

{PVNet-2.1.14 → PVNet-2.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 2.1.14
+Version: 2.1.16
 Summary: PVNet
 Author: Peter Dudfield
 Author-email: info@openclimatefix.org

{PVNet-2.1.14 → PVNet-2.1.16}/PVNet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 2.1.14
+Version: 2.1.16
 Summary: PVNet
 Author: Peter Dudfield
 Author-email: info@openclimatefix.org

PVNet-2.1.16/PVNet.egg-info/SOURCES.txt

@@ -0,0 +1,43 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+requirements-dev.txt
+requirements.txt
+setup.py
+PVNet.egg-info/PKG-INFO
+PVNet.egg-info/SOURCES.txt
+PVNet.egg-info/dependency_links.txt
+PVNet.egg-info/requires.txt
+PVNet.egg-info/top_level.txt
+pvnet/__init__.py
+pvnet/app.py
+pvnet/callbacks.py
+pvnet/optimizers.py
+pvnet/training.py
+pvnet/utils.py
+pvnet/data/__init__.py
+pvnet/data/datamodule.py
+pvnet/models/__init__.py
+pvnet/models/base_model.py
+pvnet/models/utils.py
+pvnet/models/baseline/__init__.py
+pvnet/models/baseline/last_value.py
+pvnet/models/baseline/single_value.py
+pvnet/models/multimodal/__init__.py
+pvnet/models/multimodal/basic_blocks.py
+pvnet/models/multimodal/deep_supervision.py
+pvnet/models/multimodal/multimodal.py
+pvnet/models/multimodal/nwp_weighting.py
+pvnet/models/multimodal/weather_residual.py
+pvnet/models/multimodal/encoders/__init__.py
+pvnet/models/multimodal/encoders/basic_blocks.py
+pvnet/models/multimodal/encoders/encoders2d.py
+pvnet/models/multimodal/encoders/encoders3d.py
+pvnet/models/multimodal/encoders/encodersRNN.py
+pvnet/models/multimodal/linear_networks/__init__.py
+pvnet/models/multimodal/linear_networks/basic_blocks.py
+pvnet/models/multimodal/linear_networks/networks.py
+tests/__init__.py
+tests/conftest.py
+tests/test_app.py

PVNet-2.1.16/pvnet/__init__.py

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

{PVNet-2.1.14 → PVNet-2.1.16}/pvnet/app.py

@@ -62,7 +62,7 @@ batch_size = 10
 
 # Huggingfacehub model repo and commit
 model_name = "openclimatefix/pvnet_v2"
-model_version = "3d01665c89501da25e3acaaee6b669a15748708c"
+model_version = "898630f3f8cd4e8506525d813dd61c6d8de86144"
 
 model_name_ocf_db = "pvnet_v2"
 use_adjuster = os.getenv("USE_ADJUSTER", "True").lower() == "true"

PVNet-2.1.16/pvnet/data/__init__.py

@@ -0,0 +1 @@
+"""Data parts"""

PVNet-2.1.16/pvnet/data/datamodule.py

@@ -0,0 +1,194 @@
+""" Data module for pytorch lightning """
+from datetime import datetime
+
+import numpy as np
+import torch
+from lightning.pytorch import LightningDataModule
+from ocf_datapipes.training.pvnet import pvnet_datapipe
+from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.utils.utils import stack_np_examples_into_batch
+from torchdata.dataloader2 import DataLoader2, MultiProcessingReadingService
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import FileLister, IterDataPipe
+
+
+def copy_batch_to_device(batch, device):
+    """Moves a dict-batch of tensors to new device."""
+    batch_copy = {}
+    for k in list(batch.keys()):
+        if isinstance(batch[k], torch.Tensor):
+            batch_copy[k] = batch[k].to(device)
+        else:
+            batch_copy[k] = batch[k]
+    return batch_copy
+
+
+def batch_to_tensor(batch):
+    """Moves numpy batch to a tensor"""
+    for k in list(batch.keys()):
+        if isinstance(batch[k], np.ndarray) and np.issubdtype(batch[k].dtype, np.number):
+            batch[k] = torch.as_tensor(batch[k])
+    return batch
+
+
+def split_batches(batch):
+    """Splits a single batch of data."""
+    n_samples = batch[BatchKey.gsp].shape[0]
+    keys = list(batch.keys())
+    examples = [{} for _ in range(n_samples)]
+    for i in range(n_samples):
+        b = examples[i]
+        for k in keys:
+            if ("idx" in k.name) or ("channel_names" in k.name):
+                b[k] = batch[k]
+            else:
+                b[k] = batch[k][i]
+    return examples
+
+
+@functional_datapipe("split_batches")
+class BatchSplitter(IterDataPipe):
+    """Pipeline step to split batches of data and yield single examples"""
+
+    def __init__(self, source_datapipe: IterDataPipe):
+        """Pipeline step to split batches of data and yield single examples"""
+        self.source_datapipe = source_datapipe
+
+    def __iter__(self):
+        """Opens the NWP data"""
+        for batch in self.source_datapipe:
+            for example in split_batches(batch):
+                yield example
+
+
+class DataModule(LightningDataModule):
+    """Datamodule for training pvnet and using pvnet pipeline in `ocf_datapipes`."""
+
+    def __init__(
+        self,
+        configuration=None,
+        batch_size=16,
+        num_workers=0,
+        prefetch_factor=2,
+        train_period=[None, None],
+        val_period=[None, None],
+        test_period=[None, None],
+        block_nwp_and_sat=False,
+        batch_dir=None,
+    ):
+        """Datamodule for training pvnet and using pvnet pipeline in `ocf_datapipes`.
+
+        Can also be used with pre-made batches if `batch_dir` is set.
+
+
+        Args:
+            configuration: Path to datapipe configuration file.
+            batch_size: Batch size.
+            num_workers: Number of workers to use in multiprocess batch loading.
+            prefetch_factor: Number of data will be prefetched at the end of each worker process.
+            train_period: Date range filter for train dataloader.
+            val_period: Date range filter for val dataloader.
+            test_period: Date range filter for test dataloader.
+            block_nwp_and_sat: If True, the dataloader does not load the requested NWP and sat data.
+                It instead returns an zero-array of the required shape. Useful for pretraining.
+            batch_dir: Path to the directory of pre-saved batches. Cannot be used together with
+                `configuration` or 'train/val/test_period'.
+
+        """
+        super().__init__()
+        self.configuration = configuration
+        self.batch_size = batch_size
+        self.block_nwp_and_sat = block_nwp_and_sat
+        self.batch_dir = batch_dir
+
+        if not ((batch_dir is not None) ^ (configuration is not None)):
+            raise ValueError("Exactly one of `batch_dir` or `configuration` must be set.")
+
+        if batch_dir is not None:
+            if any([period != [None, None] for period in [train_period, val_period, test_period]]):
+                raise ValueError("Cannot set `(train/val/test)_period` with presaved batches")
+
+        self.train_period = [
+            None if d is None else datetime.strptime(d, "%Y-%m-%d") for d in train_period
+        ]
+        self.val_period = [
+            None if d is None else datetime.strptime(d, "%Y-%m-%d") for d in val_period
+        ]
+        self.test_period = [
+            None if d is None else datetime.strptime(d, "%Y-%m-%d") for d in test_period
+        ]
+
+        self.readingservice_config = dict(
+            num_workers=num_workers,
+            multiprocessing_context="spawn",
+            worker_prefetch_cnt=prefetch_factor,
+        )
+
+    def _get_datapipe(self, start_time, end_time):
+        data_pipeline = pvnet_datapipe(
+            self.configuration,
+            start_time=start_time,
+            end_time=end_time,
+            block_sat=self.block_nwp_and_sat,
+            block_nwp=self.block_nwp_and_sat,
+        )
+
+        data_pipeline = (
+            data_pipeline.batch(self.batch_size)
+            .map(stack_np_examples_into_batch)
+            .map(batch_to_tensor)
+        )
+        return data_pipeline
+
+    def _get_premade_batches_datapipe(self, subdir, shuffle=False):
+        data_pipeline = FileLister(f"{self.batch_dir}/{subdir}", masks="*.pt", recursive=False)
+        if shuffle:
+            data_pipeline = (
+                data_pipeline.shuffle(buffer_size=10_000)
+                .sharding_filter()
+                .map(torch.load)
+                # Split the batches and reshuffle them to be combined into new batches
+                .split_batches()
+                .shuffle(buffer_size=100 * self.batch_size)
+            )
+        else:
+            data_pipeline = (
+                data_pipeline.sharding_filter().map(torch.load)
+                # Split the batches so we can use any batch-size
+                .split_batches()
+            )
+
+        data_pipeline = (
+            data_pipeline.batch(self.batch_size)
+            .map(stack_np_examples_into_batch)
+            .map(batch_to_tensor)
+        )
+
+        return data_pipeline
+
+    def train_dataloader(self):
+        """Construct train dataloader"""
+        if self.batch_dir is not None:
+            datapipe = self._get_premade_batches_datapipe("train", shuffle=True)
+        else:
+            datapipe = self._get_datapipe(*self.train_period)
+        rs = MultiProcessingReadingService(**self.readingservice_config)
+        return DataLoader2(datapipe, reading_service=rs)
+
+    def val_dataloader(self):
+        """Construct val dataloader"""
+        if self.batch_dir is not None:
+            datapipe = self._get_premade_batches_datapipe("val")
+        else:
+            datapipe = self._get_datapipe(*self.val_period)
+        rs = MultiProcessingReadingService(**self.readingservice_config)
+        return DataLoader2(datapipe, reading_service=rs)
+
+    def test_dataloader(self):
+        """Construct test dataloader"""
+        if self.batch_dir is not None:
+            datapipe = self._get_premade_batches_datapipe("test")
+        else:
+            datapipe = self._get_datapipe(*self.test_period)
+        rs = MultiProcessingReadingService(**self.readingservice_config)
+        return DataLoader2(datapipe, reading_service=rs)

PVNet-2.1.16/pvnet/models/__init__.py

@@ -0,0 +1 @@
+"""Models for PVNet"""