PVNet 5.0.20__py3-none-any.whl → 5.0.22__py3-none-any.whl

pvnet/models/late_fusion/encoders/encoders3d.py

@@ -25,6 +25,7 @@ class DefaultPVNet(AbstractNWPSatelliteEncoder):
         spatial_kernel_size: int = 3,
         temporal_kernel_size: int = 3,
         padding: int | tuple[int, ...] = (1, 0, 0),
+        stride: int | tuple[int, ...] = 1,
     ):
         """This is the original encoding module used in PVNet, with a few minor tweaks.
 
@@ -39,29 +40,38 @@ class DefaultPVNet(AbstractNWPSatelliteEncoder):
             spatial_kernel_size: The spatial size of the kernel used in the conv3d layers.
             temporal_kernel_size: The temporal size of the kernel used in the conv3d layers.
             padding: The padding used in the conv3d layers. If an int, the same padding
-                is used in all dimensions
+                is used in all dimensions. The dimensions are (time, space, space)
+            stride: The stride used in conv3d layers. If an int, the same stride is used
+                in all dimensions
         """
 
         super().__init__(sequence_length, image_size_pixels, in_channels, out_features)
 
         if isinstance(padding, int):
             padding = (padding, padding, padding)
+
+        if isinstance(stride, int):
+            stride = (stride, stride, stride)
         
         # Check that the output shape of the convolutional layers will be at least 1x1
-        cnn_spatial_output_size = (
-            image_size_pixels
-            - ((spatial_kernel_size - 2 * padding[1]) - 1) * number_of_conv3d_layers
-        )
-        cnn_sequence_length = (
-            sequence_length
-            - ((temporal_kernel_size - 2 * padding[0]) - 1) * number_of_conv3d_layers
-        )
+        cnn_spatial_output_size = image_size_pixels
+
+        for _ in range(number_of_conv3d_layers):
+            cnn_spatial_output_size = (
+                cnn_spatial_output_size - spatial_kernel_size + 2 * padding[1]
+                ) // stride[1] + 1
+            
         if not (cnn_spatial_output_size >= 1):
             raise ValueError(
                 f"cannot use this many conv3d layers ({number_of_conv3d_layers}) with this input "
                 f"spatial size ({image_size_pixels})"
             )
 
+        cnn_sequence_length = (
+            sequence_length
+            - ((temporal_kernel_size - 2 * padding[0]) - 1) * number_of_conv3d_layers
+        )
+
         conv_layers = []
 
         conv_layers += [
@@ -70,16 +80,18 @@ class DefaultPVNet(AbstractNWPSatelliteEncoder):
                 out_channels=conv3d_channels,
                 kernel_size=(temporal_kernel_size, spatial_kernel_size, spatial_kernel_size),
                 padding=padding,
+                stride=stride,
             ),
             nn.ELU(),
         ]
-        for i in range(0, number_of_conv3d_layers - 1):
+        for _ in range(0, number_of_conv3d_layers - 1):
             conv_layers += [
                 nn.Conv3d(
                     in_channels=conv3d_channels,
                     out_channels=conv3d_channels,
                     kernel_size=(temporal_kernel_size, spatial_kernel_size, spatial_kernel_size),
                     padding=padding,
+                    stride=stride,
                 ),
                 nn.ELU(),
             ]

pvnet/training/lightning_module.py

@@ -38,6 +38,7 @@ class PVNetLightningModule(pl.LightningModule):
 
         self.model = model
         self._optimizer = optimizer
+        self.save_all_validation_results = save_all_validation_results
 
         # Model must have lr to allow tuning
         # This setting is only used when lr is tuned with callback
@@ -312,7 +313,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.hparams.save_all_validation_results:
+            if self.save_all_validation_results:
                 # Add attributes
                 ds_val_results.attrs["epoch"] = self.current_epoch
 

{pvnet-5.0.20.dist-info → pvnet-5.0.22.dist-info}/METADATA

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

{pvnet-5.0.20.dist-info → pvnet-5.0.22.dist-info}/RECORD

@@ -14,7 +14,7 @@ pvnet/models/late_fusion/basic_blocks.py,sha256=_cYGVyAIyEJS4wd-DEAXQXu0br66guZJ
 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=DGkFFIZv4S4FLTaAIOrAngAFBpgZQHfkGM4dzezZLk4,3044
-pvnet/models/late_fusion/encoders/encoders3d.py,sha256=V6yMQp9CANiJi1Km4Y0nVT7IQMrBSNCPjJdxgg5TSj4,6651
+pvnet/models/late_fusion/encoders/encoders3d.py,sha256=9fmqVHO73F-jN62w065cgEQI_icNFC2nQH6ZEGvTHxU,7116
 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=TkvLtOPswRtTIwcmAvNOSHg2RvIMzHsJVvs_d0xiRmQ,12891
+pvnet/training/lightning_module.py,sha256=Hoqy_Csulfu-aUGOo9aqPYs7gHmbHqQTE8XaVI0ieVI,12954
 pvnet/training/plots.py,sha256=4xID7TBA4IazaARaCN5AoG5fFPJF1wIprn0y6I0C31c,2469
 pvnet/training/train.py,sha256=1tDA34ianCRfilS0yEeIpR9nsQWaJiiZfTD2qRUmgEc,5214
-pvnet-5.0.20.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
-pvnet-5.0.20.dist-info/METADATA,sha256=1AAsvPun9UlyzXNFnMlz1AeW4zGVtCSrUtVx_VmmoAE,16371
-pvnet-5.0.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pvnet-5.0.20.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
-pvnet-5.0.20.dist-info/RECORD,,
+pvnet-5.0.22.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
+pvnet-5.0.22.dist-info/METADATA,sha256=4C-v2KoK7y5AaaCJ13jmSE8iDg_-Shv6fUwdSAMHEOY,16371
+pvnet-5.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pvnet-5.0.22.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
+pvnet-5.0.22.dist-info/RECORD,,