Skip to content

Commit 3f769ea

Browse files
dfuludfulu
authored
Merge pull request #317 from openclimatefix/data_sampler_concurrent_samples
Add save concurrent samples script
2 parents 79dca28 + f1c7792 commit 3f769ea

File tree

7 files changed

+327
-175
lines changed

7 files changed

+327
-175
lines changed

‎.all-contributorsrc‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
{
2+
"files": [
3+
"README.md"
4+
],
5+
"imageSize": 100,
6+
"commit": false,
7+
"commitType": "docs",
8+
"commitConvention": "angular",
9+
"contributors": [
10+
{
11+
"login": "felix-e-h-p",
12+
"name": "Felix",
13+
"avatar_url": "https://avatars.githubusercontent.com/u/137530077?v=4",
14+
"profile": "https://github.com/felix-e-h-p",
15+
"contributions": [
16+
"code"
17+
]
18+
},
19+
{
20+
"login": "Sukh-P",
21+
"name": "Sukhil Patel",
22+
"avatar_url": "https://avatars.githubusercontent.com/u/42407101?v=4",
23+
"profile": "https://github.com/Sukh-P",
24+
"contributions": [
25+
"code"
26+
]
27+
},
28+
{
29+
"login": "dfulu",
30+
"name": "James Fulton",
31+
"avatar_url": "https://avatars.githubusercontent.com/u/41546094?v=4",
32+
"profile": "https://github.com/dfulu",
33+
"contributions": [
34+
"code"
35+
]
36+
},
37+
{
38+
"login": "AUdaltsova",
39+
"name": "Alexandra Udaltsova",
40+
"avatar_url": "https://avatars.githubusercontent.com/u/43303448?v=4",
41+
"profile": "https://github.com/AUdaltsova",
42+
"contributions": [
43+
"code"
44+
]
45+
},
46+
{
47+
"login": "zakwatts",
48+
"name": "Megawattz",
49+
"avatar_url": "https://avatars.githubusercontent.com/u/47150349?v=4",
50+
"profile": "https://github.com/zakwatts",
51+
"contributions": [
52+
"code"
53+
]
54+
},
55+
{
56+
"login": "peterdudfield",
57+
"name": "Peter Dudfield",
58+
"avatar_url": "https://avatars.githubusercontent.com/u/34686298?v=4",
59+
"profile": "https://github.com/peterdudfield",
60+
"contributions": [
61+
"code"
62+
]
63+
},
64+
{
65+
"login": "mahdilamb",
66+
"name": "Mahdi Lamb",
67+
"avatar_url": "https://avatars.githubusercontent.com/u/4696915?v=4",
68+
"profile": "https://github.com/mahdilamb",
69+
"contributions": [
70+
"infra"
71+
]
72+
},
73+
{
74+
"login": "jacobbieker",
75+
"name": "Jacob Prince-Bieker",
76+
"avatar_url": "https://avatars.githubusercontent.com/u/7170359?v=4",
77+
"profile": "https://www.jacobbieker.com",
78+
"contributions": [
79+
"code"
80+
]
81+
}
82+
],
83+
"contributorsPerLine": 7,
84+
"skipCi": true,
85+
"repoType": "github",
86+
"repoHost": "https://github.com",
87+
"projectName": "PVNet",
88+
"projectOwner": "openclimatefix"
89+
}

‎README.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# PVNet 2.1
2+
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
3+
[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
4+
<!-- ALL-CONTRIBUTORS-BADGE:END -->
25

36
[![Python Bump Version & release](https://github.com/openclimatefix/PVNet/actions/workflows/release.yml/badge.svg)](https://github.com/openclimatefix/PVNet/actions/workflows/release.yml) [![ease of contribution: hard](https://img.shields.io/badge/ease%20of%20contribution:%20hard-bb2629)](https://github.com/openclimatefix/ocf-meta-repo?tab=readme-ov-file#overview-of-ocfs-nowcasting-repositories)
47

@@ -231,3 +234,34 @@ If you have successfully trained a PVNet model and have a saved model checkpoint
231234
## Testing
232235

233236
You can use `python -m pytest tests` to run tests
237+
238+
## Contributors ✨
239+
240+
Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
241+
242+
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
243+
<!-- prettier-ignore-start -->
244+
<!-- markdownlint-disable -->
245+
<table>
246+
<tbody>
247+
<tr>
248+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/felix-e-h-p"><img src="https://avatars.githubusercontent.com/u/137530077?v=4?s=100" width="100px;" alt="Felix"/><br /><sub><b>Felix</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=felix-e-h-p" title="Code">💻</a></td>
249+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Sukh-P"><img src="https://avatars.githubusercontent.com/u/42407101?v=4?s=100" width="100px;" alt="Sukhil Patel"/><br /><sub><b>Sukhil Patel</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=Sukh-P" title="Code">💻</a></td>
250+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/dfulu"><img src="https://avatars.githubusercontent.com/u/41546094?v=4?s=100" width="100px;" alt="James Fulton"/><br /><sub><b>James Fulton</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=dfulu" title="Code">💻</a></td>
251+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AUdaltsova"><img src="https://avatars.githubusercontent.com/u/43303448?v=4?s=100" width="100px;" alt="Alexandra Udaltsova"/><br /><sub><b>Alexandra Udaltsova</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=AUdaltsova" title="Code">💻</a></td>
252+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/zakwatts"><img src="https://avatars.githubusercontent.com/u/47150349?v=4?s=100" width="100px;" alt="Megawattz"/><br /><sub><b>Megawattz</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=zakwatts" title="Code">💻</a></td>
253+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/peterdudfield"><img src="https://avatars.githubusercontent.com/u/34686298?v=4?s=100" width="100px;" alt="Peter Dudfield"/><br /><sub><b>Peter Dudfield</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=peterdudfield" title="Code">💻</a></td>
254+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mahdilamb"><img src="https://avatars.githubusercontent.com/u/4696915?v=4?s=100" width="100px;" alt="Mahdi Lamb"/><br /><sub><b>Mahdi Lamb</b></sub></a><br /><a href="#infra-mahdilamb" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
255+
</tr>
256+
<tr>
257+
<td align="center" valign="top" width="14.28%"><a href="https://www.jacobbieker.com"><img src="https://avatars.githubusercontent.com/u/7170359?v=4?s=100" width="100px;" alt="Jacob Prince-Bieker"/><br /><sub><b>Jacob Prince-Bieker</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=jacobbieker" title="Code">💻</a></td>
258+
</tr>
259+
</tbody>
260+
</table>
261+
262+
<!-- markdownlint-restore -->
263+
<!-- prettier-ignore-end -->
264+
265+
<!-- ALL-CONTRIBUTORS-LIST:END -->
266+
267+
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

‎experiments/mae_analysis.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,26 @@
77

88
import argparse
99

10+
import matplotlib
1011
import matplotlib.pyplot as plt
1112
import numpy as np
1213
import pandas as pd
1314
import wandb
1415

16+
matplotlib.rcParams["axes.prop_cycle"] = matplotlib.cycler(
17+
color=[
18+
"FFD053", # yellow
19+
"7BCDF3", # blue
20+
"63BCAF", # teal
21+
"086788", # dark blue
22+
"FF9736", # dark orange
23+
"E4E4E4", # grey
24+
"14120E", # black
25+
"FFAC5F", # orange
26+
"4C9A8E", # dark teal
27+
]
28+
)
29+
1530

1631
def main(project: str, runs: list[str], run_names: list[str]) -> None:
1732
"""

‎pvnet/data/uk_regional_datamodule.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
""" Data module for pytorch lightning """
22

33
from ocf_data_sampler.sample.uk_regional import UKRegionalSample
4-
from ocf_data_sampler.torch_datasets.datasets.pvnet_uk_regional import PVNetUKRegionalDataset
4+
from ocf_data_sampler.torch_datasets.datasets.pvnet_uk import PVNetUKRegionalDataset
55
from torch.utils.data import Dataset
66

77
from pvnet.data.base_datamodule import BaseDataModule, PremadeSamplesDataset

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dynamic = ["version", "readme"]
66
license={file="LICENCE"}
77

88
dependencies = [
9-
"ocf_data_sampler==0.0.54",
9+
"ocf_data_sampler==0.1.2",
1010
"ocf_datapipes>=3.3.34",
1111
"ocf_ml_metrics>=0.0.11",
1212
"numpy",

‎scripts/save_concurrent_batches.py‎

Lines changed: 0 additions & 173 deletions
This file was deleted.

0 commit comments

Comments
 (0)