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.

Sign up for GitHub

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

Improve parallelisation, add clip_models functionality #25

Merged
merged 7 commits into from
Nov 3, 2024
Merged

Improve parallelisation, add clip_models functionality #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c90d940
Improve parallelisation
robbibt Oct 31, 2024
4e81889
Fix mypy
robbibt Oct 31, 2024
aa3c8f7
Fix deps
robbibt Oct 31, 2024
e9c340e
Fix deps
robbibt Oct 31, 2024
32a4353
Prepare for pyTMD fix
robbibt Oct 31, 2024
cebbc6e
Refactor repo structure
robbibt Nov 3, 2024
9c90a0b
Fix imports
robbibt Nov 3, 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
21 changes: 14 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,27 @@ test-eo: ## Test eo module with pytest
@export EO_TIDES_TIDE_MODELS=./tests/data/tide_models && \
uv run python -m pytest tests/test_eo.py --verbose

.PHONY: test-stats
test-stats: ## Test stats module with pytest
@echo "🚀 Testing stats module: Running pytest"
@tar --skip-old-files -xzf ./tests/data/tide_models.tar.gz -C ./tests/data
@export EO_TIDES_TIDE_MODELS=./tests/data/tide_models && \
uv run python -m pytest tests/test_stats.py --verbose

.PHONY: test-utils
test-utils: ## Test utils module with pytest
@echo "🚀 Testing utils module: Running pytest"
@tar --skip-old-files -xzf ./tests/data/tide_models.tar.gz -C ./tests/data
@export EO_TIDES_TIDE_MODELS=./tests/data/tide_models && \
uv run python -m pytest tests/test_utils.py --verbose

.PHONY: test-notebooks
test-notebooks: ## Test notebooks with pytest
@echo "🚀 Testing notebooks: Running pytest"
@tar --skip-old-files -xzf ./tests/data/tide_models.tar.gz -C ./tests/data
@export EO_TIDES_TIDE_MODELS=./tests/data/tide_models && \
uv run python -m pytest --nbval-lax docs/notebooks/ --verbose

.PHONY: test-stats
test-stats: ## Test eo module with pytest
@echo "🚀 Testing eo module: Running pytest"
@tar --skip-old-files -xzf ./tests/data/tide_models.tar.gz -C ./tests/data
@export EO_TIDES_TIDE_MODELS=./tests/data/tide_models && \
uv run python -m pytest tests/test_stats.py --verbose

.PHONY: build
build: clean-build ## Build wheel file
@echo "🚀 Creating wheel file"
Expand Down
2 changes: 1 addition & 1 deletion docs/notebooks/Case_study_intertidal.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"\n",
"from eo_tides.eo import tag_tides\n",
"from eo_tides.stats import tide_stats\n",
"from eo_tides.model import list_models"
"from eo_tides.utils import list_models"
]
},
{
Expand Down
82 changes: 34 additions & 48 deletions docs/notebooks/Model_tides.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,20 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"We can use the [`eo_tides.model.list_models`](../../api/#eo_tides.model.list_models) function to verify that we have some tide model data available in this directory:"
"<div class=\"admonition important\">\n",
" <p class=\"admonition-title\">Important</p>\n",
" <p>\n",
" The directory above is for demo purposes only.\n",
" Update the <code>directory</code> path to point to the location of your own tide model directory.\n",
" </p>\n",
"</div>"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"We can use the [`eo_tides.utils.list_models`](../../api/#eo_tides.utils.list_models) function to verify that we have some tide model data available in this directory:"
]
},
{
Expand Down Expand Up @@ -79,24 +92,11 @@
}
],
"source": [
"from eo_tides.model import list_models\n",
"from eo_tides.utils import list_models\n",
"\n",
"list_models(directory=directory, show_supported=False);"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"<div class=\"admonition important\">\n",
" <p class=\"admonition-title\">Important</p>\n",
" <p>\n",
" The directory above contains demo data only.\n",
" Update the <code>directory</code> path to point to the location of your own tide model directory.\n",
" </p>\n",
"</div>"
]
},
{
"cell_type": "markdown",
"metadata": {},
Expand All @@ -117,7 +117,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20\n"
"Modelling tides with EOT20\n"
]
},
{
Expand Down Expand Up @@ -294,14 +294,14 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20, HAMTIDE11, GOT5.5 in parallel\n"
"Modelling tides with EOT20, HAMTIDE11, GOT5.5 in parallel (models: 3, splits: 1)\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 3/3 [00:00<00:00, 22.35it/s]\n"
"100%|██████████| 3/3 [00:00<00:00, 18.09it/s]\n"
]
},
{
Expand Down Expand Up @@ -487,14 +487,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20 in parallel\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 2/2 [00:00<00:00, 16.90it/s]\n"
"Modelling tides with EOT20\n"
]
},
{
Expand Down Expand Up @@ -691,14 +684,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20 in parallel\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 2/2 [00:00<00:00, 16.66it/s]\n"
"Modelling tides with EOT20\n"
]
},
{
Expand Down Expand Up @@ -791,14 +777,14 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20, GOT5.5, HAMTIDE11 in parallel\n"
"Modelling tides with EOT20, GOT5.5, HAMTIDE11 in parallel (models: 3, splits: 1)\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 6/6 [00:00<00:00, 29.64it/s]\n"
"100%|██████████| 3/3 [00:00<00:00, 18.19it/s]\n"
]
},
{
Expand Down Expand Up @@ -977,14 +963,14 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20, GOT5.5, HAMTIDE11 in parallel\n"
"Modelling tides with EOT20, GOT5.5, HAMTIDE11 in parallel (models: 3, splits: 1)\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 6/6 [00:00<00:00, 26.52it/s]\n"
"100%|██████████| 3/3 [00:00<00:00, 18.12it/s]\n"
]
},
{
Expand Down Expand Up @@ -1115,8 +1101,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20\n",
"Modelling tides using EOT20\n"
"Modelling tides with EOT20\n",
"Modelling tides with EOT20\n"
]
},
{
Expand Down Expand Up @@ -1241,28 +1227,28 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20, GOT5.5 in parallel\n"
"Modelling tides with EOT20, GOT5.5 in parallel (models: 2, splits: 1)\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 2/2 [00:00<00:00, 15.78it/s]\n"
"100%|██████████| 2/2 [00:00<00:00, 12.91it/s]\n"
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20, GOT5.5 in parallel\n"
"Modelling tides with EOT20, GOT5.5 in parallel (models: 2, splits: 1)\n"
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
"100%|██████████| 2/2 [00:00<00:00, 16.09it/s]\n"
"100%|██████████| 2/2 [00:00<00:00, 13.08it/s]\n"
]
},
{
Expand Down Expand Up @@ -1388,8 +1374,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20\n",
"Modelling tides using EOT20\n"
"Modelling tides with EOT20\n",
"Modelling tides with EOT20\n"
]
},
{
Expand Down Expand Up @@ -1508,8 +1494,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Modelling tides using EOT20\n",
"Modelling tides using EOT20\n"
"Modelling tides with EOT20\n",
"Modelling tides with EOT20\n"
]
},
{
Expand Down
108 changes: 28 additions & 80 deletions docs/notebooks/Satellite_data.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

Loading