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

pvnet/models/base_model.py

@@ -451,4 +451,4 @@ class BaseModel(torch.nn.Module, HuggingfaceMixin):
         """
         # y_quantiles Shape: batch_size, seq_length, num_quantiles
         idx = self.output_quantiles.index(0.5)
-        return y_quantiles[..., idx]
+        return y_quantiles[..., idx]

pvnet/models/late_fusion/encoders/basic_blocks.py

@@ -16,7 +16,6 @@ class AbstractNWPSatelliteEncoder(nn.Module, metaclass=ABCMeta):
         self,
         sequence_length: int,
         image_size_pixels: int,
-        in_channels: int,
         out_features: int,
     ):
         """Abstract class for NWP/satellite encoder.
@@ -31,6 +30,7 @@ class AbstractNWPSatelliteEncoder(nn.Module, metaclass=ABCMeta):
         self.out_features = out_features
         self.image_size_pixels = image_size_pixels
         self.sequence_length = sequence_length
+        self.in_channels = in_channels
 
     @abstractmethod
     def forward(self):

pvnet/models/late_fusion/encoders/encoders3d.py

@@ -41,7 +41,8 @@ class DefaultPVNet(AbstractNWPSatelliteEncoder):
             padding: The padding used in the conv3d layers. If an int, the same padding
                 is used in all dimensions
         """
-        super().__init__(sequence_length, image_size_pixels, in_channels, out_features)
+
+        super().__init__(sequence_length, image_size_pixels, out_features)
 
         if isinstance(padding, int):
             padding = (padding, padding, padding)
@@ -136,7 +137,7 @@ class ResConv3DNet(AbstractNWPSatelliteEncoder):
             batch_norm: Whether to include batch normalisation.
             dropout_frac: Probability of an element to be zeroed in the residual pathways.
         """
-        super().__init__(sequence_length, image_size_pixels, in_channels, out_features)
+        super().__init__(sequence_length, image_size_pixels, out_features)
 
         model = [
             nn.Conv3d(

pvnet/training/lightning_module.py

@@ -15,6 +15,7 @@ from pvnet.data.base_datamodule import collate_fn
 from pvnet.models.base_model import BaseModel
 from pvnet.optimizers import AbstractOptimizer
 from pvnet.training.plots import plot_sample_forecasts, wandb_line_plot
+from pvnet.utils import validate_batch_against_config
 
 
 class PVNetLightningModule(pl.LightningModule):
@@ -42,9 +43,6 @@ class PVNetLightningModule(pl.LightningModule):
         # This setting is only used when lr is tuned with callback
         self.lr = None
 
-        # Set up store for all all validation results so we can log these
-        self.save_all_validation_results = save_all_validation_results
-
     def transfer_batch_to_device(
         self, 
         batch: TensorBatch, 
@@ -189,7 +187,7 @@ class PVNetLightningModule(pl.LightningModule):
         self._val_horizon_maes: list[np.array] = []
         if self.current_epoch==0:
             self._val_persistence_horizon_maes: list[np.array] = []
-        
+
         # Plot some sample forecasts
         val_dataset = self.trainer.val_dataloaders.dataset
 
@@ -205,6 +203,14 @@ class PVNetLightningModule(pl.LightningModule):
 
             batch = collate_fn([val_dataset[i] for i in idxs])
             batch = self.transfer_batch_to_device(batch, self.device, dataloader_idx=0)
+
+            # Batch validation check only during sanity check phase - use first batch
+            if self.trainer.sanity_checking and plot_num == 0:
+                validate_batch_against_config(
+                    batch=batch,
+                    model=self.model
+                )
+            
             with torch.no_grad():
                 y_hat = self.model(batch)
             
@@ -306,7 +312,7 @@ class PVNetLightningModule(pl.LightningModule):
             self.log_dict(extreme_error_metrics, on_step=False, on_epoch=True)
 
             # Optionally save all validation results - these are overridden each epoch
-            if self.save_all_validation_results:
+            if self.hparams.save_all_validation_results:
                 # Add attributes
                 ds_val_results.attrs["epoch"] = self.current_epoch
 

pvnet/training/train.py

@@ -26,7 +26,6 @@ from pvnet.utils import (
 log = logging.getLogger(__name__)
 
 
-
 def resolve_monitor_loss(output_quantiles: list | None) -> str:
     """Return the desired metric to monitor based on whether quantile regression is being used.
 

pvnet/utils.py

@@ -1,11 +1,15 @@
 """Utils"""
 import logging
+from typing import TYPE_CHECKING
 
 import rich.syntax
 import rich.tree
 from lightning.pytorch.utilities import rank_zero_only
 from omegaconf import DictConfig, OmegaConf
 
+if TYPE_CHECKING:
+    from pvnet.models.base_model import BaseModel
+
 logger = logging.getLogger(__name__)
 
 
@@ -79,6 +83,7 @@ def print_config(
         branch = tree.add(field, style=style, guide_style=style)
 
         config_section = config.get(field)
+
         branch_content = str(config_section)
         if isinstance(config_section, DictConfig):
             branch_content = OmegaConf.to_yaml(config_section, resolve=resolve)
@@ -86,3 +91,67 @@ def print_config(
         branch.add(rich.syntax.Syntax(branch_content, "yaml"))
 
     rich.print(tree)
+
+
+def validate_batch_against_config(
+    batch: dict, 
+    model: "BaseModel",
+) -> None:
+    """Validates tensor shapes in batch against model configuration."""
+    logger.info("Performing batch shape validation against model config.")
+    
+    # NWP validation
+    if hasattr(model, 'nwp_encoders_dict'):
+        if "nwp" not in batch:
+            raise ValueError(
+                "Model configured with 'nwp_encoders_dict' but 'nwp' data missing from batch."
+            )
+            
+        for source, nwp_data in batch["nwp"].items():
+            if source in model.nwp_encoders_dict:
+
+                enc = model.nwp_encoders_dict[source]                
+                expected_channels = enc.in_channels
+                if model.add_image_embedding_channel:
+                    expected_channels -= 1
+
+                expected = (nwp_data["nwp"].shape[0], enc.sequence_length, 
+                           expected_channels, enc.image_size_pixels, enc.image_size_pixels)
+                if tuple(nwp_data["nwp"].shape) != expected:
+                    actual_shape = tuple(nwp_data['nwp'].shape)
+                    raise ValueError(
+                        f"NWP.{source} shape mismatch: expected {expected}, got {actual_shape}"
+                    )
+
+    # Satellite validation
+    if hasattr(model, 'sat_encoder'):
+        if "satellite_actual" not in batch:
+            raise ValueError(
+                "Model configured with 'sat_encoder' but 'satellite_actual' missing from batch."
+            )
+
+        enc = model.sat_encoder
+        expected_channels = enc.in_channels
+        if model.add_image_embedding_channel:
+            expected_channels -= 1
+
+        expected = (batch["satellite_actual"].shape[0], enc.sequence_length, expected_channels, 
+                enc.image_size_pixels, enc.image_size_pixels)
+        if tuple(batch["satellite_actual"].shape) != expected:
+            actual_shape = tuple(batch['satellite_actual'].shape)
+            raise ValueError(f"Satellite shape mismatch: expected {expected}, got {actual_shape}")
+
+    # GSP/Site validation
+    key = model._target_key
+    if key in batch:
+        total_minutes = model.history_minutes + model.forecast_minutes
+        interval = model.interval_minutes
+        expected_len = total_minutes // interval + 1
+        expected = (batch[key].shape[0], expected_len)
+        if tuple(batch[key].shape) != expected:
+            actual_shape = tuple(batch[key].shape)
+            raise ValueError(
+                f"{key.upper()} shape mismatch: expected {expected}, got {actual_shape}"
+            )
+
+    logger.info("Batch shape validation successful!")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 5.0.15
+Version: 5.0.17
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Requires-Python: >=3.11

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

@@ -1,20 +1,20 @@
 pvnet/__init__.py,sha256=TAZm88TJ5ieL1XjEyRg1LciIGuSScEucdAruQLfM92I,25
 pvnet/load_model.py,sha256=LzN06O3oXzqhj1Dh_VlschDTxOq_Eea0OWDxrrboSKw,3726
 pvnet/optimizers.py,sha256=1N4b-Xd6QiIrcUU8cbU326bbFC0BvMNIV8VYWtGILJc,6548
-pvnet/utils.py,sha256=h4w9nmx6V_IAtiRp6VQ90TmQZGGTdMzU63WfGmL-pPs,2666
+pvnet/utils.py,sha256=iHG0wlN_cITKXpR16w54fs2R68wkX7vy3a_6f4SuanY,5414
 pvnet/data/__init__.py,sha256=FFD2tkLwEw9YiAVDam3tmaXNWMKiKVMHcnIz7zXCtrg,191
 pvnet/data/base_datamodule.py,sha256=Ibz0RoSr15HT6tMCs6ftXTpMa-NOKAmEd5ky55MqEK0,8615
 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=4Sxal_8hq4F6irr2uG7GbtYZAjaOzUxmLBnO1U7fce0,16181
+pvnet/models/base_model.py,sha256=CnQaaf2kAdOcXqo1319nWa120mHfLQiwOQ639m4OzPk,16182
 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=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
+pvnet/models/late_fusion/encoders/basic_blocks.py,sha256=Yg0Pch0nOdvXjxFln_yZyEeyWYUlSUjbnXhZIEdhHdw,3018
+pvnet/models/late_fusion/encoders/encoders3d.py,sha256=pZ_QnCcvJv2Dw64ielFFfK_4rxxYy7bvNrb_9l4RZyQ,6620
 pvnet/models/late_fusion/linear_networks/__init__.py,sha256=16dLdGfH4QWNrI1fUB-cXWx24lArqo2lWIjdUCWbcBY,96
 pvnet/models/late_fusion/linear_networks/basic_blocks.py,sha256=RnwdeuX_-itY4ncM0NphZ5gRSOpogo7927XIlZJ9LM0,2787
 pvnet/models/late_fusion/linear_networks/networks.py,sha256=exEIz_Z85f8nSwcvp4wqiiLECEAg9YbkKhSZJvFy75M,2231
@@ -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=UvtpijxlRSDKrwH979FSQBeCLLMReYe-S-guWe1upl4,12685
+pvnet/training/lightning_module.py,sha256=TkvLtOPswRtTIwcmAvNOSHg2RvIMzHsJVvs_d0xiRmQ,12891
 pvnet/training/plots.py,sha256=4xID7TBA4IazaARaCN5AoG5fFPJF1wIprn0y6I0C31c,2469
-pvnet/training/train.py,sha256=zj9JMi9C6W68vGsQUBapWkJ4aDzDuJFMv0IVjO73s1k,5215
-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,,
+pvnet/training/train.py,sha256=1tDA34ianCRfilS0yEeIpR9nsQWaJiiZfTD2qRUmgEc,5214
+pvnet-5.0.17.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
+pvnet-5.0.17.dist-info/METADATA,sha256=WxuG2XNuflRMoDdvhU6tpojEv9vf6OfivvEudSTbB2c,18017
+pvnet-5.0.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pvnet-5.0.17.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
+pvnet-5.0.17.dist-info/RECORD,,