Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fengwu ghr training #125

Merged
merged 54 commits into from
Sep 23, 2024
Merged
Changes from 22 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
cb70551
fengwu_ghr: initial
rnwzd May 29, 2024
9eaf70d
fengwu_ghr: fixes
rnwzd May 29, 2024
4f3d4c1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 29, 2024
8c60fb7
Interpolate initial
rnwzd Jun 6, 2024
725421d
ImageMetaModel
rnwzd Jun 11, 2024
c57a27e
MetaModel initial
rnwzd Jun 11, 2024
3d2a17d
tested metamodel
rnwzd Jun 14, 2024
48e7d0a
Merge branch 'main' into fengwu_ghr
rnwzd Jun 17, 2024
87d1ffd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 17, 2024
21d84c7
wrapper meta model
rnwzd Jun 21, 2024
07a8d0f
RES
rnwzd Jul 1, 2024
cd84968
load RES state_dict
rnwzd Jul 2, 2024
e0f60ca
Merge branch 'main' of https://github.com/openclimatefix/graph_weathe…
rnwzd Jul 2, 2024
b15110f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 2, 2024
1146db9
bug fix
rnwzd Jul 2, 2024
499ef7d
Merge branch 'fengwu_ghr' of https://github.com/openclimatefix/graph_…
rnwzd Jul 2, 2024
fe82edc
Merge branch 'main' of https://github.com/openclimatefix/graph_weathe…
rnwzd Jul 2, 2024
325fd0e
bug fix
rnwzd Jul 2, 2024
cfa9c3f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 2, 2024
2fadf97
env yml fix
rnwzd Jul 29, 2024
0f46d7a
Merge branch 'fengwu_ghr' of https://github.com/openclimatefix/graph_…
rnwzd Jul 29, 2024
257b353
fengwu_ghr: initial
rnwzd May 29, 2024
04d4776
Merge branch 'fengwu_ghr' of https://github.com/openclimatefix/graph_…
rnwzd Jul 29, 2024
f72c610
test_wrapper_meta_model
rnwzd Jul 29, 2024
8a8ac64
tests fix
rnwzd Jul 30, 2024
6f0c61b
parent 743cf9704eea03353e02351cde52add7233437d6
rnwzd May 29, 2024
1ae62eb
Merge branch 'fengwu_ghr' of https://github.com/openclimatefix/graph_…
rnwzd Jul 30, 2024
a855c6a
fengwu_ghr: initial
rnwzd May 29, 2024
47d0d48
fengwu_ghr: initial
rnwzd May 29, 2024
7a1d562
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 29, 2024
e397941
Interpolate initial
rnwzd Jun 6, 2024
80a73ee
ImageMetaModel
rnwzd Jun 11, 2024
127d8ff
MetaModel initial
rnwzd Jun 11, 2024
b59e54d
tested metamodel
rnwzd Jun 14, 2024
19e73a2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 17, 2024
e54016f
wrapper meta model
rnwzd Jun 21, 2024
dae738e
RES
rnwzd Jul 1, 2024
92acbee
load RES state_dict
rnwzd Jul 2, 2024
5115dd4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 2, 2024
8a6a062
Merge branch 'fengwu_ghr' of https://github.com/openclimatefix/graph_…
rnwzd Jul 30, 2024
362acdc
added gcsfs to env yml
rnwzd Aug 1, 2024
4dc0dc5
__init__.py imports
rnwzd Aug 7, 2024
31ee1e9
MetaModel long coordinates
rnwzd Aug 15, 2024
2970757
knn_interpolate gpu patch
rnwzd Aug 15, 2024
9f84835
era5 training
rnwzd Sep 3, 2024
b9c1e30
era5 training bugfix
rnwzd Sep 9, 2024
eba1335
lora training
rnwzd Sep 18, 2024
0cfbf40
Merge branch 'main' of https://github.com/openclimatefix/graph_weathe…
rnwzd Sep 18, 2024
7915c9b
pkg does not exist
rnwzd Sep 18, 2024
085ae70
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 18, 2024
8944050
env.yml bugfix
rnwzd Sep 19, 2024
968b908
Update environment_cpu.yml
jacobbieker Sep 23, 2024
7eb323a
Update environment_cuda.yml
jacobbieker Sep 23, 2024
384d99e
Update environment_cuda.yml
jacobbieker Sep 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 0 additions & 90 deletions graph_weather/models/fengwu_ghr/layers.py
Original file line number Diff line number Diff line change
@@ -363,93 +363,3 @@ def forward(self, x):
x = rearrange(x, "n (b c) -> b n c", b=b, c=c)

return x

class MetaModel(nn.Module):
def __init__(
self,
lat_lons: list,
*,
image_size,
patch_size,
depth,
heads,
mlp_dim,
channels,
dim_head=64
):
super().__init__()
self.i_h, self.i_w = pair(image_size)

self.pos_x = torch.tensor(lat_lons)
self.pos_y = torch.cartesian_prod(
(torch.arange(-self.i_h / 2, self.i_h / 2, 1) / self.i_h * 180).to(torch.long),
(torch.arange(0, self.i_w, 1) / self.i_w * 360).to(torch.long),
)

self.image_meta_model = ImageMetaModel(
image_size=image_size,
patch_size=patch_size,
depth=depth,
heads=heads,
mlp_dim=mlp_dim,
channels=channels,
dim_head=dim_head,
)

def forward(self, x):
b, n, c = x.shape

x = rearrange(x, "b n c -> n (b c)")
x = knn_interpolate(x, self.pos_x, self.pos_y)
x = rearrange(x, "(h w) (b c) -> b c h w", b=b, c=c, h=self.i_h, w=self.i_w)
x = self.image_meta_model(x)

x = rearrange(x, "b c h w -> (h w) (b c)")
x = knn_interpolate(x, self.pos_y, self.pos_x)
x = rearrange(x, "n (b c) -> b n c", b=b, c=c)
return x


class WrapperMetaModel(nn.Module):
def __init__(
self,
lat_lons: list,
meta_model: MetaModel,
scale_factor
):
super().__init__()
s_h, s_w = pair(scale_factor)
self.i_h, self.i_w = meta_model.i_h * s_h, meta_model.i_w * s_w
self.pos_x = torch.tensor(lat_lons)
self.pos_y = torch.cartesian_prod(
(torch.arange(-self.i_h / 2, self.i_h / 2, 1) / self.i_h * 180).to(torch.long),
(torch.arange(0, self.i_w, 1) / self.i_w * 360).to(torch.long),
)

self.batcher = Rearrange("b c (h s_h) (w s_w) -> (b s_h s_w) c h w", s_h=s_h, s_w=s_w)

imm_args = vars(meta_model.image_meta_model)
imm_args.update({"res": True, "scale_factor": scale_factor})
self.image_meta_model = ImageMetaModel(**imm_args)
self.image_meta_model.load_state_dict(
meta_model.image_meta_model.state_dict(), strict=False
)

self.debatcher = Rearrange("(b s_h s_w) c h w -> b c (h s_h) (w s_w)", s_h=s_h, s_w=s_w)

def forward(self, x):
b, n, c = x.shape

x = rearrange(x, "b n c -> n (b c)")
x = knn_interpolate(x, self.pos_x, self.pos_y)
x = rearrange(x, "(h w) (b c) -> b c h w", b=b, c=c, h=self.i_h, w=self.i_w)

x = self.batcher(x)
x = self.image_meta_model(x)
x = self.debatcher(x)

x = rearrange(x, "b c h w -> (h w) (b c)")
x = knn_interpolate(x, self.pos_y, self.pos_x)
x = rearrange(x, "n (b c) -> b n c", b=b, c=c)

return x