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

pvnet/models/late_fusion/encoders/basic_blocks.py

@@ -16,6 +16,7 @@ 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.

pvnet/models/late_fusion/encoders/encoders3d.py

@@ -24,7 +24,7 @@ class DefaultPVNet(AbstractNWPSatelliteEncoder):
         fc_features: int = 128,
         spatial_kernel_size: int = 3,
         temporal_kernel_size: int = 3,
-        padding: int | tuple[int] = (1, 0, 0),
+        padding: int | tuple[int, ...] = (1, 0, 0),
     ):
         """This is the original encoding module used in PVNet, with a few minor tweaks.
 
@@ -42,7 +42,7 @@ class DefaultPVNet(AbstractNWPSatelliteEncoder):
                 is used in all dimensions
         """
 
-        super().__init__(sequence_length, image_size_pixels, out_features)
+        super().__init__(sequence_length, image_size_pixels, in_channels, out_features)
 
         if isinstance(padding, int):
             padding = (padding, padding, padding)
@@ -137,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, out_features)
+        super().__init__(sequence_length, image_size_pixels, in_channels, out_features)
 
         model = [
             nn.Conv3d(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 5.0.17
+Version: 5.0.19
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Requires-Python: >=3.11
@@ -142,120 +142,75 @@ 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` it is not guarenteed to function properly with this library.
 
-## Pre-saving samples of data for training/validation of PVNet
+## Streaming samples (no pre-save)
 
-PVNet contains a script for generating samples of data suitable for training the PVNet models. To run the script you will need to make some modifications to the datamodule configuration.
+PVNet now trains and validates directly from **streamed_samples** (i.e. no pre-saving to disk).
 
-Make sure you have copied the example configs (as already stated above):
-```
+Make sure you have copied example configs (as already stated above):
 cp -r configs.example configs
-```
-
-### Set up and config example for sample creation
-
-We will use the following example config file for creating samples: `/PVNet/configs/datamodule/configuration/example_configuration.yaml`. Ensure that the file paths are set to the correct locations in `example_configuration.yaml`: search for `PLACEHOLDER` to find where to input the location of the files. You will need to comment out or delete the parts of `example_configuration.yaml` pertaining to the data you are not using.
 
+### Set up and config example for streaming
 
-When creating samples, an additional datamodule config located in `PVNet/configs/datamodule` is passed into the sample creation script: `streamed_samples.yaml`. Like before, a placeholder variable is used when specifying which configuration to use:
+We will use the following example config file to describe your data sources: `/PVNet/configs/datamodule/configuration/example_configuration.yaml`. Ensure that the file paths are set to the correct locations in `example_configuration.yaml`: search for `PLACEHOLDER` to find where to input the location of the files. Delete or comment the parts for data you are not using.
 
-```yaml
-configuration: "PLACEHOLDER.yaml"
-```
-
-This should be given the whole path to the config on your local machine, for example:
+At run time, the datamodule config `PVNet/configs/datamodule/streamed_samples.yaml` points to your chosen configuration file:
 
-```yaml
 configuration: "/FULL-PATH-TO-REPO/PVNet/configs/datamodule/configuration/example_configuration.yaml"
-```
-
-Where `FULL-PATH-TO-REPO` represent the whole path to the PVNet repo on your local machine.
 
-This is also where you can update the train, val & test periods to cover the data you have access to.
-
-### Running the sample creation script
-
-Run the `save_samples.py` script to create samples with the parameters specified in the datamodule config (`streamed_samples.yaml` in this example):
-
-```bash
-python scripts/save_samples.py
-```
-PVNet uses
-[hydra](https://hydra.cc/) which enables us to pass variables via the command
-line that will override the configuration defined in the `./configs` directory, like this:
-
-```bash
-python scripts/save_samples.py datamodule=streamed_samples datamodule.sample_output_dir="./output" datamodule.num_train_samples=10 datamodule.num_val_samples=5
-```
-
-`scripts/save_samples.py` needs a config under `PVNet/configs/datamodule`. You can adapt `streamed_samples.yaml` or create your own in the same folder.
+You can also update train/val/test time ranges here to match the period you have access to.
 
 If downloading private data from a GCP bucket make sure to authenticate gcloud (the public satellite data does not need authentication):
 
-```
 gcloud auth login
-```
-
-Files stored in multiple locations can be added as a list. For example, in the `example_configuration.yaml` file we can supply a path to satellite data stored on a bucket:
 
-```yaml
-satellite:
-    zarr_path: gs://solar-pv-nowcasting-data/satellite/EUMETSAT/SEVIRI_RSS/v4/2020_nonhrv.zarr
-```
+You can provide multiple storage locations as a list. For example:
 
-Or to satellite data hosted by Google:
-
-```yaml
 satellite:
-    zarr_path:
-      - "gs://public-datasets-eumetsat-solar-forecasting/satellite/EUMETSAT/SEVIRI_RSS/v4/2020_nonhrv.zarr"
-      - "gs://public-datasets-eumetsat-solar-forecasting/satellite/EUMETSAT/SEVIRI_RSS/v4/2021_nonhrv.zarr"
-```
-
-ocf-data-sampler is currently set up to use 11 channels from the satellite data, the 12th of which is HRV and is not included in these.
+  zarr_path:
+    - "gs://public-datasets-eumetsat-solar-forecasting/satellite/EUMETSAT/SEVIRI_RSS/v4/2020_nonhrv.zarr"
+    - "gs://public-datasets-eumetsat-solar-forecasting/satellite/EUMETSAT/SEVIRI_RSS/v4/2021_nonhrv.zarr"
 
+`ocf-data-sampler` is currently set up to use 11 channels from the satellite data (the 12th, HRV, is not used).
 
 ### Training PVNet
 
-How PVNet is run is determined by the extensive configuration in the config
-files. The configs stored in `PVNet/configs.example` should work with samples created using the steps and sample creation config mentioned above.
+How PVNet is run is determined by the configuration files. The example configs in `PVNet/configs.example` work with **streamed_samples** using `datamodule/streamed_samples.yaml`.
 
-Make sure to update the following config files before training your model:
+Update the following before training:
 
-1. In `configs/datamodule/presaved_samples.yaml`:
-    - update `sample_dir` to point to the directory you stored your samples in during sample creation
-2. In `configs/model/late_fusion.yaml`:
-    - update the list of encoders to reflect the data sources you are using. If you are using different NWP sources, the encoders for these should follow the same structure with two important updates:
-        - `in_channels`: number of variables your NWP source supplies
-        - `image_size_pixels`: spatial crop of your NWP data. It depends on the spatial resolution of your NWP; should match `image_size_pixels_height` and/or `image_size_pixels_width` in `datamodule/configuration/site_example_configuration.yaml` for the NWP, unless transformations such as coarsening was applied (e. g. as for ECMWF data)
-3. In `configs/trainer/default.yaml`:
-    - set `accelerator: 0` if running on a system without a supported GPU
+1. In `configs/model/late_fusion.yaml`:
+    - Update the list of encoders to match the data sources you are using. For different NWP sources, keep the same structure but ensure:
+        - `in_channels`: the number of variables your NWP source supplies
+        - `image_size_pixels`: spatial crop matching your NWP resolution and the settings in your datamodule configuration (unless you coarsened, e.g. for ECMWF)
+2. In `configs/trainer/default.yaml`:
+    - Set `accelerator: 0` if running on a system without a supported GPU
+3. In `configs/datamodule/streamed_samples.yaml`:
+    - Point `configuration:` to your local `example_configuration.yaml` (or your custom one)
+    - Adjust the train/val/test time ranges to your available data
 
-If creating copies of the config files instead of modifying existing ones, update `defaults` in the main `./configs/config.yaml` file to use
-your customised config files:
+If you create custom config files, update the main `./configs/config.yaml` defaults:
 
-```yaml
 defaults:
   - trainer: default.yaml
   - model: late_fusion.yaml
-  - datamodule: presaved_samples.yaml
+  - datamodule: streamed_samples.yaml
   - callbacks: null
   - experiment: null
   - hparams_search: null
   - hydra: default.yaml
-```
 
-Assuming you ran the `save_samples.py` script to generate some presaved train and
-val data samples, you can now train PVNet by running:
+Now train PVNet:
 
-```
 python run.py
-```
+
+You can override any setting with Hydra, e.g.:
+
+python run.py datamodule=streamed_samples datamodule.configuration="/FULL-PATH/PVNet/configs/datamodule/configuration/example_configuration.yaml"
 
 ## Backtest
 
 If you have successfully trained a PVNet model and have a saved model checkpoint you can create a backtest using this, e.g. forecasts on historical data to evaluate forecast accuracy/skill. This can be done by running one of the scripts in this repo such as [the UK GSP backtest script](scripts/backtest_uk_gsp.py) or the [the pv site backtest script](scripts/backtest_sites.py), further info on how to run these are in each backtest file.
 
-
 ## Testing
 
 You can use `python -m pytest tests` to run tests

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

@@ -13,8 +13,8 @@ pvnet/models/late_fusion/__init__.py,sha256=Jf0B-E0_5IvSBFoj1wvnPtwYDxs4pRIFm5qH
 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=Yg0Pch0nOdvXjxFln_yZyEeyWYUlSUjbnXhZIEdhHdw,3018
-pvnet/models/late_fusion/encoders/encoders3d.py,sha256=pZ_QnCcvJv2Dw64ielFFfK_4rxxYy7bvNrb_9l4RZyQ,6620
+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/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
@@ -25,8 +25,8 @@ pvnet/training/__init__.py,sha256=FKxmPZ59Vuj5_mXomN4saJ3En5M-aDMxSs6OttTQOcg,49
 pvnet/training/lightning_module.py,sha256=TkvLtOPswRtTIwcmAvNOSHg2RvIMzHsJVvs_d0xiRmQ,12891
 pvnet/training/plots.py,sha256=4xID7TBA4IazaARaCN5AoG5fFPJF1wIprn0y6I0C31c,2469
 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,,
+pvnet-5.0.19.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
+pvnet-5.0.19.dist-info/METADATA,sha256=ZbWzUJKm_JA5rz7EYvaxA1k6WkUpMfitrrX5XxcF6fc,16104
+pvnet-5.0.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pvnet-5.0.19.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
+pvnet-5.0.19.dist-info/RECORD,,