Upload folder using huggingface_hub

README.md

@@ -33,13 +33,13 @@ The model is trained on data from 2019-2022 and validated on data from 2022-2023
 
 ### Preprocessing
 
-Data is prepared with the `ocf_datapipes.training.pvnet` datapipe [2].
+Data is prepared with the `ocf_data_sampler/torch_datasets/datasets/pvnet_uk` Dataset [2].
 
 
 ## Results
 
 The training logs for the current model can be found here:
- - [https://wandb.ai/openclimatefix/PVNet_intra/runs/xquh2tep](https://wandb.ai/openclimatefix/PVNet_intra/runs/xquh2tep)
+ - [https://wandb.ai/openclimatefix/PVNet_intra/runs/61s7zu32](https://wandb.ai/openclimatefix/PVNet_intra/runs/61s7zu32)
 
 
 The training logs for all model runs of PVNet2 can be found [here](https://wandb.ai/openclimatefix/pvnet2.1).
@@ -54,4 +54,4 @@ Trained on a single NVIDIA Tesla T4
 ### Software
 
 - [1] https://github.com/openclimatefix/PVNet
-- [2] https://github.com/openclimatefix/ocf_datapipes
+- [2] https://github.com/openclimatefix/ocf-data-sampler

config.json

@@ -10,6 +10,15 @@
         0.98
     ],
     "nwp_encoders_dict": {
+        "ukv": {
+            "_target_": "pvnet.models.multimodal.encoders.encoders3d.DefaultPVNet",
+            "_partial_": true,
+            "in_channels": 12,
+            "out_features": 256,
+            "number_of_conv3d_layers": 6,
+            "conv3d_channels": 32,
+            "image_size_pixels": 24
+        },
         "ecmwf": {
             "_target_": "pvnet.models.multimodal.encoders.encoders3d.DefaultPVNet",
             "_partial_": true,
@@ -20,8 +29,16 @@
             "image_size_pixels": 12
         }
     },
+    "sat_encoder": {
+        "_target_": "pvnet.models.multimodal.encoders.encoders3d.DefaultPVNet",
+        "_partial_": true,
+        "in_channels": 11,
+        "out_features": 256,
+        "number_of_conv3d_layers": 6,
+        "conv3d_channels": 32,
+        "image_size_pixels": 24
+    },
     "add_image_embedding_channel": false,
-    "pv_encoder": null,
     "output_network": {
         "_target_": "pvnet.models.multimodal.linear_networks.networks.ResFCNet2",
         "_partial_": true,
@@ -35,20 +52,25 @@
     "include_gsp_yield_history": false,
     "forecast_minutes": 480,
     "history_minutes": 120,
+    "min_sat_delay_minutes": 30,
+    "sat_history_minutes": 90,
     "pv_history_minutes": 180,
     "nwp_history_minutes": {
+        "ukv": 120,
         "ecmwf": 120
     },
     "nwp_forecast_minutes": {
+        "ukv": 480,
         "ecmwf": 480
     },
     "nwp_interval_minutes": {
+        "ukv": 60,
         "ecmwf": 60
     },
     "optimizer": {
         "_target_": "pvnet.optimizers.EmbAdamWReduceLROnPlateau",
         "lr": 0.0001,
-        "weight_decay": 0.25,
+        "weight_decay": 0.01,
         "amsgrad": true,
         "patience": 5,
         "factor": 0.1,

data_config.yaml

@@ -6,12 +6,13 @@ input_data:
     dropout_fraction: 0
     dropout_timedeltas_minutes: null
     forecast_minutes: 480
-    history_minutes: 120
+    interval_end_minutes: 480
+    interval_start_minutes: -120
     time_resolution_minutes: 30
-    gsp_zarr_path: PLACEHOLDER.zarr
+    zarr_path: PLACEHOLDER.zarr
   nwp:
     ecmwf:
-      nwp_channels:
+      channels:
       - t2m
       - dswrf
       - dlwrf
@@ -19,7 +20,7 @@ input_data:
       - mcc
       - lcc
       - tcc
-      - sde
+      - sd
       - sr
       - duvrs
       - u10
@@ -27,11 +28,62 @@ input_data:
       dropout_fraction: 1.0
       dropout_timedeltas_minutes:
       - -180
-      nwp_image_size_pixels_height: 12
-      nwp_image_size_pixels_width: 12
-      forecast_minutes: 480
-      history_minutes: 120
+      forecast_minutes: 720.0
+      image_size_pixels_height: 12
+      image_size_pixels_width: 12
+      interval_end_minutes: 480
+      interval_start_minutes: -120
+      max_staleness_minutes: null
+      provider: ecmwf
+      time_resolution_minutes: 60
+      zarr_path: PLACEHOLDER.zarr
+    ukv:
+      channels:
+      - t
+      - dswrf
+      - dlwrf
+      - hcc
+      - mcc
+      - lcc
+      - sde
+      - r
+      - vis
+      - si10
+      - wdir10
+      - prate
+      dropout_fraction: 1.0
+      dropout_timedeltas_minutes:
+      - -180
+      forecast_minutes: 720.0
+      image_size_pixels_height: 24
+      image_size_pixels_width: 24
+      interval_end_minutes: 480
+      interval_start_minutes: -120
       max_staleness_minutes: null
-      nwp_provider: ecmwf
+      provider: ukv
       time_resolution_minutes: 60
-      nwp_zarr_path: PLACEHOLDER.zarr
+      zarr_path: PLACEHOLDER.zarr
+  satellite:
+    channels:
+    - IR_016
+    - IR_039
+    - IR_087
+    - IR_097
+    - IR_108
+    - IR_120
+    - IR_134
+    - VIS006
+    - VIS008
+    - WV_062
+    - WV_073
+    dropout_fraction: 0
+    dropout_timedeltas_minutes: null
+    image_size_pixels_height: 24
+    image_size_pixels_width: 24
+    interval_end_minutes: 0
+    interval_start_minutes: -90
+    live_delay_minutes: 30
+    satellite_image_size_pixels_height: 24
+    satellite_image_size_pixels_width: 24
+    time_resolution_minutes: 5
+    zarr_path: PLACEHOLDER.zarr

pytorch_model.bin

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74e4433c14e5d65be5ed78473e79593cf0f91817325933edb0e17f081613ec63
-size 4473190
+oid sha256:0792bbe8d08985a0c7964fbdfd497a679718012d9572851bdff7d3e4d3c936e5
+size 62822950