PVNet 4.0.1__tar.gz → 4.0.3__tar.gz

{pvnet-4.0.1 → pvnet-4.0.3}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.2
 Name: PVNet
-Version: 4.0.1
+Version: 4.0.3
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf_data_sampler==0.1.7
+Requires-Dist: ocf_data_sampler==0.1.11
 Requires-Dist: ocf_datapipes>=3.3.34
 Requires-Dist: ocf_ml_metrics>=0.0.11
 Requires-Dist: numpy
@@ -147,7 +147,7 @@ here: https://huggingface.co/datasets/openclimatefix/uk_pv
 
 Outside the PVNet repo, clone the ocf-data-sampler repo and exit the conda env created for PVNet: https://github.com/openclimatefix/ocf-data-sampler
 ```bash
-git clone --depth 1 https://github.com/openclimatefix/ocf-data-sampler.git
+git clone https://github.com/openclimatefix/ocf-data-sampler.git
 conda create -n ocf-data-sampler python=3.11
 ```
 
@@ -163,6 +163,8 @@ Then exit this environment, and enter back into the pvnet conda environment and
 pip install -e <PATH-TO-ocf-data-sampler-REPO>
 ```
 
+If you install the local version of `ocf-data-sampler` that is more recent than the version specified in PVNet, you might receive a warning. However, it should still function correctly.
+
 ## Generating pre-made batches of data for training/validation of PVNet
 
 PVNet contains a script for generating batches of data suitable for training the PVNet models. To run the script you will need to make some modifications to the datamodule configuration.

{pvnet-4.0.1 → pvnet-4.0.3}/PVNet.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.2
 Name: PVNet
-Version: 4.0.1
+Version: 4.0.3
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf_data_sampler==0.1.7
+Requires-Dist: ocf_data_sampler==0.1.11
 Requires-Dist: ocf_datapipes>=3.3.34
 Requires-Dist: ocf_ml_metrics>=0.0.11
 Requires-Dist: numpy
@@ -147,7 +147,7 @@ here: https://huggingface.co/datasets/openclimatefix/uk_pv
 
 Outside the PVNet repo, clone the ocf-data-sampler repo and exit the conda env created for PVNet: https://github.com/openclimatefix/ocf-data-sampler
 ```bash
-git clone --depth 1 https://github.com/openclimatefix/ocf-data-sampler.git
+git clone https://github.com/openclimatefix/ocf-data-sampler.git
 conda create -n ocf-data-sampler python=3.11
 ```
 
@@ -163,6 +163,8 @@ Then exit this environment, and enter back into the pvnet conda environment and
 pip install -e <PATH-TO-ocf-data-sampler-REPO>
 ```
 
+If you install the local version of `ocf-data-sampler` that is more recent than the version specified in PVNet, you might receive a warning. However, it should still function correctly.
+
 ## Generating pre-made batches of data for training/validation of PVNet
 
 PVNet contains a script for generating batches of data suitable for training the PVNet models. To run the script you will need to make some modifications to the datamodule configuration.

{pvnet-4.0.1 → pvnet-4.0.3}/PVNet.egg-info/requires.txt

@@ -1,4 +1,4 @@
-ocf_data_sampler==0.1.7
+ocf_data_sampler==0.1.11
 ocf_datapipes>=3.3.34
 ocf_ml_metrics>=0.0.11
 numpy

{pvnet-4.0.1 → pvnet-4.0.3}/README.md

@@ -98,7 +98,7 @@ here: https://huggingface.co/datasets/openclimatefix/uk_pv
 
 Outside the PVNet repo, clone the ocf-data-sampler repo and exit the conda env created for PVNet: https://github.com/openclimatefix/ocf-data-sampler
 ```bash
-git clone --depth 1 https://github.com/openclimatefix/ocf-data-sampler.git
+git clone https://github.com/openclimatefix/ocf-data-sampler.git
 conda create -n ocf-data-sampler python=3.11
 ```
 
@@ -114,6 +114,8 @@ Then exit this environment, and enter back into the pvnet conda environment and
 pip install -e <PATH-TO-ocf-data-sampler-REPO>
 ```
 
+If you install the local version of `ocf-data-sampler` that is more recent than the version specified in PVNet, you might receive a warning. However, it should still function correctly.
+
 ## Generating pre-made batches of data for training/validation of PVNet
 
 PVNet contains a script for generating batches of data suitable for training the PVNet models. To run the script you will need to make some modifications to the datamodule configuration.

pvnet-4.0.3/pvnet/__init__.py

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

{pvnet-4.0.1 → pvnet-4.0.3}/pvnet/models/base_model.py

@@ -18,7 +18,7 @@ from huggingface_hub import ModelCard, ModelCardData, PyTorchModelHubMixin
 from huggingface_hub.constants import CONFIG_NAME, PYTORCH_WEIGHTS_NAME
 from huggingface_hub.file_download import hf_hub_download
 from huggingface_hub.hf_api import HfApi
-from ocf_datapipes.batch import copy_batch_to_device
+from ocf_data_sampler.sample.base import copy_batch_to_device
 
 from pvnet.models.utils import (
     BatchAccumulator,

{pvnet-4.0.1 → pvnet-4.0.3}/pvnet/models/multimodal/multimodal_base.py

@@ -1,4 +1,6 @@
 """Base model class for multimodal model and unimodal teacher"""
+import copy
+
 from torchvision.transforms.functional import center_crop
 
 from pvnet.models.base_model import BaseModel
@@ -8,26 +10,29 @@ class MultimodalBaseModel(BaseModel):
     """Base model class for multimodal model and unimodal teacher"""
 
     def _adapt_batch(self, batch):
-        """Slice batches into appropriate shapes for model
+        """Slice batches into appropriate shapes for model.
 
+        Returns a new batch dictionary with adapted data, leaving the original batch unchanged.
         We make some specific assumptions about the original batch and the derived sliced batch:
         - We are only limiting the future projections. I.e. we are never shrinking the batch from
           the left hand side of the time axis, only slicing it from the right
         - We are only shrinking the spatial crop of the satellite and NWP data
 
         """
+        # Create a copy of the batch to avoid modifying the original
+        new_batch = {key: copy.deepcopy(value) for key, value in batch.items()}
 
-        if "gsp" in batch.keys():
+        if "gsp" in new_batch.keys():
             # Slice off the end of the GSP data
             gsp_len = self.forecast_len + self.history_len + 1
-            batch["gsp"] = batch["gsp"][:, :gsp_len]
-            batch["gsp_time_utc"] = batch["gsp_time_utc"][:, :gsp_len]
+            new_batch["gsp"] = new_batch["gsp"][:, :gsp_len]
+            new_batch["gsp_time_utc"] = new_batch["gsp_time_utc"][:, :gsp_len]
 
         if self.include_sat:
             # Slice off the end of the satellite data and spatially crop
             # Shape: batch_size, seq_length, channel, height, width
-            batch["satellite_actual"] = center_crop(
-                batch["satellite_actual"][:, : self.sat_sequence_len],
+            new_batch["satellite_actual"] = center_crop(
+                new_batch["satellite_actual"][:, : self.sat_sequence_len],
                 output_size=self.sat_encoder.image_size_pixels,
             )
 
@@ -35,8 +40,8 @@ class MultimodalBaseModel(BaseModel):
             # Slice off the end of the NWP data and spatially crop
             for nwp_source in self.nwp_encoders_dict:
                 # shape: batch_size, seq_len, n_chans, height, width
-                batch["nwp"][nwp_source]["nwp"] = center_crop(
-                    batch["nwp"][nwp_source]["nwp"],
+                new_batch["nwp"][nwp_source]["nwp"] = center_crop(
+                    new_batch["nwp"][nwp_source]["nwp"],
                     output_size=self.nwp_encoders_dict[nwp_source].image_size_pixels,
                 )[:, : self.nwp_encoders_dict[nwp_source].sequence_length]
 
@@ -44,8 +49,8 @@ class MultimodalBaseModel(BaseModel):
             # Slice off the end of the solar coords data
             for s in ["solar_azimuth", "solar_elevation"]:
                 key = f"{self._target_key}_{s}"
-                if key in batch.keys():
+                if key in new_batch.keys():
                     sun_len = self.forecast_len + self.history_len + 1
-                    batch[key] = batch[key][:, :sun_len]
+                    new_batch[key] = new_batch[key][:, :sun_len]
 
-        return batch
+        return new_batch

{pvnet-4.0.1 → pvnet-4.0.3}/pyproject.toml

@@ -6,7 +6,7 @@ dynamic = ["version", "readme"]
 license={file="LICENCE"}
 
 dependencies = [
-    "ocf_data_sampler==0.1.7",
+    "ocf_data_sampler==0.1.11",
     "ocf_datapipes>=3.3.34",
     "ocf_ml_metrics>=0.0.11",
     "numpy",

pvnet-4.0.1/pvnet/__init__.py

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