PVNet 4.0.0__tar.gz → 4.0.1__tar.gz

{pvnet-4.0.0 → pvnet-4.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PVNet
-Version: 4.0.0
+Version: 4.0.1
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
@@ -138,31 +138,29 @@ OCF maintains a Zarr formatted version of the German Weather Service's (DWD)
 ICON-EU NWP model here:
 https://huggingface.co/datasets/openclimatefix/dwd-icon-eu which includes the UK
 
-Please note that the current version of [ICON loader]([url](https://github.com/openclimatefix/ocf_datapipes/blob/9ec252eeee44937c12ab52699579bdcace76e72f/ocf_datapipes/load/nwp/providers/icon.py#L9-L30)) supports a different format. If you want to use our ICON-EU dataset or your own NWP source, you can create a loader for it using [the instructions here]([url](https://github.com/openclimatefix/ocf_datapipes/tree/main/ocf_datapipes/load#nwp)).
-
 **PV**\
 OCF maintains a dataset of PV generation from 1311 private PV installations
 here: https://huggingface.co/datasets/openclimatefix/uk_pv
 
 
-### Connecting with ocf_datapipes for batch creation
+### Connecting with ocf-data-sampler for batch creation
 
-Outside the PVNet repo, clone the ocf-datapipes repo and exit the conda env created for PVNet: https://github.com/openclimatefix/ocf_datapipes
+Outside the PVNet repo, clone the ocf-data-sampler repo and exit the conda env created for PVNet: https://github.com/openclimatefix/ocf-data-sampler
 ```bash
-git clone --depth 1 https://github.com/openclimatefix/ocf_datapipes.git
-conda create -n ocf_datapipes python=3.10
+git clone --depth 1 https://github.com/openclimatefix/ocf-data-sampler.git
+conda create -n ocf-data-sampler python=3.11
 ```
 
-Then go inside the ocf_datapipes repo to add packages
+Then go inside the ocf-data-sampler repo to add packages
 
 ```bash
-pip install -r requirements.txt -r requirements-dev.txt
+pip install .
 ```
 
-Then exit this environment, and enter back into the pvnet conda environment and install ocf_datapies in editable mode (-e). This means the package is directly linked to the source code in the ocf_datapies repo.
+Then exit this environment, and enter back into the pvnet conda environment and install ocf-data-sampler in editable mode (-e). This means the package is directly linked to the source code in the ocf-data-sampler repo.
 
 ```bash
-pip install -e <PATH-TO-ocf_datapipes-REPO>
+pip install -e <PATH-TO-ocf-data-sampler-REPO>
 ```
 
 ## Generating pre-made batches of data for training/validation of PVNet
@@ -234,7 +232,7 @@ satellite:
       - "gs://public-datasets-eumetsat-solar-forecasting/satellite/EUMETSAT/SEVIRI_RSS/v4/2021_nonhrv.zarr"
 ```
 
-Datapipes are currently set up to use 11 channels from the satellite data, the 12th of which is HRV and is not included in these.
+ocf-data-sampler is currently set up to use 11 channels from the satellite data, the 12th of which is HRV and is not included in these.
 
 
 ### Training PVNet

{pvnet-4.0.0 → pvnet-4.0.1}/PVNet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PVNet
-Version: 4.0.0
+Version: 4.0.1
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
@@ -138,31 +138,29 @@ OCF maintains a Zarr formatted version of the German Weather Service's (DWD)
 ICON-EU NWP model here:
 https://huggingface.co/datasets/openclimatefix/dwd-icon-eu which includes the UK
 
-Please note that the current version of [ICON loader]([url](https://github.com/openclimatefix/ocf_datapipes/blob/9ec252eeee44937c12ab52699579bdcace76e72f/ocf_datapipes/load/nwp/providers/icon.py#L9-L30)) supports a different format. If you want to use our ICON-EU dataset or your own NWP source, you can create a loader for it using [the instructions here]([url](https://github.com/openclimatefix/ocf_datapipes/tree/main/ocf_datapipes/load#nwp)).
-
 **PV**\
 OCF maintains a dataset of PV generation from 1311 private PV installations
 here: https://huggingface.co/datasets/openclimatefix/uk_pv
 
 
-### Connecting with ocf_datapipes for batch creation
+### Connecting with ocf-data-sampler for batch creation
 
-Outside the PVNet repo, clone the ocf-datapipes repo and exit the conda env created for PVNet: https://github.com/openclimatefix/ocf_datapipes
+Outside the PVNet repo, clone the ocf-data-sampler repo and exit the conda env created for PVNet: https://github.com/openclimatefix/ocf-data-sampler
 ```bash
-git clone --depth 1 https://github.com/openclimatefix/ocf_datapipes.git
-conda create -n ocf_datapipes python=3.10
+git clone --depth 1 https://github.com/openclimatefix/ocf-data-sampler.git
+conda create -n ocf-data-sampler python=3.11
 ```
 
-Then go inside the ocf_datapipes repo to add packages
+Then go inside the ocf-data-sampler repo to add packages
 
 ```bash
-pip install -r requirements.txt -r requirements-dev.txt
+pip install .
 ```
 
-Then exit this environment, and enter back into the pvnet conda environment and install ocf_datapies in editable mode (-e). This means the package is directly linked to the source code in the ocf_datapies repo.
+Then exit this environment, and enter back into the pvnet conda environment and install ocf-data-sampler in editable mode (-e). This means the package is directly linked to the source code in the ocf-data-sampler repo.
 
 ```bash
-pip install -e <PATH-TO-ocf_datapipes-REPO>
+pip install -e <PATH-TO-ocf-data-sampler-REPO>
 ```
 
 ## Generating pre-made batches of data for training/validation of PVNet
@@ -234,7 +232,7 @@ satellite:
       - "gs://public-datasets-eumetsat-solar-forecasting/satellite/EUMETSAT/SEVIRI_RSS/v4/2021_nonhrv.zarr"
 ```
 
-Datapipes are currently set up to use 11 channels from the satellite data, the 12th of which is HRV and is not included in these.
+ocf-data-sampler is currently set up to use 11 channels from the satellite data, the 12th of which is HRV and is not included in these.
 
 
 ### Training PVNet

{pvnet-4.0.0 → pvnet-4.0.1}/README.md

@@ -89,31 +89,29 @@ OCF maintains a Zarr formatted version of the German Weather Service's (DWD)
 ICON-EU NWP model here:
 https://huggingface.co/datasets/openclimatefix/dwd-icon-eu which includes the UK
 
-Please note that the current version of [ICON loader]([url](https://github.com/openclimatefix/ocf_datapipes/blob/9ec252eeee44937c12ab52699579bdcace76e72f/ocf_datapipes/load/nwp/providers/icon.py#L9-L30)) supports a different format. If you want to use our ICON-EU dataset or your own NWP source, you can create a loader for it using [the instructions here]([url](https://github.com/openclimatefix/ocf_datapipes/tree/main/ocf_datapipes/load#nwp)).
-
 **PV**\
 OCF maintains a dataset of PV generation from 1311 private PV installations
 here: https://huggingface.co/datasets/openclimatefix/uk_pv
 
 
-### Connecting with ocf_datapipes for batch creation
+### Connecting with ocf-data-sampler for batch creation
 
-Outside the PVNet repo, clone the ocf-datapipes repo and exit the conda env created for PVNet: https://github.com/openclimatefix/ocf_datapipes
+Outside the PVNet repo, clone the ocf-data-sampler repo and exit the conda env created for PVNet: https://github.com/openclimatefix/ocf-data-sampler
 ```bash
-git clone --depth 1 https://github.com/openclimatefix/ocf_datapipes.git
-conda create -n ocf_datapipes python=3.10
+git clone --depth 1 https://github.com/openclimatefix/ocf-data-sampler.git
+conda create -n ocf-data-sampler python=3.11
 ```
 
-Then go inside the ocf_datapipes repo to add packages
+Then go inside the ocf-data-sampler repo to add packages
 
 ```bash
-pip install -r requirements.txt -r requirements-dev.txt
+pip install .
 ```
 
-Then exit this environment, and enter back into the pvnet conda environment and install ocf_datapies in editable mode (-e). This means the package is directly linked to the source code in the ocf_datapies repo.
+Then exit this environment, and enter back into the pvnet conda environment and install ocf-data-sampler in editable mode (-e). This means the package is directly linked to the source code in the ocf-data-sampler repo.
 
 ```bash
-pip install -e <PATH-TO-ocf_datapipes-REPO>
+pip install -e <PATH-TO-ocf-data-sampler-REPO>
 ```
 
 ## Generating pre-made batches of data for training/validation of PVNet
@@ -185,7 +183,7 @@ satellite:
       - "gs://public-datasets-eumetsat-solar-forecasting/satellite/EUMETSAT/SEVIRI_RSS/v4/2021_nonhrv.zarr"
 ```
 
-Datapipes are currently set up to use 11 channels from the satellite data, the 12th of which is HRV and is not included in these.
+ocf-data-sampler is currently set up to use 11 channels from the satellite data, the 12th of which is HRV and is not included in these.
 
 
 ### Training PVNet

pvnet-4.0.1/pvnet/__init__.py

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

{pvnet-4.0.0 → pvnet-4.0.1}/pvnet/data/site_datamodule.py

@@ -25,7 +25,7 @@ class SiteDataModule(BaseDataModule):
         Can also be used with pre-made batches if `sample_dir` is set.
 
         Args:
-            configuration: Path to datapipe configuration file.
+            configuration: Path to configuration file.
             sample_dir: Path to the directory of pre-saved samples. Cannot be used together with
                 `configuration` or '[train/val]_period'.
             batch_size: Batch size.

{pvnet-4.0.0 → pvnet-4.0.1}/pvnet/data/uk_regional_datamodule.py

@@ -8,7 +8,7 @@ from pvnet.data.base_datamodule import BaseDataModule, PremadeSamplesDataset
 
 
 class DataModule(BaseDataModule):
-    """Datamodule for training pvnet and using pvnet pipeline in `ocf_datapipes`."""
+    """Datamodule for training pvnet and using pvnet pipeline in `ocf-data-sampler`."""
 
     def __init__(
         self,
@@ -25,7 +25,7 @@ class DataModule(BaseDataModule):
         Can also be used with pre-made batches if `sample_dir` is set.
 
         Args:
-            configuration: Path to datapipe configuration file.
+            configuration: Path to configuration file.
             sample_dir: Path to the directory of pre-saved samples. Cannot be used together with
                 `configuration` or '[train/val]_period'.
             batch_size: Batch size.

{pvnet-4.0.0 → pvnet-4.0.1}/pvnet/models/base_model.py

@@ -42,7 +42,7 @@ def make_clean_data_config(input_path, output_path, placeholder="PLACEHOLDER"):
     """Resave the data config and replace the filepaths with a placeholder.
 
     Args:
-        input_path: Path to input datapipes configuration file
+        input_path: Path to input configuration file
         output_path: Location to save the output configuration file
         placeholder: String placeholder for data sources
     """
@@ -81,7 +81,7 @@ def minimize_data_config(input_path, output_path, model):
     """Strip out parts of the data config which aren't used by the model
 
     Args:
-        input_path: Path to input datapipes configuration file
+        input_path: Path to input configuration file
         output_path: Location to save the output configuration file
         model: The PVNet model object
     """
@@ -286,7 +286,7 @@ class PVNetModelHubMixin(PyTorchModelHubMixin):
         if isinstance(config, dict):
             (save_directory / CONFIG_NAME).write_text(json.dumps(config, indent=4))
 
-        # Save cleaned datapipes configuration file
+        # Save cleaned configuration file
         if data_config is not None:
             new_data_config_path = save_directory / DATA_CONFIG_NAME
 

{pvnet-4.0.0 → pvnet-4.0.1}/pvnet/models/model_cards/pv_india_model_card_template.md

@@ -32,7 +32,7 @@ The model is trained on data from 2019-2022 and validated on data from 2022-2023
 
 ### Preprocessing
 
-Data is prepared with the `ocf_datapipes.training.pvnet_site` datapipe [2].
+Data is prepared with the `ocf_data_sampler/torch_datasets/datasets/site` Dataset [2].
 
 
 ## Results
@@ -48,4 +48,4 @@ Trained on a single NVIDIA Tesla T4
 ### Software
 
 - [1] https://github.com/openclimatefix/PVNet
-- [2] https://github.com/openclimatefix/ocf_datapipes
+- [2] https://github.com/openclimatefix/ocf-data-sampler

{pvnet-4.0.0 → pvnet-4.0.1}/pvnet/models/model_cards/pv_uk_regional_model_card_template.md

@@ -31,7 +31,7 @@ The model is trained on data from 2019-2022 and validated on data from 2022-2023
 
 ### Preprocessing
 
-Data is prepared with the `ocf_datapipes.training.pvnet` datapipe [2].
+Data is prepared with the `ocf_data_sampler/torch_datasets/datasets/pvnet_uk` Dataset [2].
 
 
 ## Results
@@ -51,4 +51,4 @@ Trained on a single NVIDIA Tesla T4
 ### Software
 
 - [1] https://github.com/openclimatefix/PVNet
-- [2] https://github.com/openclimatefix/ocf_datapipes
+- [2] https://github.com/openclimatefix/ocf-data-sampler

{pvnet-4.0.0 → pvnet-4.0.1}/pvnet/models/model_cards/wind_india_model_card_template.md

@@ -32,7 +32,7 @@ The model is trained on data from 2019-2022 and validated on data from 2022-2023
 
 ### Preprocessing
 
-Data is prepared with the `ocf_datapipes.training.windnet` datapipe [2].
+Data is prepared with the `ocf_data_sampler/torch_datasets/datasets/site` Dataset [2].
 
 
 ## Results
@@ -48,4 +48,4 @@ Trained on a single NVIDIA Tesla T4
 ### Software
 
 - [1] https://github.com/openclimatefix/PVNet
-- [2] https://github.com/openclimatefix/ocf_datapipes
+- [2] https://github.com/openclimatefix/ocf-data-sampler

{pvnet-4.0.0 → pvnet-4.0.1}/pvnet/models/multimodal/site_encoders/encoders.py

@@ -170,7 +170,6 @@ class SingleAttentionNetwork(AbstractSitesEncoder):
         self.input_key_to_use = input_key_to_use
         self.num_channels = num_channels
         self.num_sites_in_inference = num_sites_in_inference
-        print(self.sequence_length, "SEQUENCE LENGTH")
 
         if use_id_in_value:
             self.value_id_embedding = nn.Embedding(num_sites, id_embed_dim)

{pvnet-4.0.0 → pvnet-4.0.1}/tests/test_utils.py

@@ -1,4 +1,4 @@
-from ocf_datapipes.utils.location import Location
+from ocf_data_sampler.select.location import Location
 from pvnet.utils import SiteLocationLookup
 import xarray as xr
 import pytest

pvnet-4.0.0/pvnet/__init__.py

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