Upload folder using huggingface_hub

README.md

@@ -38,7 +38,7 @@ Data is prepared with the `ocf_datapipes.training.pvnet` datapipe [2].
 
 ## Results
 
-The training logs for the current model can be found [here on wandb](https://wandb.ai/openclimatefix/pvnet2.1/runs/kn81g3qz).
+The training logs for the current model can be found [here on wandb](https://wandb.ai/openclimatefix/pvnet2.1/runs/s684m1dk).
 
 The training logs for all model runs of PVNet2 can be found [here](https://wandb.ai/openclimatefix/pvnet2.1).
 

config.json

@@ -9,31 +9,6 @@
         0.9,
         0.98
     ],
-    
-    "nwp_encoders_dict": {
-        "ukv": {
-          "_target_": "pvnet.models.multimodal.encoders.encoders3d.DefaultPVNet",
-          "_partial_": true,
-          "in_channels": 2,
-          "out_features": 256,
-          "number_of_conv3d_layers": 6,
-          "conv3d_channels": 32,
-          "image_size_pixels": 24
-        }
-    },
-    
-    "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": true,
-
     "output_network": {
         "_target_": "pvnet.models.multimodal.linear_networks.networks.ResFCNet2",
         "_partial_": true,
@@ -42,24 +17,58 @@
         "res_block_layers": 2,
         "dropout_frac": 0.0
     },
-    
     "embedding_dim": 16,
     "include_sun": true,
     "include_gsp_yield_history": false,
     "forecast_minutes": 480,
     "history_minutes": 120,
-    "sat_history_minutes": 90,
-    "nwp_history_minutes": {"ukv": 120},
-    "nwp_forecast_minutes": {"ukv": 480},
-    "min_sat_delay_minutes": 60,
-    
     "optimizer": {
-        "_target_": "pvnet.optimizers.AdamWReduceLROnPlateau",
+        "_target_": "pvnet.optimizers.EmbAdamWReduceLROnPlateau",
         "lr": 0.0001,
         "weight_decay": 0.25,
         "amsgrad": true,
         "patience": 5,
         "factor": 0.1,
         "threshold": 0.002
-    }
+    },
+    "nwp_encoders_dict": {
+        "ukv": {
+            "_target_": "pvnet.models.multimodal.encoders.encoders3d.DefaultPVNet",
+            "_partial_": true,
+            "in_channels": 10,
+            "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,
+            "in_channels": 8,
+            "out_features": 256,
+            "number_of_conv3d_layers": 4,
+            "conv3d_channels": 32,
+            "image_size_pixels": 12
+        }
+    },
+    "nwp_history_minutes": {
+        "ukv": 120,
+        "ecmwf": 120
+    },
+    "nwp_forecast_minutes": {
+        "ukv": 480,
+        "ecmwf": 480
+    },
+    "add_image_embedding_channel": false,
+    "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
+    },
+    "min_sat_delay_minutes": 60,
+    "sat_history_minutes": 90
 }

data_config.yaml

@@ -2,31 +2,56 @@ general:
   description: Config for training the saved PVNet model
   name: PVNet current
 input_data:
-  default_forecast_minutes: 480
+  default_forecast_minutes: 2160
   default_history_minutes: 120
   gsp:
-    forecast_minutes: 480
+    forecast_minutes: 2160
     gsp_zarr_path: PLACEHOLDER.zarr
     history_minutes: 120
     time_resolution_minutes: 30
-  hrvsatellite:
-    forecast_minutes: 0
-    history_minutes: 60
-    hrvsatellite_channels:
-    - HRV
-    hrvsatellite_image_size_pixels_height: 24
-    hrvsatellite_image_size_pixels_width: 24
-    hrvsatellite_zarr_path: ''
-    time_resolution_minutes: 5
   nwp:
-    ukv:
-      forecast_minutes: 480
+    ecmwf:
+      dropout_fraction: 1.0
+      dropout_timedeltas_minutes:
+      - -180
+      forecast_minutes: 1980
       history_minutes: 120
+      max_staleness_minutes: null
       nwp_channels:
-      - t
+      - t2m
       - dswrf
+      - dlwrf
+      - tcc
+      - hcc
+      - mcc
+      - lcc
+      - prate
       nwp_image_size_pixels_height: 24
       nwp_image_size_pixels_width: 24
+      nwp_provider: ecmwf
+      nwp_zarr_path: PLACEHOLDER.zarr
+      time_resolution_minutes: 60
+    ukv:
+      dropout_fraction: 1.0
+      dropout_timedeltas_minutes:
+      - -180
+      forecast_minutes: 1800
+      history_minutes: 120
+      max_staleness_minutes: null
+      nwp_channels:
+      - t
+      - dswrf
+      - dlwrf
+      - hcc
+      - mcc
+      - lcc
+      - si10
+      - vis
+      - r
+      - prate
+      nwp_image_size_pixels_height: 48
+      nwp_image_size_pixels_width: 48
+      nwp_provider: ukv
       nwp_zarr_path: PLACEHOLDER.zarr
       time_resolution_minutes: 60
   satellite:
@@ -45,7 +70,7 @@ input_data:
     - VIS008
     - WV_062
     - WV_073
-    satellite_image_size_pixels_height: 24
-    satellite_image_size_pixels_width: 24
+    satellite_image_size_pixels_height: 48
+    satellite_image_size_pixels_width: 48
     satellite_zarr_path: PLACEHOLDER.zarr
     time_resolution_minutes: 5

pytorch_model.bin

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2701ff9c3e511fcab9932359d33411acf698b707a55de26e5e98c400eb5115fc
-size 46579902
+oid sha256:5878a7d7a4522208731c22ea2d6c7d4bfc5f8d96c9793c38cf48682cd68893d5
+size 48646438