PVNet 2.5.1__tar.gz → 2.6.1__tar.gz

{PVNet-2.5.1 → PVNet-2.6.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 2.5.1
+Version: 2.6.1
 Summary: PVNet
 Author: Peter Dudfield
 Author-email: info@openclimatefix.org
 License: MIT
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf_datapipes>=2.3.0
+Requires-Dist: ocf_datapipes>=3.0.0
 Requires-Dist: ocf_ml_metrics
 Requires-Dist: numpy
 Requires-Dist: pandas

{PVNet-2.5.1 → PVNet-2.6.1}/PVNet.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 2.5.1
+Version: 2.6.1
 Summary: PVNet
 Author: Peter Dudfield
 Author-email: info@openclimatefix.org
 License: MIT
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf_datapipes>=2.3.0
+Requires-Dist: ocf_datapipes>=3.0.0
 Requires-Dist: ocf_ml_metrics
 Requires-Dist: numpy
 Requires-Dist: pandas

{PVNet-2.5.1 → PVNet-2.6.1}/PVNet.egg-info/requires.txt

@@ -1,4 +1,4 @@
-ocf_datapipes>=2.3.0
+ocf_datapipes>=3.0.0
 ocf_ml_metrics
 numpy
 pandas

PVNet-2.6.1/pvnet/__init__.py

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

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/data/utils.py

@@ -1,8 +1,7 @@
 """Utils common between Wind and PV datamodules"""
 import numpy as np
 import torch
-from ocf_datapipes.batch import unstack_np_batch_into_examples
-from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.batch import BatchKey, unstack_np_batch_into_examples
 from torch.utils.data import IterDataPipe, functional_datapipe
 
 

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/models/base_model.py

@@ -17,7 +17,7 @@ from huggingface_hub.constants import CONFIG_NAME, PYTORCH_WEIGHTS_NAME
 from huggingface_hub.file_download import hf_hub_download
 from huggingface_hub.hf_api import HfApi
 from huggingface_hub.utils._deprecation import _deprecate_positional_args
-from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.batch import BatchKey
 from ocf_ml_metrics.evaluation.evaluation import evaluation
 from ocf_ml_metrics.metrics.errors import common_metrics
 
@@ -370,7 +370,7 @@ class BaseModel(pl.LightningModule, PVNetModelHubMixin):
             # Take median value for remaining metric calculations
             y_hat = self._quantiles_to_prediction(y_hat)
 
-        common_metrics_each_step = common_metrics(predictions=y_hat, targets=y)
+        common_metrics_each_step = common_metrics(predictions=y_hat, target=y)
         mse_each_step = common_metrics_each_step["rmse"] ** 2
         mae_each_step = common_metrics_each_step["mae"]
 

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/models/baseline/last_value.py

@@ -1,6 +1,6 @@
 """Persistence model"""
 
-from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.batch import BatchKey
 
 import pvnet
 from pvnet.models.base_model import BaseModel

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/models/baseline/single_value.py

@@ -1,6 +1,6 @@
 """Average value model"""
 import torch
-from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.batch import BatchKey
 from torch import nn
 
 import pvnet

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/models/multimodal/deep_supervision.py

@@ -5,7 +5,7 @@ from typing import Optional
 
 import torch
 import torch.nn.functional as F
-from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.batch import BatchKey
 from torch import nn
 
 import pvnet

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/models/multimodal/multimodal.py

@@ -4,7 +4,7 @@ from collections import OrderedDict
 from typing import Optional
 
 import torch
-from ocf_datapipes.utils.consts import BatchKey, NWPBatchKey
+from ocf_datapipes.batch import BatchKey, NWPBatchKey
 from torch import nn
 
 import pvnet

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/models/multimodal/nwp_weighting.py

@@ -2,7 +2,7 @@
 from typing import Optional
 
 import torch
-from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.batch import BatchKey
 from torch import nn
 
 import pvnet

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/models/multimodal/site_encoders/encoders.py

@@ -3,7 +3,7 @@
 """
 
 import torch
-from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.batch import BatchKey
 from torch import nn
 
 from pvnet.models.multimodal.linear_networks.networks import ResFCNet2

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/models/multimodal/weather_residual.py

@@ -4,7 +4,7 @@ from typing import Optional
 
 import torch
 import torch.nn.functional as F
-from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.batch import BatchKey
 from torch import nn
 
 import pvnet

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/models/utils.py

@@ -6,7 +6,7 @@ from typing import Optional
 
 import numpy as np
 import torch
-from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.batch import BatchKey
 
 logger = logging.getLogger(__name__)
 

{PVNet-2.5.1 → PVNet-2.6.1}/pvnet/utils.py

@@ -15,7 +15,8 @@ import xarray as xr
 import yaml
 from lightning.pytorch.loggers import Logger
 from lightning.pytorch.utilities import rank_zero_only
-from ocf_datapipes.utils.consts import BatchKey, Location
+from ocf_datapipes.batch import BatchKey
+from ocf_datapipes.utils import Location
 from ocf_datapipes.utils.geospatial import osgb_to_lon_lat
 from omegaconf import DictConfig, OmegaConf
 

{PVNet-2.5.1 → PVNet-2.6.1}/requirements.txt

@@ -1,4 +1,4 @@
-ocf_datapipes>=2.3.0
+ocf_datapipes>=3.0.0
 ocf_ml_metrics
 numpy
 pandas

{PVNet-2.5.1 → PVNet-2.6.1}/tests/conftest.py

@@ -7,7 +7,7 @@ import xarray as xr
 import torch
 import hydra
 
-from ocf_datapipes.utils.consts import BatchKey
+from ocf_datapipes.batch import BatchKey
 from datetime import timedelta
 
 import pvnet

PVNet-2.5.1/pvnet/__init__.py

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