From f4c1c93b11ccd71213491a1fded3bb38be02e99a Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Wed, 24 Jul 2024 09:47:49 +0100 Subject: [PATCH 1/3] update pvnet model in tests --- pyproject.toml | 2 +- tests/conftest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 213e4a7..e6bc4b4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ dependencies = [ "omegaconf", "hydra-core", "python-dotenv", - "huggingface-hub==0.20.*", + "huggingface-hub", "geopandas==0.14.4", ] diff --git a/tests/conftest.py b/tests/conftest.py index 951fd85..0069a49 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -137,8 +137,8 @@ def sample_batch(sample_datamodule): def flat_model_kwargs(): kwargs = dict( # These kwargs define the pvnet model which the summation model uses - model_name="openclimatefix/pvnet_v2", - model_version="4203e12e719efd93da641c43d2e38527648f4915", + model_name="openclimatefix/pvnet_uk_region", + model_version="aa73cdafd1db8df3c8b7f5ecfdb160989e7639ac", # These kwargs define the structure of the summation model output_network=dict( _target_="pvnet.models.multimodal.linear_networks.networks.ResFCNet2", From 067283a960e935afc869ffe0fe4ad167526bd4fb Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Fri, 26 Jul 2024 09:03:02 +0100 Subject: [PATCH 2/3] fix --- pvnet_summation/models/base_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvnet_summation/models/base_model.py b/pvnet_summation/models/base_model.py index 5629bc0..4ec5782 100644 --- a/pvnet_summation/models/base_model.py +++ b/pvnet_summation/models/base_model.py @@ -50,7 +50,7 @@ def __init__( self.pvnet_model_version = model_version self.pvnet_model = PVNetBaseModel.from_pretrained( - model_name, + model_id=model_name, revision=model_version, ) self.pvnet_model.requires_grad_(False) From 2d3ba9a8a60b437314aed81d7739fad6ad19968f Mon Sep 17 00:00:00 2001 From: peterdudfield Date: Fri, 26 Jul 2024 10:31:02 +0100 Subject: [PATCH 3/3] update pvnet model --- tests/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 0069a49..951fd85 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -137,8 +137,8 @@ def sample_batch(sample_datamodule): def flat_model_kwargs(): kwargs = dict( # These kwargs define the pvnet model which the summation model uses - model_name="openclimatefix/pvnet_uk_region", - model_version="aa73cdafd1db8df3c8b7f5ecfdb160989e7639ac", + model_name="openclimatefix/pvnet_v2", + model_version="4203e12e719efd93da641c43d2e38527648f4915", # These kwargs define the structure of the summation model output_network=dict( _target_="pvnet.models.multimodal.linear_networks.networks.ResFCNet2",