PVNet 4.0.10__tar.gz → 4.1.0__tar.gz

{pvnet-4.0.10 → pvnet-4.1.0}/PKG-INFO

@@ -1,18 +1,15 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 4.0.10
+Version: 4.1.0
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf-data-sampler==0.1.16
-Requires-Dist: ocf_datapipes>=3.3.34
-Requires-Dist: ocf_ml_metrics>=0.0.11
+Requires-Dist: ocf-data-sampler>=0.2.10
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: matplotlib
 Requires-Dist: xarray
-Requires-Dist: ipykernel
 Requires-Dist: h5netcdf
 Requires-Dist: torch>=2.0.0
 Requires-Dist: lightning
@@ -24,14 +21,11 @@ Requires-Dist: sqlalchemy
 Requires-Dist: fsspec[s3]
 Requires-Dist: wandb
 Requires-Dist: huggingface-hub
-Requires-Dist: tensorboard
 Requires-Dist: tqdm
 Requires-Dist: omegaconf
 Requires-Dist: hydra-core
-Requires-Dist: python-dotenv
-Requires-Dist: hydra-optuna-sweeper
 Requires-Dist: rich
-Requires-Dist: gcsfs
+Requires-Dist: einops
 Provides-Extra: dev
 Requires-Dist: pvlive-api; extra == "dev"
 Requires-Dist: ruff; extra == "dev"

{pvnet-4.0.10 → pvnet-4.1.0}/PVNet.egg-info/PKG-INFO

@@ -1,18 +1,15 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 4.0.10
+Version: 4.1.0
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf-data-sampler==0.1.16
-Requires-Dist: ocf_datapipes>=3.3.34
-Requires-Dist: ocf_ml_metrics>=0.0.11
+Requires-Dist: ocf-data-sampler>=0.2.10
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: matplotlib
 Requires-Dist: xarray
-Requires-Dist: ipykernel
 Requires-Dist: h5netcdf
 Requires-Dist: torch>=2.0.0
 Requires-Dist: lightning
@@ -24,14 +21,11 @@ Requires-Dist: sqlalchemy
 Requires-Dist: fsspec[s3]
 Requires-Dist: wandb
 Requires-Dist: huggingface-hub
-Requires-Dist: tensorboard
 Requires-Dist: tqdm
 Requires-Dist: omegaconf
 Requires-Dist: hydra-core
-Requires-Dist: python-dotenv
-Requires-Dist: hydra-optuna-sweeper
 Requires-Dist: rich
-Requires-Dist: gcsfs
+Requires-Dist: einops
 Provides-Extra: dev
 Requires-Dist: pvlive-api; extra == "dev"
 Requires-Dist: ruff; extra == "dev"

{pvnet-4.0.10 → pvnet-4.1.0}/PVNet.egg-info/requires.txt

@@ -1,11 +1,8 @@
-ocf-data-sampler==0.1.16
-ocf_datapipes>=3.3.34
-ocf_ml_metrics>=0.0.11
+ocf-data-sampler>=0.2.10
 numpy
 pandas
 matplotlib
 xarray
-ipykernel
 h5netcdf
 torch>=2.0.0
 lightning
@@ -17,14 +14,11 @@ sqlalchemy
 fsspec[s3]
 wandb
 huggingface-hub
-tensorboard
 tqdm
 omegaconf
 hydra-core
-python-dotenv
-hydra-optuna-sweeper
 rich
-gcsfs
+einops
 
 [all]
 PVNet[all_models,dev]

pvnet-4.1.0/pvnet/__init__.py

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

{pvnet-4.0.10 → pvnet-4.1.0}/pvnet/data/base_datamodule.py

@@ -4,7 +4,7 @@ from glob import glob
 
 from lightning.pytorch import LightningDataModule
 from ocf_data_sampler.numpy_sample.collate import stack_np_samples_into_batch
-from ocf_data_sampler.sample.base import (
+from ocf_data_sampler.torch_datasets.sample.base import (
     NumpyBatch,
     SampleBase,
     TensorBatch,

{pvnet-4.0.10 → pvnet-4.1.0}/pvnet/data/site_datamodule.py

@@ -1,7 +1,7 @@
 """ Data module for pytorch lightning """
 
-from ocf_data_sampler.sample.site import SiteSample
 from ocf_data_sampler.torch_datasets.datasets.site import SitesDataset
+from ocf_data_sampler.torch_datasets.sample.site import SiteSample
 from torch.utils.data import Dataset
 
 from pvnet.data.base_datamodule import BaseDataModule, PremadeSamplesDataset

{pvnet-4.0.10 → pvnet-4.1.0}/pvnet/data/uk_regional_datamodule.py

@@ -1,7 +1,7 @@
 """ Data module for pytorch lightning """
 
-from ocf_data_sampler.sample.uk_regional import UKRegionalSample
 from ocf_data_sampler.torch_datasets.datasets.pvnet_uk import PVNetUKRegionalDataset
+from ocf_data_sampler.torch_datasets.sample.uk_regional import UKRegionalSample
 from torch.utils.data import Dataset
 
 from pvnet.data.base_datamodule import BaseDataModule, PremadeSamplesDataset

{pvnet-4.0.10 → pvnet-4.1.0}/pvnet/models/base_model.py

@@ -20,7 +20,7 @@ from huggingface_hub import ModelCard, ModelCardData, PyTorchModelHubMixin
 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 ocf_data_sampler.sample.base import copy_batch_to_device
+from ocf_data_sampler.torch_datasets.sample.base import copy_batch_to_device
 
 from pvnet.models.utils import (
     BatchAccumulator,

{pvnet-4.0.10 → pvnet-4.1.0}/pvnet/training.py

@@ -145,10 +145,11 @@ def train(config: DictConfig) -> Optional[float]:
         callbacks=callbacks,
     )
 
+    # TODO: remove this option
     if should_pretrain:
         # Pre-train the model
         raise NotImplementedError("Pre-training is not yet supported")
-        # The parameter `block_nwp_and_sat` has been removed from datapipes
+        # The parameter `block_nwp_and_sat` is not available in data-sampler
         # If pretraining is re-supported in the future it is likely any pre-training logic should
         # go here or perhaps in the callbacks
         # datamodule.block_nwp_and_sat = True

{pvnet-4.0.10 → pvnet-4.1.0}/pyproject.toml

@@ -6,14 +6,11 @@ dynamic = ["version", "readme"]
 license={file="LICENCE"}
 
 dependencies = [
-    "ocf-data-sampler==0.1.16",
-    "ocf_datapipes>=3.3.34",
-    "ocf_ml_metrics>=0.0.11",
+    "ocf-data-sampler>=0.2.10",
     "numpy",
     "pandas",
     "matplotlib",
     "xarray",
-    "ipykernel",
     "h5netcdf",
     "torch>=2.0.0",
     "lightning",
@@ -25,14 +22,11 @@ dependencies = [
     "fsspec[s3]",
     "wandb",
     "huggingface-hub",
-    "tensorboard",
     "tqdm",
     "omegaconf",
     "hydra-core",
-    "python-dotenv",
-    "hydra-optuna-sweeper",
     "rich",
-    "gcsfs",# gcsfs is only needed when getting data from Google Cloud Storage
+    "einops",
 ]
 
 [tool.setuptools.dynamic]

pvnet-4.0.10/pvnet/__init__.py

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