PVNet 3.0.1__tar.gz → 3.0.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. {PVNet-3.0.1 → PVNet-3.0.3}/PKG-INFO +1 -1
  2. {PVNet-3.0.1 → PVNet-3.0.3}/PVNet.egg-info/PKG-INFO +1 -1
  3. PVNet-3.0.3/pvnet/__init__.py +2 -0
  4. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/base_model.py +2 -2
  5. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/multimodal.py +5 -1
  6. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/site_encoders/encoders.py +2 -0
  7. PVNet-3.0.1/pvnet/__init__.py +0 -2
  8. {PVNet-3.0.1 → PVNet-3.0.3}/LICENSE +0 -0
  9. {PVNet-3.0.1 → PVNet-3.0.3}/MANIFEST.in +0 -0
  10. {PVNet-3.0.1 → PVNet-3.0.3}/PVNet.egg-info/SOURCES.txt +0 -0
  11. {PVNet-3.0.1 → PVNet-3.0.3}/PVNet.egg-info/dependency_links.txt +0 -0
  12. {PVNet-3.0.1 → PVNet-3.0.3}/PVNet.egg-info/requires.txt +0 -0
  13. {PVNet-3.0.1 → PVNet-3.0.3}/PVNet.egg-info/top_level.txt +0 -0
  14. {PVNet-3.0.1 → PVNet-3.0.3}/README.md +0 -0
  15. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/callbacks.py +0 -0
  16. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/data/__init__.py +0 -0
  17. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/data/base.py +0 -0
  18. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/data/datamodule.py +0 -0
  19. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/data/pv_site_datamodule.py +0 -0
  20. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/data/utils.py +0 -0
  21. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/data/wind_datamodule.py +0 -0
  22. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/__init__.py +0 -0
  23. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/baseline/__init__.py +0 -0
  24. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/baseline/last_value.py +0 -0
  25. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/baseline/single_value.py +0 -0
  26. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/__init__.py +0 -0
  27. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/basic_blocks.py +0 -0
  28. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/deep_supervision.py +0 -0
  29. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/encoders/__init__.py +0 -0
  30. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/encoders/basic_blocks.py +0 -0
  31. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/encoders/encoders2d.py +0 -0
  32. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/encoders/encoders3d.py +0 -0
  33. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/encoders/encodersRNN.py +0 -0
  34. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/linear_networks/__init__.py +0 -0
  35. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/linear_networks/basic_blocks.py +0 -0
  36. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/linear_networks/networks.py +0 -0
  37. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/nwp_weighting.py +0 -0
  38. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/site_encoders/__init__.py +0 -0
  39. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/site_encoders/basic_blocks.py +0 -0
  40. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/weather_residual.py +0 -0
  41. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/utils.py +0 -0
  42. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/optimizers.py +0 -0
  43. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/training.py +0 -0
  44. {PVNet-3.0.1 → PVNet-3.0.3}/pvnet/utils.py +0 -0
  45. {PVNet-3.0.1 → PVNet-3.0.3}/pyproject.toml +0 -0
  46. {PVNet-3.0.1 → PVNet-3.0.3}/requirements-dev.txt +0 -0
  47. {PVNet-3.0.1 → PVNet-3.0.3}/requirements.txt +0 -0
  48. {PVNet-3.0.1 → PVNet-3.0.3}/setup.cfg +0 -0
  49. {PVNet-3.0.1 → PVNet-3.0.3}/setup.py +0 -0
  50. {PVNet-3.0.1 → PVNet-3.0.3}/tests/__init__.py +0 -0
  51. {PVNet-3.0.1 → PVNet-3.0.3}/tests/conftest.py +0 -0
  52. {PVNet-3.0.1 → PVNet-3.0.3}/tests/test_end2end.py +0 -0
{PVNet-3.0.1 → PVNet-3.0.3}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: PVNet
3
- Version: 3.0.1
3
+ Version: 3.0.3
4
4
  Summary: PVNet
5
5
  Author: Peter Dudfield
6
6
  Author-email: info@openclimatefix.org
{PVNet-3.0.1 → PVNet-3.0.3}/PVNet.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: PVNet
3
- Version: 3.0.1
3
+ Version: 3.0.3
4
4
  Summary: PVNet
5
5
  Author: Peter Dudfield
6
6
  Author-email: info@openclimatefix.org
PVNet-3.0.3/pvnet/__init__.py ADDED
@@ -0,0 +1,2 @@
1
+ """PVNet"""
2
+ __version__ = "3.0.3"
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/base_model.py RENAMED
@@ -62,8 +62,8 @@ def make_clean_data_config(input_path, output_path, placeholder="PLACEHOLDER"):
62
62
 
63
63
  if "nwp" in config["input_data"]:
64
64
  for source in config["input_data"]["nwp"]:
65
- if config["input_data"]["nwp"][source][f"nwp_zarr_path"] != "":
66
- config["input_data"]["nwp"][source][f"nwp_zarr_path"] = f"{placeholder}.zarr"
65
+ if config["input_data"]["nwp"][source]["nwp_zarr_path"] != "":
66
+ config["input_data"]["nwp"][source]["nwp_zarr_path"] = f"{placeholder}.zarr"
67
67
 
68
68
  if "pv" in config["input_data"]:
69
69
  for d in config["input_data"]["pv"]["pv_files_groups"]:
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/multimodal.py RENAMED
@@ -343,7 +343,11 @@ class Model(BaseModel):
343
343
 
344
344
  if self.include_sun:
345
345
  sun = torch.cat(
346
- (x[BatchKey.gsp_solar_azimuth], x[BatchKey.gsp_solar_elevation]), dim=1
346
+ (
347
+ x[BatchKey[f"{self.target_key_name}_solar_azimuth"]],
348
+ x[BatchKey[f"{self.target_key_name}_solar_elevation"]],
349
+ ),
350
+ dim=1,
347
351
  ).float()
348
352
  sun = self.sun_fc1(sun)
349
353
  modes["sun"] = sun
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/multimodal/site_encoders/encoders.py RENAMED
@@ -200,6 +200,8 @@ class SingleAttentionNetwork(AbstractPVSitesEncoder):
200
200
  else:
201
201
  ids = x[BatchKey[f"{self.input_key_to_use}_id"]][:, 0]
202
202
  ids = ids.squeeze().int()
203
+ if len(ids.shape) == 2: # Batch was squeezed down to nothing
204
+ ids = ids.unsqueeze(0)
203
205
  query = self.target_id_embedding(ids).unsqueeze(1)
204
206
  return query
205
207
 
PVNet-3.0.1/pvnet/__init__.py DELETED
@@ -1,2 +0,0 @@
1
- """PVNet"""
2
- __version__ = "3.0.1"
{PVNet-3.0.1 → PVNet-3.0.3}/LICENSE RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/MANIFEST.in RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/PVNet.egg-info/SOURCES.txt RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/PVNet.egg-info/requires.txt RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/README.md RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/callbacks.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/data/__init__.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/data/base.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/data/datamodule.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/data/utils.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/__init__.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/models/utils.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/optimizers.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/training.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pvnet/utils.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/pyproject.toml RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/requirements-dev.txt RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/requirements.txt RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/setup.cfg RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/setup.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/tests/__init__.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/tests/conftest.py RENAMED
File without changes
{PVNet-3.0.1 → PVNet-3.0.3}/tests/test_end2end.py RENAMED
File without changes