PVNet 5.0.14__py3-none-any.whl → 5.0.15__py3-none-any.whl

pvnet/models/base_model.py

@@ -1,5 +1,4 @@
 """Base model for all PVNet submodels"""
-import copy
 import logging
 import os
 import shutil
@@ -12,9 +11,7 @@ import torch
 import yaml
 from huggingface_hub import ModelCard, ModelCardData, snapshot_download
 from huggingface_hub.hf_api import HfApi
-from ocf_data_sampler.numpy_sample.common_types import TensorBatch
 from safetensors.torch import load_file, save_file
-from torchvision.transforms.functional import center_crop
 
 from pvnet.utils import (
     DATA_CONFIG_NAME,
@@ -437,69 +434,6 @@ class BaseModel(torch.nn.Module, HuggingfaceMixin):
         else:
             self.num_output_features = self.forecast_len
 
-    def _adapt_batch(self, batch: TensorBatch) -> TensorBatch:
-        """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 new_batch.keys():
-            # Slice off the end of the GSP data
-            gsp_len = self.forecast_len + self.history_len + 1
-            new_batch["gsp"] = new_batch["gsp"][:, :gsp_len]
-            new_batch["gsp_time_utc"] = new_batch["gsp_time_utc"][:, :gsp_len]
-
-        if "site" in new_batch.keys():
-            # Slice off the end of the site data
-            site_len = self.forecast_len + self.history_len + 1
-            new_batch["site"] = new_batch["site"][:, :site_len]
-
-            # Slice all site related datetime coordinates and features
-            site_time_keys = [
-                "site_time_utc",
-                "site_date_sin",
-                "site_date_cos",
-                "site_time_sin",
-                "site_time_cos",
-            ]
-
-            for key in site_time_keys:
-                if key in new_batch.keys():
-                    new_batch[key] = new_batch[key][:, :site_len]
-
-        if self.include_sat:
-            # Slice off the end of the satellite data and spatially crop
-            # Shape: batch_size, seq_length, channel, height, width
-            new_batch["satellite_actual"] = center_crop(
-                new_batch["satellite_actual"][:, : self.sat_sequence_len],
-                output_size=self.sat_encoder.image_size_pixels,
-            )
-
-        if self.include_nwp:
-            # 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
-                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]
-
-        if self.include_sun:
-            sun_len = self.forecast_len + self.history_len + 1
-            # Slice off end of solar coords
-            for s in ["solar_azimuth", "solar_elevation"]:
-                if s in new_batch.keys():
-                    new_batch[s] = new_batch[s][:, :sun_len]
-
-        return new_batch
-
     def _quantiles_to_prediction(self, y_quantiles: torch.Tensor) -> torch.Tensor:
         """
         Convert network prediction into a point prediction.

pvnet/models/late_fusion/late_fusion.py

@@ -61,7 +61,6 @@ class LateFusionModel(BaseModel):
         nwp_interval_minutes: DictConfig | None = None,
         pv_interval_minutes: int = 5,
         sat_interval_minutes: int = 5,
-        adapt_batches: bool = False,
     ):
         """Neural network which combines information from different sources.
 
@@ -110,9 +109,6 @@ class LateFusionModel(BaseModel):
                 data for each source
             pv_interval_minutes: The interval between each sample of the PV data
             sat_interval_minutes: The interval between each sample of the satellite data
-            adapt_batches: If set to true, we attempt to slice the batches to the expected shape for
-                the model to use. This allows us to overprepare batches and slice from them for the
-                data we need for a model run.
         """
         super().__init__(
             history_minutes=history_minutes,
@@ -134,7 +130,6 @@ class LateFusionModel(BaseModel):
         self.add_image_embedding_channel = add_image_embedding_channel
         self.interval_minutes = interval_minutes
         self.min_sat_delay_minutes = min_sat_delay_minutes
-        self.adapt_batches = adapt_batches
 
         if self.location_id_mapping is None:
             logger.warning(
@@ -272,9 +267,6 @@ class LateFusionModel(BaseModel):
     def forward(self, x: TensorBatch) -> torch.Tensor:
         """Run model forward"""
 
-        if self.adapt_batches:
-            x = self._adapt_batch(x)
-
         if self.use_id_embedding:
             # eg: x['gsp_id'] = [1] with location_id_mapping = {1:0}, would give [0]
             id = torch.tensor(

pvnet/training/lightning_module.py

@@ -105,10 +105,6 @@ class PVNetLightningModule(pl.LightningModule):
         """Run training step"""
         y_hat = self.model(batch)
 
-        # Batch may be adapted in the model forward method, would need adapting here too
-        if self.model.adapt_batches:
-            batch = self.model._adapt_batch(batch)
-
         y = batch[self.model._target_key][:, -self.model.forecast_len :]
 
         losses = self._calculate_common_losses(y, y_hat)
@@ -212,10 +208,6 @@ class PVNetLightningModule(pl.LightningModule):
             with torch.no_grad():
                 y_hat = self.model(batch)
             
-            # Batch may be adapted in the model forward method, would need adapting here too
-            if self.model.adapt_batches:
-                batch = self.model._adapt_batch(batch)
-            
             fig = plot_sample_forecasts(
                 batch,
                 y_hat,
@@ -235,9 +227,6 @@ class PVNetLightningModule(pl.LightningModule):
         """Run validation step"""
 
         y_hat = self.model(batch)
-        # Batch may be adapted in the model forward method, would need adapting here too
-        if self.model.adapt_batches:
-            batch = self.model._adapt_batch(batch)
 
         # Internally store the val predictions
         self._store_val_predictions(batch, y_hat)

{pvnet-5.0.14.dist-info → pvnet-5.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 5.0.14
+Version: 5.0.15
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Requires-Python: >=3.11
@@ -14,7 +14,6 @@ Requires-Dist: xarray
 Requires-Dist: h5netcdf
 Requires-Dist: torch>=2.0.0
 Requires-Dist: lightning
-Requires-Dist: torchvision
 Requires-Dist: typer
 Requires-Dist: sqlalchemy
 Requires-Dist: fsspec[s3]

{pvnet-5.0.14.dist-info → pvnet-5.0.15.dist-info}/RECORD

@@ -7,11 +7,11 @@ pvnet/data/base_datamodule.py,sha256=Ibz0RoSr15HT6tMCs6ftXTpMa-NOKAmEd5ky55MqEK0
 pvnet/data/site_datamodule.py,sha256=-KGxirGCBXVwcCREsjFkF7JDfa6NICv8bBDV6EILF_Q,962
 pvnet/data/uk_regional_datamodule.py,sha256=KA2_7DYuSggmD5b-XiXshXq8xmu36BjtFmy_pS7e4QE,1017
 pvnet/models/__init__.py,sha256=owzZ9xkD0DRTT51mT2Dx_p96oJjwDz57xo_MaMIEosk,145
-pvnet/models/base_model.py,sha256=sdVWUuJivQYmfK0CF2wzv8Hm-C50lJ--zttMScRYirY,19203
+pvnet/models/base_model.py,sha256=4Sxal_8hq4F6irr2uG7GbtYZAjaOzUxmLBnO1U7fce0,16181
 pvnet/models/ensemble.py,sha256=1mFUEsl33kWcLL5d7zfDm9ypWxgAxBHgBiJLt0vwTeg,2363
 pvnet/models/late_fusion/__init__.py,sha256=Jf0B-E0_5IvSBFoj1wvnPtwYDxs4pRIFm5qHv--Bbps,26
 pvnet/models/late_fusion/basic_blocks.py,sha256=_cYGVyAIyEJS4wd-DEAXQXu0br66guZJn3ugoebWqZ0,1479
-pvnet/models/late_fusion/late_fusion.py,sha256=Lz4qrhIwVz7hrIR2sOzOoWAL2rKWWmUREIAtQs0zI8c,16131
+pvnet/models/late_fusion/late_fusion.py,sha256=VpP1aY646iO-JBlYkyoBlj0Z-gzsqaHnMgpNzjTqAIo,15735
 pvnet/models/late_fusion/encoders/__init__.py,sha256=bLBQdnCeLYhwISW0t88ZZBz-ebS94m7ZwBcsofWMHR4,51
 pvnet/models/late_fusion/encoders/basic_blocks.py,sha256=N8CZCQUwydmBip10AHY5hSkwrSP12B_Mrvm-5XVcz1s,3005
 pvnet/models/late_fusion/encoders/encoders3d.py,sha256=i8POpAsdNFwdnx64Hn7Zm9q9bby8qMPn7G7miwhsxGk,6645
@@ -22,11 +22,11 @@ pvnet/models/late_fusion/site_encoders/__init__.py,sha256=QoUiiWWFf12vEpdkw0gO4T
 pvnet/models/late_fusion/site_encoders/basic_blocks.py,sha256=iEB_N7ZL5HMQ1hZM6H32A71GCwP7YbErUx0oQF21PQM,1042
 pvnet/models/late_fusion/site_encoders/encoders.py,sha256=k4z690cfcP6J4pm2KtDujHN-W3uOl7QY0WvBIu1tM8c,11703
 pvnet/training/__init__.py,sha256=FKxmPZ59Vuj5_mXomN4saJ3En5M-aDMxSs6OttTQOcg,49
-pvnet/training/lightning_module.py,sha256=GVqdi5ALFo9-_WRYeyMMj2qH_k4gPxQ2sG6FhL_wRFE,13242
+pvnet/training/lightning_module.py,sha256=UvtpijxlRSDKrwH979FSQBeCLLMReYe-S-guWe1upl4,12685
 pvnet/training/plots.py,sha256=4xID7TBA4IazaARaCN5AoG5fFPJF1wIprn0y6I0C31c,2469
 pvnet/training/train.py,sha256=zj9JMi9C6W68vGsQUBapWkJ4aDzDuJFMv0IVjO73s1k,5215
-pvnet-5.0.14.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
-pvnet-5.0.14.dist-info/METADATA,sha256=FJMwH-1nLPAkE6zsgtdQeofXdWoJn3qzEpUU9ltWn_s,18044
-pvnet-5.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pvnet-5.0.14.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
-pvnet-5.0.14.dist-info/RECORD,,
+pvnet-5.0.15.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
+pvnet-5.0.15.dist-info/METADATA,sha256=uiHZcCcXv50Cl82sg_5XU1D0adASBW8C9DRH6pvamaA,18017
+pvnet-5.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pvnet-5.0.15.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
+pvnet-5.0.15.dist-info/RECORD,,