Upload model - 3k3d1f9l

README.md

@@ -4,71 +4,66 @@ library_name: pytorch
 license: mit
 ---
 <!--
-Do not remove elements like the above surrounded by two curly braces and do not add any more of them. These entries are required by the library and are automaticall infilled when the model is uploaded to huggingface
+Do not remove elements like the above surrounded by two curly braces and do not add any more of them. These entries are required by the PVNet library and are automaticall infilled when the model is uploaded to huggingface
 -->
 
-<!-- Title - e.g. PVNet-summation -->
-# PVNet_summation
+<!-- Title - e.g. PVNet2, WindNet, PVNet India -->
+# PVNet2
 
 <!-- Provide a longer summary of what this model is/does. -->
 ## Model Description
 
-<!-- e.g.
-This model uses the output predictions of PVNet to predict the sum from predictions of the parts
--->
-This model class sums the output of the PVNet model's GSP level predictions to make a national forecast of UK PV output. More information can be found in the model repo [1], the PVNet model repo [2]
+<!-- Provide a longer summary of what this model is/does. -->
+This model class uses satellite data, and numerical weather predictions to forecast the near-term (~8 hours) PV power output at all GSPs. More information can be found in the model repo [1].
 
 - **Developed by:** openclimatefix
+- **Model type:** Fusion model
 - **Language(s) (NLP):** en
 - **License:** mit
 
+
 # Training Details
 
 ## Data
 
 <!-- eg.
-The model is trained on data from 2019-2022 and validated on data from 2022-2023. It uses the
-output predictions from PVNet - see the PVNet model for its inputs
+The model is trained on data from 2019-2022 and validated on data from 2022-2023. It uses NWP data from ECMWF IFS model, and the UK Met Office UKV model. It uses satellite data from the EUMETSAT MSG SEVIRI instrument.
 
+See the data_config.yaml file for more information on the channels and window-size used for each input data source.
 -->
 
-The model is trained on the output predictions of our PVNet model which gives GSP (i.e. UK regional) level predictions of solar power across Great Britain. This model is trained to take those predictions and use them to estimate the national total with uncertainty estimates. 
+The model is trained on data from 2019-2021 and validated on data from 2022. It uses NWP data from ECMWF IFS model, and the UK Met Office UKV model. It uses also uses inputs from OCF's cloudcasting model
+
 
-The model is trained on data from 2019-2021 and validated on data from 2022. It uses the
-output predictions from PVNet - see the PVNet model for its inputs
 
 <!-- The preprocessing section is not strictly nessessary but perhaps nice to have -->
 ### Preprocessing
 
-<!-- eg.
 Data is prepared with the `ocf_data_sampler/torch_datasets/datasets/pvnet_uk` Dataset [2].
--->
+
 
 ## Results
 
 <!-- Do not remove the lines below -->
-The training logs for this model commit can be found here:
- - [https://wandb.ai/openclimatefix/pvnet_summation/runs/qz4wasci](https://wandb.ai/openclimatefix/pvnet_summation/runs/qz4wasci)
+The training logs for the current model can be found here:
 
 
 <!-- The hardware section is also just nice to have -->
-### Hardware
-<!-- e.g.
-Trained on a single NVIDIA Tesla T4
--->
+<!-- ### Hardware 
 
 Trained on a single NVIDIA Tesla T4
 
+-->
 
 <!-- Do not remove the section below -->
 ### Software
 
 This model was trained using the following Open Climate Fix packages:
 
-- [1] https://github.com/openclimatefix/pvnet-summation
+- [1] https://github.com/openclimatefix/PVNet
 - [2] https://github.com/openclimatefix/ocf-data-sampler
 
 <!-- Especially do not change the two lines below -->
 The versions of these packages can be found below:
- - pvnet_summation==1.0.1.post0+git.13031a6b.dirty
+ - pvnet_summation==1.1.0.post0+git.3b6f1115.dirty
  - ocf-data-sampler==0.5.26.post2+git.90ee263d.dirty

datamodule_config.yaml

@@ -1,3 +1,3 @@
 pvnet_model:
   model_id: openclimatefix/pvnet_uk_region
-  revision: bd4cced6f00dd40a3858d49b3904ffaf325e6874
+  revision: cfcb233576c3c8110daed0179452e3d9913c744c

full_experiment_config.yaml

@@ -2,7 +2,7 @@ trainer:
   _target_: lightning.pytorch.trainer.trainer.Trainer
   accelerator: gpu
   devices:
-  - 2
+  - 0
   min_epochs: null
   max_epochs: 300
   reload_dataloaders_every_n_epochs: 0
@@ -12,7 +12,7 @@ trainer:
 model:
   _target_: pvnet_summation.training.lightning_module.PVNetSummationLightningModule
   model:
-    _target_: pvnet_summation.models.dense_model.DenseModel
+    _target_: pvnet_summation.models.horizon_dense_model.HorizonDenseModel
     output_quantiles:
     - 0.02
     - 0.1
@@ -25,10 +25,14 @@ model:
       _target_: pvnet.models.late_fusion.linear_networks.networks.ResFCNet
       _partial_: true
       fc_hidden_features: 128
-      n_res_blocks: 2
+      n_res_blocks: 3
       res_block_layers: 2
       dropout_frac: 0.2
     predict_difference_from_sum: true
+    force_non_crossing: true
+    beta: 3
+    use_horizon_encoding: true
+    use_solar_position: true
     history_minutes: 120
     forecast_minutes: 480
     interval_minutes: 30
@@ -44,13 +48,30 @@ model:
   optimizer:
     _target_: pvnet_summation.optimizers.AdamWReduceLROnPlateau
     lr: 3.0e-05
-    weight_decay: 0.25
+    weight_decay: 0.1
     amsgrad: true
     patience: 10
-    factor: 0.1
+    factor: 0.2
     threshold: 0.0
 datamodule:
-  configuration: /home/james/repos/PVNet/configs/datamodule/configuration/new_gsps2.yaml
+  data_source_paths:
+    gsp: /mnt/storage_u2_30tb_a/ml_training_zarrs/pv/pvlive_gsp_new_boundaries_2019-2025.zarr
+    satellite:
+    - /mnt/storage_u2_30tb_a/ml_training_zarrs/sat/uk_sat_crops/v1/2019_nonhrv.zarr
+    - /mnt/storage_u2_30tb_a/ml_training_zarrs/sat/uk_sat_crops/v1/2020_nonhrv.zarr
+    - /mnt/storage_u2_30tb_a/ml_training_zarrs/sat/uk_sat_crops/v1/2021_nonhrv.zarr
+    - /mnt/storage_u2_30tb_a/ml_training_zarrs/sat/uk_sat_crops/v1/2022_nonhrv.zarr
+    nwp:
+      ukv:
+      - /mnt/storage_u2_30tb_a/ml_training_zarrs/nwp/ukv_v7/UKV_intermediate_version_7.1.zarr
+      - /mnt/storage_u2_30tb_a/ml_training_zarrs/nwp/ukv_v7/UKV_2021_missing.zarr
+      - /mnt/storage_u2_30tb_a/ml_training_zarrs/nwp/ukv_v7/UKV_2022.zarr
+      ecmwf:
+      - /mnt/storage_u2_30tb_a/ml_training_zarrs/nwp/ecmwf_v3/ECMWF_2019.zarr
+      - /mnt/storage_u2_30tb_a/ml_training_zarrs/nwp/ecmwf_v3/ECMWF_2020.zarr
+      - /mnt/storage_u2_30tb_a/ml_training_zarrs/nwp/ecmwf_v3/ECMWF_2021.zarr
+      - /mnt/storage_u2_30tb_a/ml_training_zarrs/nwp/ecmwf_v3/ECMWF_2022.zarr
+      sat_pred: /mnt/disks/simvp_inputs/simvp_preds.zarr
   batch_size: 32
   num_workers: 12
   prefetch_factor: 2
@@ -58,8 +79,8 @@ datamodule:
   max_num_train_samples: null
   max_num_val_samples: null
   pvnet_model:
-    model_id: /home/james/tmp/models/49nlmpdy
-    revision: null
+    model_id: openclimatefix/pvnet_uk_region
+    revision: cfcb233576c3c8110daed0179452e3d9913c744c
   train_period:
   - null
   - '2021-12-31'
@@ -67,7 +88,7 @@ datamodule:
   - '2022-01-01'
   - '2022-12-31'
   seed: ${seed}
-  dataset_pickle_dir: /home/james/tmp/summation_dataset_pickles
+  dataset_pickle_dir: /home/james/tmp/summation_dataset_pickles_pvnet_v2
 callbacks:
   learning_rate_monitor:
     _target_: lightning.pytorch.callbacks.LearningRateMonitor
@@ -102,5 +123,5 @@ logger:
     tags: []
 sample_save_dir: /home/james/repos/pvnet-summation/presaved_saved_samples
 work_dir: ${hydra:runtime.cwd}
-model_name: 2NWP+sat0_v2
+model_name: pvnet_v2
 seed: 2727831

model_config.yaml

@@ -1,4 +1,4 @@
-_target_: pvnet_summation.models.dense_model.DenseModel
+_target_: pvnet_summation.models.horizon_dense_model.HorizonDenseModel
 output_quantiles:
 - 0.02
 - 0.1
@@ -11,10 +11,14 @@ output_network:
   _target_: pvnet.models.late_fusion.linear_networks.networks.ResFCNet
   _partial_: true
   fc_hidden_features: 128
-  n_res_blocks: 2
+  n_res_blocks: 3
   res_block_layers: 2
   dropout_frac: 0.2
 predict_difference_from_sum: true
+force_non_crossing: true
+beta: 3
+use_horizon_encoding: true
+use_solar_position: true
 history_minutes: 120
 forecast_minutes: 480
 interval_minutes: 30

model_weights.safetensors

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d20c171c922e3b92e25366fa572fa8dbaccdca6ef3773e1af33d4de7024e5efe
-size 19365512
+oid sha256:86cb148b45fab418cc041723c52dbd41254ee1ee63067df4614a393674570ddc
+size 1605412