PVNet 3.0.50__tar.gz → 3.0.52__tar.gz

{pvnet-3.0.50 → pvnet-3.0.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 3.0.50
+Version: 3.0.52
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown

{pvnet-3.0.50 → pvnet-3.0.52}/PVNet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 3.0.50
+Version: 3.0.52
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown

pvnet-3.0.52/pvnet/__init__.py

@@ -0,0 +1,2 @@
+"""PVNet"""
+__version__ = "3.0.52"

{pvnet-3.0.50 → pvnet-3.0.52}/pvnet/models/multimodal/multimodal.py

@@ -48,6 +48,7 @@ class Model(MultimodalBaseModel):
         add_image_embedding_channel: bool = False,
         include_gsp_yield_history: bool = True,
         include_sun: bool = True,
+        include_time: bool = False,
         embedding_dim: Optional[int] = 16,
         forecast_minutes: int = 30,
         history_minutes: int = 60,
@@ -97,6 +98,7 @@ class Model(MultimodalBaseModel):
                 embedding of the GSP ID.
             include_gsp_yield_history: Include GSP yield data.
             include_sun: Include sun azimuth and altitude data.
+            include_time: Include sine and cosine of dates and times.
             embedding_dim: Number of embedding dimensions to use for GSP ID. Not included if set to
                 `None`.
             forecast_minutes: The amount of minutes that should be forecasted.
@@ -141,6 +143,7 @@ class Model(MultimodalBaseModel):
         self.include_nwp = nwp_encoders_dict is not None and len(nwp_encoders_dict) != 0
         self.include_pv = pv_encoder is not None
         self.include_sun = include_sun
+        self.include_time = include_time
         self.include_wind = wind_encoder is not None
         self.include_sensor = sensor_encoder is not None
         self.embedding_dim = embedding_dim
@@ -283,6 +286,16 @@ class Model(MultimodalBaseModel):
             # Update num features
             fusion_input_features += 16
 
+        if self.include_time:
+            self.time_fc1 = nn.Linear(
+                in_features=4
+                * (self.forecast_len + self.forecast_len_ignore + self.history_len + 1),
+                out_features=32,
+            )
+
+            # Update num features
+            fusion_input_features += 32
+
         if include_gsp_yield_history:
             # Update num features
             fusion_input_features += self.history_len
@@ -388,6 +401,19 @@ class Model(MultimodalBaseModel):
             sun = self.sun_fc1(sun)
             modes["sun"] = sun
 
+        if self.include_time:
+            time = torch.cat(
+                (
+                    x[BatchKey[f"{self._target_key_name}_date_sin"]],
+                    x[BatchKey[f"{self._target_key_name}_date_cos"]],
+                    x[BatchKey[f"{self._target_key_name}_time_sin"]],
+                    x[BatchKey[f"{self._target_key_name}_time_cos"]],
+                ),
+                dim=1,
+            ).float()
+            time = self.time_fc1(time)
+            modes["time"] = time
+
         out = self.output_network(modes)
 
         if self.use_quantile_regression:

pvnet-3.0.50/pvnet/__init__.py

@@ -1,2 +0,0 @@
-"""PVNet"""
-__version__ = "3.0.50"