From 0eca942173729ac146d87afa0462df96d6c3d871 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Wed, 23 Oct 2024 12:43:32 +0200 Subject: [PATCH 01/36] make pip installable, move to proper package folder --- config.py => prithviwxc/gravitywave/config.py | 0 .../gravitywave/datamodule.py | 0 .../gravitywave/distributed.py | 0 .../gravitywave/finetune_gravity_wave.py | 0 .../gravitywave/gravity_wave_model.py | 0 .../gravitywave/inference.py | 0 prithviwxc/gravitywave/init.py | 0 setup.py | 61 +++++++++++++++++++ 8 files changed, 61 insertions(+) rename config.py => prithviwxc/gravitywave/config.py (100%) rename datamodule.py => prithviwxc/gravitywave/datamodule.py (100%) rename distributed.py => prithviwxc/gravitywave/distributed.py (100%) rename finetune_gravity_wave.py => prithviwxc/gravitywave/finetune_gravity_wave.py (100%) rename gravity_wave_model.py => prithviwxc/gravitywave/gravity_wave_model.py (100%) rename inference.py => prithviwxc/gravitywave/inference.py (100%) create mode 100644 prithviwxc/gravitywave/init.py create mode 100644 setup.py diff --git a/config.py b/prithviwxc/gravitywave/config.py similarity index 100% rename from config.py rename to prithviwxc/gravitywave/config.py diff --git a/datamodule.py b/prithviwxc/gravitywave/datamodule.py similarity index 100% rename from datamodule.py rename to prithviwxc/gravitywave/datamodule.py diff --git a/distributed.py b/prithviwxc/gravitywave/distributed.py similarity index 100% rename from distributed.py rename to prithviwxc/gravitywave/distributed.py diff --git a/finetune_gravity_wave.py b/prithviwxc/gravitywave/finetune_gravity_wave.py similarity index 100% rename from finetune_gravity_wave.py rename to prithviwxc/gravitywave/finetune_gravity_wave.py diff --git a/gravity_wave_model.py b/prithviwxc/gravitywave/gravity_wave_model.py similarity index 100% rename from gravity_wave_model.py rename to prithviwxc/gravitywave/gravity_wave_model.py diff --git a/inference.py b/prithviwxc/gravitywave/inference.py similarity index 100% rename from inference.py rename to prithviwxc/gravitywave/inference.py diff --git a/prithviwxc/gravitywave/init.py b/prithviwxc/gravitywave/init.py new file mode 100644 index 0000000..e69de29 diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..b755a84 --- /dev/null +++ b/setup.py @@ -0,0 +1,61 @@ +from setuptools import setup +setup( + name="prithviwxc-gravitywave", + version="0.1.0", + packages=["prithviwxc.gravitywave"], + author="Sujit Roy", + author_email="sr0197@uah.edu", + description="Gravity Wave Parameterization", + long_description=open("README.md").read(), + long_description_content_type="text/markdown", + url="https://github.com/NASA-IMPACT/gravity-wave-finetuning", + classifiers=[ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", + ], + python_requires='>=3.11', + install_requires=[ + "cachetools==5.5.0", + "cartopy==0.23.0", + "click==8.1.7", + "cloudpickle==3.0.0", + "contourpy==1.3.0", + "cycler==0.12.1", + "dask==2024.8.1", + "docker-pycreds==0.4.0", + "fonttools==4.53.1", + "fsspec==2024.6.1", + "gitdb==4.0.11", + "gitpython==3.1.43", + "h5netcdf==1.3.0", + "h5py==3.11.0", + "kiwisolver==1.4.7", + "locket==1.0.0", + "matplotlib==3.9.2", + "nvidia-ml-py==12.535.161", + "nvitop==1.3.2", + "pandas==2.2.2", + "partd==1.4.2", + "platformdirs==4.2.2", + "protobuf==5.27.3", + "pyhelpme==0.1", + "pyparsing==3.1.4", + "pyproj==3.6.1", + "pyshp==2.3.1", + "python-dateutil==2.9.0.post0", + "pytz==2024.1", + "sentry-sdk==2.13.0", + "setproctitle==1.3.3", + "shapely==2.0.6", + "smmap==5.0.1", + "tabulate==0.9.0", + "termcolor==2.4.0", + "toolz==0.12.1", + "tqdm==4.66.5", + "tzdata==2024.1", + "wandb==0.17.7", + "xarray==2024.7.0", + "yacs==0.1.8", + ], +) From 2d8bd5984636d66744f5789d5289fde022da015b Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Wed, 23 Oct 2024 15:52:25 -0400 Subject: [PATCH 02/36] fix dependencies --- setup.py | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b755a84..2eb6aa4 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ "pandas==2.2.2", "partd==1.4.2", "platformdirs==4.2.2", - "protobuf==5.27.3", + "protobuf", "pyhelpme==0.1", "pyparsing==3.1.4", "pyproj==3.6.1", @@ -57,5 +57,35 @@ "wandb==0.17.7", "xarray==2024.7.0", "yacs==0.1.8", + "asttokens==2.4.1", + "brotli==1.0.9", + "certifi==2024.8.30", + "charset-normalizer==3.3.2", + "comm==0.2.2", + "debugpy==1.8.5", + "decorator==5.1.1", + "exceptiongroup==1.2.2", + "executing==2.1.0", + "filelock==3.13.1", + "idna==3.7", + "importlib-metadata==8.4.0", + "intel-openmp==2023.1.0", + "ipykernel==6.29.5", + "ipython==8.27.0", + "jedi==0.19.1", + "jinja2==3.1.4", + "jupyter_client==8.6.2", + "jupyter_core==5.7.2", + "markupsafe==2.1.3", + "matplotlib-inline==0.1.7", + "mkl==2023.2.0", + "mpmath==1.3.0", + "numpy==1.26.4", + "protobuf==4.25.3", + "scipy==1.13.1", + "torch", + "torchaudio", + "torchvision", + "yacs==0.1.8", ], ) From 00312256f3a2b975a7a7c6de96cc0e1d01eb1604 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Wed, 23 Oct 2024 22:16:12 +0200 Subject: [PATCH 03/36] externalize config --- requirements.txt | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..fdbbbf4 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,41 @@ +cachetools==5.5.0 +cartopy==0.23.0 +click==8.1.7 +cloudpickle==3.0.0 +contourpy==1.3.0 +cycler==0.12.1 +dask==2024.8.1 +docker-pycreds==0.4.0 +fonttools==4.53.1 +fsspec==2024.6.1 +gitdb==4.0.11 +gitpython==3.1.43 +h5netcdf==1.3.0 +h5py==3.11.0 +kiwisolver==1.4.7 +locket==1.0.0 +matplotlib==3.9.2 +nvidia-ml-py==12.535.161 +nvitop==1.3.2 +pandas==2.2.2 +partd==1.4.2 +platformdirs==4.2.2 +protobuf==5.27.3 +pyhelpme==0.1 +pyparsing==3.1.4 +pyproj==3.6.1 +pyshp==2.3.1 +python-dateutil==2.9.0.post0 +pytz==2024.1 +sentry-sdk==2.13.0 +setproctitle==1.3.3 +shapely==2.0.6 +smmap==5.0.1 +tabulate==0.9.0 +termcolor==2.4.0 +toolz==0.12.1 +tqdm==4.66.5 +tzdata==2024.1 +wandb==0.17.7 +xarray==2024.7.0 +yacs==0.1.8 From 79ac327ef5421235bceefe33a471a0c911a7217e Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Wed, 23 Oct 2024 23:02:52 +0200 Subject: [PATCH 04/36] externalize config --- prithviwxc/gravitywave/config.py | 34 ++---------------------- setup.py | 44 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 54 deletions(-) diff --git a/prithviwxc/gravitywave/config.py b/prithviwxc/gravitywave/config.py index db503ce..958dbef 100644 --- a/prithviwxc/gravitywave/config.py +++ b/prithviwxc/gravitywave/config.py @@ -1,36 +1,6 @@ from yacs.config import CfgNode as CN -_CN = CN() - -_CN.wandb_mode = "disabled" -_CN.vartype = "uvtp122" -_CN.train_data_path = ( - "gravity_wave_flux/uvtp122" -) -_CN.valid_data_path = ( - "gravity_wave_flux/uvtp122/test" -) -_CN.singular_sharded_checkpoint = ( - "prithvi_wxc/v0.8.50.rollout_step3.1.pth" -) -_CN.file_glob_pattern = "wxc_input_u_v_t_p_output_theta_uw_vw_era5_*.nc" - -_CN.lr = 0.0001 -_CN.hidden_channels = 160 -_CN.n_lats_px = 64 -_CN.n_lons_px = 128 -_CN.in_channels_static = 3 -_CN.mask_unit_size_px = [8, 16] -_CN.patch_size_px = [1, 1] - - -### Training Params - -_CN.max_epochs = 100 -_CN.batch_size = 12 -_CN.num_data_workers = 8 - - def get_cfg(): - return _CN.clone() + cfg = CN() + cfg.merge_from_file("config.yaml") diff --git a/setup.py b/setup.py index 2eb6aa4..a59fa70 100644 --- a/setup.py +++ b/setup.py @@ -65,27 +65,27 @@ "debugpy==1.8.5", "decorator==5.1.1", "exceptiongroup==1.2.2", - "executing==2.1.0", - "filelock==3.13.1", - "idna==3.7", - "importlib-metadata==8.4.0", - "intel-openmp==2023.1.0", - "ipykernel==6.29.5", - "ipython==8.27.0", - "jedi==0.19.1", - "jinja2==3.1.4", - "jupyter_client==8.6.2", - "jupyter_core==5.7.2", - "markupsafe==2.1.3", - "matplotlib-inline==0.1.7", - "mkl==2023.2.0", - "mpmath==1.3.0", - "numpy==1.26.4", - "protobuf==4.25.3", - "scipy==1.13.1", - "torch", - "torchaudio", - "torchvision", - "yacs==0.1.8", + "executing==2.1.0", + "filelock==3.13.1", + "idna==3.7", + "importlib-metadata==8.4.0", + "intel-openmp==2023.1.0", + "ipykernel==6.29.5", + "ipython==8.27.0", + "jedi==0.19.1", + "jinja2==3.1.4", + "jupyter_client==8.6.2", + "jupyter_core==5.7.2", + "markupsafe==2.1.3", + "matplotlib-inline==0.1.7", + "mkl==2023.2.0", + "mpmath==1.3.0", + "numpy==1.26.4", + "protobuf==4.25.3", + "scipy==1.13.1", + "torch", + "torchaudio", + "torchvision", + "yacs==0.1.8", ], ) From cba5c3643b417449a8ff202ee01e461967313626 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Wed, 23 Oct 2024 23:16:39 +0200 Subject: [PATCH 05/36] fix config.py --- prithviwxc/gravitywave/config.py | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/prithviwxc/gravitywave/config.py b/prithviwxc/gravitywave/config.py index 958dbef..987877f 100644 --- a/prithviwxc/gravitywave/config.py +++ b/prithviwxc/gravitywave/config.py @@ -1,6 +1,31 @@ from yacs.config import CfgNode as CN +_CN = CN() + +# Declare all the configuration keys +_CN.wandb_mode = "disabled" +_CN.vartype = "uvtp122" +_CN.train_data_path = "gravity_wave_flux/uvtp122" +_CN.valid_data_path = "gravity_wave_flux/uvtp122/test" +_CN.singular_sharded_checkpoint = "prithvi_wxc/v0.8.50.rollout_step3.1.pth" +_CN.file_glob_pattern = "wxc_input_u_v_t_p_output_theta_uw_vw_era5_*.nc" + +_CN.lr = 0.0001 +_CN.hidden_channels = 160 +_CN.n_lats_px = 64 +_CN.n_lons_px = 128 +_CN.in_channels_static = 3 +_CN.mask_unit_size_px = [8, 16] +_CN.patch_size_px = [1, 1] + +# Training parameters +_CN.max_epochs = 100 +_CN.batch_size = 12 +_CN.num_data_workers = 8 + +_CN.merge_from_file("config.yaml") + +# Function to clone the config def get_cfg(): - cfg = CN() - cfg.merge_from_file("config.yaml") + return _CN.clone() From 480f76d4161a42f70c0b83c8bd2120090a548ca7 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Thu, 24 Oct 2024 06:31:48 -0400 Subject: [PATCH 06/36] add wxc dep --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index a59fa70..8250a5f 100644 --- a/setup.py +++ b/setup.py @@ -87,5 +87,6 @@ "torchaudio", "torchvision", "yacs==0.1.8", + "PrithviWxC@git+https://github.com/NASA-IMPACT/Prithvi-WxC.git@main#egg=PrithviWxC" ], ) From bad430883dce99a34687231a38c9a0720c7c79da Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Thu, 24 Oct 2024 13:14:44 +0200 Subject: [PATCH 07/36] move from setup.py to pyproject.toml --- pyproject.toml | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 92 ----------------------------------------------- 2 files changed, 96 insertions(+), 92 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..9d2aa12 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,96 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta" + +[project] +name = "prithviwxc-gravitywave" +version = "0.1.0" +description = "Gravity Wave Parameterization" +readme = { file = "README.md", content-type = "text/markdown" } +requires-python = ">=3.11" +license = { text = "MIT" } +authors = [ + { name = "Sujit Roy", email = "sr0197@uah.edu" } +] +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent" +] +dependencies = [ + "cachetools==5.5.0", + "cartopy==0.23.0", + "click==8.1.7", + "cloudpickle==3.0.0", + "contourpy==1.3.0", + "cycler==0.12.1", + "dask==2024.8.1", + "docker-pycreds==0.4.0", + "fonttools==4.53.1", + "fsspec==2024.6.1", + "gitdb==4.0.11", + "gitpython==3.1.43", + "h5netcdf==1.3.0", + "h5py==3.11.0", + "kiwisolver==1.4.7", + "locket==1.0.0", + "matplotlib==3.9.2", + "nvidia-ml-py==12.535.161", + "nvitop==1.3.2", + "pandas==2.2.2", + "partd==1.4.2", + "platformdirs==4.2.2", + "protobuf", + "pyhelpme==0.1", + "pyparsing==3.1.4", + "pyproj==3.6.1", + "pyshp==2.3.1", + "python-dateutil==2.9.0.post0", + "pytz==2024.1", + "sentry-sdk==2.13.0", + "setproctitle==1.3.3", + "shapely==2.0.6", + "smmap==5.0.1", + "tabulate==0.9.0", + "termcolor==2.4.0", + "toolz==0.12.1", + "tqdm==4.66.5", + "tzdata==2024.1", + "wandb==0.17.7", + "xarray==2024.7.0", + "yacs==0.1.8", + "asttokens==2.4.1", + "brotli==1.0.9", + "certifi==2024.8.30", + "charset-normalizer==3.3.2", + "comm==0.2.2", + "debugpy==1.8.5", + "decorator==5.1.1", + "exceptiongroup==1.2.2", + "executing==2.1.0", + "filelock==3.13.1", + "idna==3.7", + "importlib-metadata==8.4.0", + "intel-openmp==2023.1.0", + "ipykernel==6.29.5", + "ipython==8.27.0", + "jedi==0.19.1", + "jinja2==3.1.4", + "jupyter_client==8.6.2", + "jupyter_core==5.7.2", + "markupsafe==2.1.3", + "matplotlib-inline==0.1.7", + "mkl==2023.2.0", + "mpmath==1.3.0", + "numpy==1.26.4", + "protobuf==4.25.3", + "scipy==1.13.1", + "torch", + "torchaudio", + "torchvision", + "yacs==0.1.8", + "PrithviWxC@git+https://github.com/NASA-IMPACT/Prithvi-WxC.git@main#egg=PrithviWxC" +] + +[project.urls] +homepage = "https://github.com/NASA-IMPACT/gravity-wave-finetuning" diff --git a/setup.py b/setup.py deleted file mode 100644 index 8250a5f..0000000 --- a/setup.py +++ /dev/null @@ -1,92 +0,0 @@ -from setuptools import setup -setup( - name="prithviwxc-gravitywave", - version="0.1.0", - packages=["prithviwxc.gravitywave"], - author="Sujit Roy", - author_email="sr0197@uah.edu", - description="Gravity Wave Parameterization", - long_description=open("README.md").read(), - long_description_content_type="text/markdown", - url="https://github.com/NASA-IMPACT/gravity-wave-finetuning", - classifiers=[ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - ], - python_requires='>=3.11', - install_requires=[ - "cachetools==5.5.0", - "cartopy==0.23.0", - "click==8.1.7", - "cloudpickle==3.0.0", - "contourpy==1.3.0", - "cycler==0.12.1", - "dask==2024.8.1", - "docker-pycreds==0.4.0", - "fonttools==4.53.1", - "fsspec==2024.6.1", - "gitdb==4.0.11", - "gitpython==3.1.43", - "h5netcdf==1.3.0", - "h5py==3.11.0", - "kiwisolver==1.4.7", - "locket==1.0.0", - "matplotlib==3.9.2", - "nvidia-ml-py==12.535.161", - "nvitop==1.3.2", - "pandas==2.2.2", - "partd==1.4.2", - "platformdirs==4.2.2", - "protobuf", - "pyhelpme==0.1", - "pyparsing==3.1.4", - "pyproj==3.6.1", - "pyshp==2.3.1", - "python-dateutil==2.9.0.post0", - "pytz==2024.1", - "sentry-sdk==2.13.0", - "setproctitle==1.3.3", - "shapely==2.0.6", - "smmap==5.0.1", - "tabulate==0.9.0", - "termcolor==2.4.0", - "toolz==0.12.1", - "tqdm==4.66.5", - "tzdata==2024.1", - "wandb==0.17.7", - "xarray==2024.7.0", - "yacs==0.1.8", - "asttokens==2.4.1", - "brotli==1.0.9", - "certifi==2024.8.30", - "charset-normalizer==3.3.2", - "comm==0.2.2", - "debugpy==1.8.5", - "decorator==5.1.1", - "exceptiongroup==1.2.2", - "executing==2.1.0", - "filelock==3.13.1", - "idna==3.7", - "importlib-metadata==8.4.0", - "intel-openmp==2023.1.0", - "ipykernel==6.29.5", - "ipython==8.27.0", - "jedi==0.19.1", - "jinja2==3.1.4", - "jupyter_client==8.6.2", - "jupyter_core==5.7.2", - "markupsafe==2.1.3", - "matplotlib-inline==0.1.7", - "mkl==2023.2.0", - "mpmath==1.3.0", - "numpy==1.26.4", - "protobuf==4.25.3", - "scipy==1.13.1", - "torch", - "torchaudio", - "torchvision", - "yacs==0.1.8", - "PrithviWxC@git+https://github.com/NASA-IMPACT/Prithvi-WxC.git@main#egg=PrithviWxC" - ], -) From 49cd21132b112c152140e2e09814c2f29c3d0178 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Thu, 24 Oct 2024 08:54:11 -0400 Subject: [PATCH 08/36] fix pyproject --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 9d2aa12..944c06d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -94,3 +94,6 @@ dependencies = [ [project.urls] homepage = "https://github.com/NASA-IMPACT/gravity-wave-finetuning" + +[tool.setuptools] +packages = ["prithviwxc"] From eb96f734ec09774bd77422d767bf3c933d4a2e93 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Thu, 24 Oct 2024 17:01:44 +0200 Subject: [PATCH 09/36] remove submodules (add pip install), update readme --- .gitmodules | 3 --- README.md | 11 ++++++----- environment.yml | 1 + prithviwxc/gravitywave/gravity_wave_model.py | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 31991a9..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "Prithvi-WxC"] - path = Prithvi-WxC - url = git@github.com:NASA-IMPACT/Prithvi-WxC.git diff --git a/README.md b/README.md index 9ae8b24..d10f824 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,11 @@ This repository contains code and resources for training and inferring gravity w ## Setup -1. Clone the repository with submodules: +1. Clone the repository and download config: - git clone --recurse-submodules git@github.com:NASA-IMPACT/gravity-wave-finetuning.git gravity_wave_finetuning - cd gravity_wave_finetuning + git clone git@github.com:NASA-IMPACT/gravity-wave-finetuning.git + cd gravity-wave-finetuning + wget https://huggingface.co/datasets/Prithvi-WxC/Gravity_wave_Parameterization/raw/main/config.yaml 2. Create and activate a Conda environment for the project: @@ -55,7 +56,7 @@ To run the training on a single node and a single GPU, execute the following com --nproc_per_node=1 \ --nnodes=1 \ --rdzv_backend=c10d \ - finetune_gravity_wave.py + prithviwxc/gravitywave/finetune_gravity_wave.py --split uvtp122 ### Multi-node Training @@ -71,7 +72,7 @@ After training, you can run inferences using the following command. Make sure to --nnodes=1 \ --nproc_per_node=1 \ --rdzv_backend=c10d \ - inference.py \ + prithviwxc/gravitywave/inference.py \ --split=uvtp122 \ --ckpt_path=/path/to/checkpoint \ --data_path=/path/to/data \ diff --git a/environment.yml b/environment.yml index 3cb204e..3bad4dc 100644 --- a/environment.yml +++ b/environment.yml @@ -208,3 +208,4 @@ dependencies: - wandb==0.17.7 - xarray==2024.7.0 - yacs==0.1.8 + - git+https://github.com/NASA-IMPACT/Prithvi-WxC.git diff --git a/prithviwxc/gravitywave/gravity_wave_model.py b/prithviwxc/gravitywave/gravity_wave_model.py index 80e531f..3b927e6 100644 --- a/prithviwxc/gravitywave/gravity_wave_model.py +++ b/prithviwxc/gravitywave/gravity_wave_model.py @@ -2,7 +2,7 @@ import torch.nn as nn import importlib -model = importlib.import_module('Prithvi-WxC.PrithviWxC.model') +model = importlib.import_module('PrithviWxC.model') from distributed import print0 From fecb7e6fd33c02a49a1dba7e313285d0f9ce4dbb Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Fri, 25 Oct 2024 08:53:06 +0000 Subject: [PATCH 10/36] Create init.py add init.py that setuptools detects the package --- prithviwxc/init.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 prithviwxc/init.py diff --git a/prithviwxc/init.py b/prithviwxc/init.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/prithviwxc/init.py @@ -0,0 +1 @@ + From 55ec3a4c50a48ae9cafd65983291859a090adc2b Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Fri, 25 Oct 2024 08:55:26 +0000 Subject: [PATCH 11/36] Update pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 944c06d..eb546b2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,3 +97,4 @@ homepage = "https://github.com/NASA-IMPACT/gravity-wave-finetuning" [tool.setuptools] packages = ["prithviwxc"] +include-package-data = true From fff5d476a293f5b1b2a23b55dea6a9230a7c8fed Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:01:39 +0000 Subject: [PATCH 12/36] Update pyproject.toml --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index eb546b2..784d021 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -98,3 +98,6 @@ homepage = "https://github.com/NASA-IMPACT/gravity-wave-finetuning" [tool.setuptools] packages = ["prithviwxc"] include-package-data = true + +[tool.setuptools.packages.find] +where = ["prithviwxc"] From 11b2361eee5380d4b9b9028a5d42b08604347e62 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:02:54 +0000 Subject: [PATCH 13/36] Update pyproject.toml --- pyproject.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 784d021..c465c96 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -98,6 +98,4 @@ homepage = "https://github.com/NASA-IMPACT/gravity-wave-finetuning" [tool.setuptools] packages = ["prithviwxc"] include-package-data = true - -[tool.setuptools.packages.find] -where = ["prithviwxc"] +packages.find.where = ["."] From b1c3d07b9f1b02228ae66a564fccb1adfd1be295 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Fri, 25 Oct 2024 13:16:17 +0200 Subject: [PATCH 14/36] fix install --- pyproject.toml | 3 +-- setup.py | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml index c465c96..5f6b3a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,5 +97,4 @@ homepage = "https://github.com/NASA-IMPACT/gravity-wave-finetuning" [tool.setuptools] packages = ["prithviwxc"] -include-package-data = true -packages.find.where = ["."] +include-package-data = true \ No newline at end of file diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..5855e5a --- /dev/null +++ b/setup.py @@ -0,0 +1,9 @@ +from setuptools import setup, find_packages + +setup( + name="prithviwxc-gravitywave", + version="0.1.0", + description="Gravity Wave Parameterization", + packages=find_packages(where="."), + include_package_data=True, +) \ No newline at end of file From 245ba13d0ad214b4cf6d440fa8d3a703bff408f0 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Fri, 25 Oct 2024 13:36:50 +0200 Subject: [PATCH 15/36] fix import --- prithviwxc/gravitywave/gravity_wave_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prithviwxc/gravitywave/gravity_wave_model.py b/prithviwxc/gravitywave/gravity_wave_model.py index 3b927e6..91e0ca7 100644 --- a/prithviwxc/gravitywave/gravity_wave_model.py +++ b/prithviwxc/gravitywave/gravity_wave_model.py @@ -4,7 +4,7 @@ import importlib model = importlib.import_module('PrithviWxC.model') -from distributed import print0 +from prithviwxc.gravitywave.distributed import print0 torch.set_float32_matmul_precision("high") From c1e59ad22a289a1bfbc2361a74d1095980486b11 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Fri, 25 Oct 2024 15:46:15 +0200 Subject: [PATCH 16/36] fix path after refactoring --- scripts/train.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/train.sh b/scripts/train.sh index b4dba06..03e4f7f 100644 --- a/scripts/train.sh +++ b/scripts/train.sh @@ -74,6 +74,6 @@ torchrun \ --rdzv_id=$RDZV_ID \ --rdzv_endpoint "$RDZV_ADDR:$RDZV_PORT" \ --rdzv_backend=c10d \ - .py --split $data_args + ./prithviwxc/gravitywave/.py --split $data_args conda deactivate \ No newline at end of file From fed0248033225213fd7ee9ba4ea0439b78de0bf1 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Fri, 25 Oct 2024 20:34:10 +0200 Subject: [PATCH 17/36] fix import --- prithviwxc/gravitywave/inference.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prithviwxc/gravitywave/inference.py b/prithviwxc/gravitywave/inference.py index cd30adc..8233c48 100644 --- a/prithviwxc/gravitywave/inference.py +++ b/prithviwxc/gravitywave/inference.py @@ -7,8 +7,8 @@ import tqdm import xarray as xr -from datamodule import ERA5DataModule -from gravity_wave_model import UNetWithTransformer +from prithviwxc.gravitywave.datamodule import ERA5DataModule +from prithviwxc.gravitywave.gravity_wave_model import UNetWithTransformer from torch.nn.parallel import DistributedDataParallel as DDP import torch.distributed as dist From bacc93c834f0ac4947b01f2d2582b9b15f7e347a Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Fri, 25 Oct 2024 20:39:48 +0200 Subject: [PATCH 18/36] fix for robustness --- prithviwxc/gravitywave/inference.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prithviwxc/gravitywave/inference.py b/prithviwxc/gravitywave/inference.py index 8233c48..0c4988e 100644 --- a/prithviwxc/gravitywave/inference.py +++ b/prithviwxc/gravitywave/inference.py @@ -12,8 +12,8 @@ from torch.nn.parallel import DistributedDataParallel as DDP import torch.distributed as dist -local_rank = int(os.environ["LOCAL_RANK"]) -rank = int(os.environ["RANK"]) +local_rank = int(os.getenv("LOCAL_RANK",'0')) +rank = int(os.getenv("RANK",'0')) device = f"cuda:{local_rank}" dtype = torch.float32 From f370566564668185c5ed4e1451533fb2bbfe680e Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Fri, 25 Oct 2024 23:40:31 +0200 Subject: [PATCH 19/36] fix path to config file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d10f824..dd78977 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This repository contains code and resources for training and inferring gravity w git clone git@github.com:NASA-IMPACT/gravity-wave-finetuning.git cd gravity-wave-finetuning - wget https://huggingface.co/datasets/Prithvi-WxC/Gravity_wave_Parameterization/raw/main/config.yaml + wget https://huggingface.co/Prithvi-WxC/Gravity_wave_Parameterization/resolve/main/config.yaml 2. Create and activate a Conda environment for the project: From a9c8b6f8f7d91eba861f152591e5ad9c553fcb92 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Mon, 28 Oct 2024 10:30:41 +0100 Subject: [PATCH 20/36] add cpu support for inference --- prithviwxc/gravitywave/inference.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/prithviwxc/gravitywave/inference.py b/prithviwxc/gravitywave/inference.py index 0c4988e..0ba40e1 100644 --- a/prithviwxc/gravitywave/inference.py +++ b/prithviwxc/gravitywave/inference.py @@ -14,7 +14,7 @@ local_rank = int(os.getenv("LOCAL_RANK",'0')) rank = int(os.getenv("RANK",'0')) -device = f"cuda:{local_rank}" +device = torch.device(f"cuda:{local_rank}" if torch.cuda.is_available() else "cpu") dtype = torch.float32 def setup(): @@ -60,7 +60,11 @@ def get_model(cfg, vartype,ckpt_singular: str) -> torch.nn.Module: patch_size_px=cfg.patch_size_px, device=device, ) - model = DDP(model.to(local_rank, dtype=dtype), device_ids=[local_rank]) + + if device==torch.device('cpu'): + model = DDP(model.to(device)) + else: + model = DDP(model.to(local_rank, dtype=dtype), device_ids=[local_rank]) model = load_checkpoint(model,ckpt_singular) return model From a4ca2759e49df2fd30f7c2647f04c5b32e845f27 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Thu, 31 Oct 2024 12:29:03 +0100 Subject: [PATCH 21/36] add proper inheritance of ERA5DataModule --- prithviwxc/gravitywave/datamodule.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/prithviwxc/gravitywave/datamodule.py b/prithviwxc/gravitywave/datamodule.py index 04c09ca..b3caf73 100644 --- a/prithviwxc/gravitywave/datamodule.py +++ b/prithviwxc/gravitywave/datamodule.py @@ -4,7 +4,7 @@ import xarray as xr from torch.utils.data import DataLoader, Dataset from torch.utils.data.distributed import DistributedSampler - +import lightning as pl def get_era5_uvtp122(ds: xr.Dataset, index: int = 0) -> dict[str, torch.Tensor]: """Retrieve climate data variables at 122 pressure levels. @@ -134,7 +134,7 @@ def __getitem__(self, index: int = 0) -> dict[str, torch.Tensor]: return batch -class ERA5DataModule: +class ERA5DataModule(pl.LightningDataModule): """ This module handles data loading, batching, and train/validation splits. @@ -143,7 +143,7 @@ class ERA5DataModule: valid_data_path: Path to validation data. file_glob_pattern: Pattern to match NetCDF files. batch_size: Size of each mini-batch. - num_workers: Number of subprocesses for data loading. + num_workers: Number of subprocesses for data loading. """ def __init__( @@ -171,6 +171,9 @@ def __init__( self.batch_size: int = batch_size self.num_workers: int = num_data_workers + def prepare_data(self): + pass + def setup(self, stage: str | None = None) -> tuple[Dataset, Dataset]: """Sets up the datasets for different stages (train, validation, predict). From 1dffc459ba192c8386182673e43973d857ca74a0 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Thu, 31 Oct 2024 12:30:24 +0100 Subject: [PATCH 22/36] add lightning --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 5f6b3a5..da681d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,6 +78,7 @@ dependencies = [ "jinja2==3.1.4", "jupyter_client==8.6.2", "jupyter_core==5.7.2", + "lightning", "markupsafe==2.1.3", "matplotlib-inline==0.1.7", "mkl==2023.2.0", From 22503cf9437ecbfc7b1f2f88f5b7141b44c991a6 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Thu, 31 Oct 2024 14:43:02 +0100 Subject: [PATCH 23/36] relax python version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index da681d8..22c1195 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "prithviwxc-gravitywave" version = "0.1.0" description = "Gravity Wave Parameterization" readme = { file = "README.md", content-type = "text/markdown" } -requires-python = ">=3.11" +requires-python = ">=3.10" license = { text = "MIT" } authors = [ { name = "Sujit Roy", email = "sr0197@uah.edu" } From f864e760b19393d42f4a21f27a432fea6d4f0edb Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:56:00 +0000 Subject: [PATCH 24/36] Delete prithviwxc/init.py --- prithviwxc/init.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 prithviwxc/init.py diff --git a/prithviwxc/init.py b/prithviwxc/init.py deleted file mode 100644 index 8b13789..0000000 --- a/prithviwxc/init.py +++ /dev/null @@ -1 +0,0 @@ - From 199628b98f39c47635afe13a7154271fb3703aff Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:56:43 +0000 Subject: [PATCH 25/36] Create __init__.py correct init.py file name --- prithviwxc/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 prithviwxc/__init__.py diff --git a/prithviwxc/__init__.py b/prithviwxc/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/prithviwxc/__init__.py @@ -0,0 +1 @@ + From fc18b64ebf33a7bba6e554fe6a2c0f8021c257a3 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:58:02 +0000 Subject: [PATCH 26/36] Delete prithviwxc/gravitywave/init.py --- prithviwxc/gravitywave/init.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 prithviwxc/gravitywave/init.py diff --git a/prithviwxc/gravitywave/init.py b/prithviwxc/gravitywave/init.py deleted file mode 100644 index e69de29..0000000 From 2e96eb94a6d1be043eec7ddc84647f5c470da362 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:58:17 +0000 Subject: [PATCH 27/36] Create __init__.py --- prithviwxc/gravitywave/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 prithviwxc/gravitywave/__init__.py diff --git a/prithviwxc/gravitywave/__init__.py b/prithviwxc/gravitywave/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/prithviwxc/gravitywave/__init__.py @@ -0,0 +1 @@ + From 4f74146de95dd9a325053351d3555dc2c1e57463 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:59:29 +0000 Subject: [PATCH 28/36] Update setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 5855e5a..e0f1da1 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,6 @@ name="prithviwxc-gravitywave", version="0.1.0", description="Gravity Wave Parameterization", - packages=find_packages(where="."), + packages=find_packages(include=["prithviwxc*"]), include_package_data=True, -) \ No newline at end of file +) From f01a09793fee8ae866f335635a0e879b11ba17c9 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Mon, 4 Nov 2024 12:37:29 +0100 Subject: [PATCH 29/36] fix subpackage inclusion --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e0f1da1..4bc870a 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,6 @@ name="prithviwxc-gravitywave", version="0.1.0", description="Gravity Wave Parameterization", - packages=find_packages(include=["prithviwxc*"]), + packages=["prithviwxc", "prithviwxc.gravitywave"], include_package_data=True, ) From 45c3ed2a62f6c8facbad3deeade6e735f5005ab4 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Mon, 4 Nov 2024 12:12:11 +0000 Subject: [PATCH 30/36] fix pyproject.toml --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 22c1195..41f0984 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,5 +97,5 @@ dependencies = [ homepage = "https://github.com/NASA-IMPACT/gravity-wave-finetuning" [tool.setuptools] -packages = ["prithviwxc"] -include-package-data = true \ No newline at end of file +packages=["prithviwxc", "prithviwxc.gravitywave"], +include-package-data = true From fed423847edcc6198992d430f811199914dfdce2 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Mon, 4 Nov 2024 12:12:53 +0000 Subject: [PATCH 31/36] fix pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 41f0984..5d21378 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,5 +97,5 @@ dependencies = [ homepage = "https://github.com/NASA-IMPACT/gravity-wave-finetuning" [tool.setuptools] -packages=["prithviwxc", "prithviwxc.gravitywave"], +packages=["prithviwxc", "prithviwxc.gravitywave"] include-package-data = true From a7580a57438ed08b4c9c761731e848e7851e5e86 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Tue, 26 Nov 2024 17:14:06 +0100 Subject: [PATCH 32/36] send data to gpu where appropriate --- prithviwxc/gravitywave/datamodule.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/prithviwxc/gravitywave/datamodule.py b/prithviwxc/gravitywave/datamodule.py index b3caf73..f6cc304 100644 --- a/prithviwxc/gravitywave/datamodule.py +++ b/prithviwxc/gravitywave/datamodule.py @@ -175,23 +175,22 @@ def prepare_data(self): pass def setup(self, stage: str | None = None) -> tuple[Dataset, Dataset]: - """Sets up the datasets for different stages - (train, validation, predict). - - Args: - stage: Stage for which the setup is performed ("fit", "predict"). - """ + device = torch.device("cuda" if torch.cuda.is_available() else "cpu") + model_to_return = UNetPincer(backbone).to(device) if stage == "fit": self.dataset_train = ERA5Dataset( data_path=self.train_data_path, file_glob_pattern=self.file_glob_pattern ) + self.dataset_train = self.dataset_train.to(device) self.dataset_val = ERA5Dataset( data_path=self.valid_data_path, file_glob_pattern=self.file_glob_pattern ) + self.dataset_val = self.dataset_val.to(device) elif stage == "predict": self.dataset_predict = ERA5Dataset( data_path=self.valid_data_path, file_glob_pattern=self.file_glob_pattern ) + self.dataset_predict = self.dataset_predict.to(device) def train_dataloader(self) -> DataLoader: """Returns a DataLoader for the training data.""" From 7b85bee921f67afa758d397d8ee4351763bac349 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Tue, 26 Nov 2024 21:20:41 +0100 Subject: [PATCH 33/36] send data to gpu where appropriate --- prithviwxc/gravitywave/datamodule.py | 1 + 1 file changed, 1 insertion(+) diff --git a/prithviwxc/gravitywave/datamodule.py b/prithviwxc/gravitywave/datamodule.py index f6cc304..3e9c96a 100644 --- a/prithviwxc/gravitywave/datamodule.py +++ b/prithviwxc/gravitywave/datamodule.py @@ -192,6 +192,7 @@ def setup(self, stage: str | None = None) -> tuple[Dataset, Dataset]: ) self.dataset_predict = self.dataset_predict.to(device) + def train_dataloader(self) -> DataLoader: """Returns a DataLoader for the training data.""" return DataLoader( From f62f5d390c0753b9babb06b3dc0a671fbcd25a60 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler Date: Tue, 7 Jan 2025 10:25:23 +0100 Subject: [PATCH 34/36] Merge branch '201' of github.com:romeokienzler/terratorch into 201 --- prithviwxc/gravitywave/datamodule.py | 1 - 1 file changed, 1 deletion(-) diff --git a/prithviwxc/gravitywave/datamodule.py b/prithviwxc/gravitywave/datamodule.py index 3e9c96a..dc8d581 100644 --- a/prithviwxc/gravitywave/datamodule.py +++ b/prithviwxc/gravitywave/datamodule.py @@ -176,7 +176,6 @@ def prepare_data(self): def setup(self, stage: str | None = None) -> tuple[Dataset, Dataset]: device = torch.device("cuda" if torch.cuda.is_available() else "cpu") - model_to_return = UNetPincer(backbone).to(device) if stage == "fit": self.dataset_train = ERA5Dataset( data_path=self.train_data_path, file_glob_pattern=self.file_glob_pattern From e8bfab47ec6294d977b650a7ba4858e831e4533e Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:19:08 +0000 Subject: [PATCH 35/36] remove version constraints --- pyproject.toml | 144 ++++++++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 73 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5d21378..9b34079 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,79 +18,77 @@ classifiers = [ "Operating System :: OS Independent" ] dependencies = [ - "cachetools==5.5.0", - "cartopy==0.23.0", - "click==8.1.7", - "cloudpickle==3.0.0", - "contourpy==1.3.0", - "cycler==0.12.1", - "dask==2024.8.1", - "docker-pycreds==0.4.0", - "fonttools==4.53.1", - "fsspec==2024.6.1", - "gitdb==4.0.11", - "gitpython==3.1.43", - "h5netcdf==1.3.0", - "h5py==3.11.0", - "kiwisolver==1.4.7", - "locket==1.0.0", - "matplotlib==3.9.2", - "nvidia-ml-py==12.535.161", - "nvitop==1.3.2", - "pandas==2.2.2", - "partd==1.4.2", - "platformdirs==4.2.2", - "protobuf", - "pyhelpme==0.1", - "pyparsing==3.1.4", - "pyproj==3.6.1", - "pyshp==2.3.1", - "python-dateutil==2.9.0.post0", - "pytz==2024.1", - "sentry-sdk==2.13.0", - "setproctitle==1.3.3", - "shapely==2.0.6", - "smmap==5.0.1", - "tabulate==0.9.0", - "termcolor==2.4.0", - "toolz==0.12.1", - "tqdm==4.66.5", - "tzdata==2024.1", - "wandb==0.17.7", - "xarray==2024.7.0", - "yacs==0.1.8", - "asttokens==2.4.1", - "brotli==1.0.9", - "certifi==2024.8.30", - "charset-normalizer==3.3.2", - "comm==0.2.2", - "debugpy==1.8.5", - "decorator==5.1.1", - "exceptiongroup==1.2.2", - "executing==2.1.0", - "filelock==3.13.1", - "idna==3.7", - "importlib-metadata==8.4.0", - "intel-openmp==2023.1.0", - "ipykernel==6.29.5", - "ipython==8.27.0", - "jedi==0.19.1", - "jinja2==3.1.4", - "jupyter_client==8.6.2", - "jupyter_core==5.7.2", - "lightning", - "markupsafe==2.1.3", - "matplotlib-inline==0.1.7", - "mkl==2023.2.0", - "mpmath==1.3.0", - "numpy==1.26.4", - "protobuf==4.25.3", - "scipy==1.13.1", - "torch", - "torchaudio", - "torchvision", - "yacs==0.1.8", - "PrithviWxC@git+https://github.com/NASA-IMPACT/Prithvi-WxC.git@main#egg=PrithviWxC" +cachetools, +cartopy, +click, +cloudpickle, +contourpy, +cycler, +dask, +docker-pycreds, +fonttools, +fsspec, +gitdb, +gitpython, +h5netcdf, +h5py, +kiwisolver, +locket, +matplotlib, +nvidia-ml-py, +nvitop, +pandas, +partd, +platformdirs, +protobuf, +pyhelpme, +pyparsing, +pyproj, +pyshp, +python-dateutil, +pytz, +sentry-sdk, +setproctitle, +shapely, +smmap, +tabulate, +termcolor, +toolz, +tqdm, +tzdata, +wandb, +xarray, +yacs, +asttokens, +brotli, +certifi, +charset-normalizer, +comm, +debugpy, +decorator, +exceptiongroup, +executing, +filelock, +idna, +importlib-metadata, +intel-openmp, +ipykernel, +ipython, +jedi, +jinja2, +jupyter_client, +jupyter_core, +lightning, +markupsafe, +matplotlib-inline, +mkl, +mpmath, +numpy, +scipy, +torch, +torchaudio, +torchvision, +yacs, ] [project.urls] From 7732662555a4d15f3e5c421be62641db33b4a450 Mon Sep 17 00:00:00 2001 From: Romeo Kienzler <5694071+romeokienzler@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:20:30 +0000 Subject: [PATCH 36/36] fix pyproject.toml --- pyproject.toml | 142 ++++++++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 9b34079..6e7e3c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,77 +18,77 @@ classifiers = [ "Operating System :: OS Independent" ] dependencies = [ -cachetools, -cartopy, -click, -cloudpickle, -contourpy, -cycler, -dask, -docker-pycreds, -fonttools, -fsspec, -gitdb, -gitpython, -h5netcdf, -h5py, -kiwisolver, -locket, -matplotlib, -nvidia-ml-py, -nvitop, -pandas, -partd, -platformdirs, -protobuf, -pyhelpme, -pyparsing, -pyproj, -pyshp, -python-dateutil, -pytz, -sentry-sdk, -setproctitle, -shapely, -smmap, -tabulate, -termcolor, -toolz, -tqdm, -tzdata, -wandb, -xarray, -yacs, -asttokens, -brotli, -certifi, -charset-normalizer, -comm, -debugpy, -decorator, -exceptiongroup, -executing, -filelock, -idna, -importlib-metadata, -intel-openmp, -ipykernel, -ipython, -jedi, -jinja2, -jupyter_client, -jupyter_core, -lightning, -markupsafe, -matplotlib-inline, -mkl, -mpmath, -numpy, -scipy, -torch, -torchaudio, -torchvision, -yacs, +"cachetools", +"cartopy", +"click", +"cloudpickle", +"contourpy", +"cycler", +"dask", +"docker-pycreds", +"fonttools", +"fsspec", +"gitdb", +"gitpython", +"h5netcdf", +"h5py", +"kiwisolver", +"locket", +"matplotlib", +"nvidia-ml-py", +"nvitop", +"pandas", +"partd", +"platformdirs", +"protobuf", +"pyhelpme", +"pyparsing", +"pyproj", +"pyshp", +"python-dateutil", +"pytz", +"sentry-sdk", +"setproctitle", +"shapely", +"smmap", +"tabulate", +"termcolor", +"toolz", +"tqdm", +"tzdata", +"wandb", +"xarray", +"yacs", +"asttokens", +"brotli", +"certifi", +"charset-normalizer", +"comm", +"debugpy", +"decorator", +"exceptiongroup", +"executing", +"filelock", +"idna", +"importlib-metadata", +"intel-openmp", +"ipykernel", +"ipython", +"jedi", +"jinja2", +"jupyter_client", +"jupyter_core", +"lightning", +"markupsafe", +"matplotlib-inline", +"mkl", +"mpmath", +"numpy", +"scipy", +"torch", +"torchaudio", +"torchvision", +"yacs" ] [project.urls]