Skip to content

Commit 3f4abe0

Browse files
authored
Merge pull request #198 from MiraGeoscience/GEOPY-2137
GEOPY-2137: Use dask.distributed with workers as default behaviour
2 parents 1c8b37a + f9b3fa7 commit 3f4abe0

54 files changed

Lines changed: 2900 additions & 2484 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

environments/py-3.10-linux-64-dev.conda.lock.yml

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 56e602b8af1ebc1738ca576ebfcf93cddf7a032057e30ac11481638bad29d0fc
3+
# input_hash: 6792419f707082db0392c7c66ae972128d5c2dcf3407d75de33f30b4e4f1e33d
44

55
channels:
66
- conda-forge
@@ -29,7 +29,7 @@ dependencies:
2929
- brotli-python=1.1.0=py310hf71b8c6_2
3030
- bzip2=1.0.8=h4bc722e_7
3131
- c-ares=1.34.5=hb9d3cd8_0
32-
- ca-certificates=2025.1.31=hbcca054_0
32+
- ca-certificates=2025.1.31=hbd8a1cb_1
3333
- cached-property=1.5.2=hd8ed1ab_1
3434
- cached_property=1.5.2=pyha770c72_1
3535
- certifi=2025.1.31=pyhd8ed1ab_0
@@ -53,14 +53,14 @@ dependencies:
5353
- distributed=2025.3.0=pyhd8ed1ab_0
5454
- docutils=0.19=py310hff52083_1
5555
- exceptiongroup=1.2.2=pyhd8ed1ab_1
56-
- executing=2.1.0=pyhd8ed1ab_1
56+
- executing=2.2.0=pyhd8ed1ab_0
5757
- fasteners=0.19=pyhd8ed1ab_1
5858
- fonttools=4.57.0=py310h89163eb_0
5959
- fqdn=1.5.1=pyhd8ed1ab_1
60-
- freetype=2.13.3=h48d6fc4_0
60+
- freetype=2.13.3=ha770c72_1
6161
- fsspec=2025.3.2=pyhd8ed1ab_0
6262
- geoana=0.7.2=py310ha2bacc8_0
63-
- greenlet=3.2.0=py310hf71b8c6_0
63+
- greenlet=3.2.1=py310hf71b8c6_0
6464
- h11=0.14.0=pyhd8ed1ab_1
6565
- h2=4.2.0=pyhd8ed1ab_0
6666
- h5py=3.13.0=nompi_py310h60e0fe6_100
@@ -87,7 +87,7 @@ dependencies:
8787
- json5=0.12.0=pyhd8ed1ab_0
8888
- jsonpointer=3.0.0=py310hff52083_1
8989
- jsonschema=4.23.0=pyhd8ed1ab_1
90-
- jsonschema-specifications=2024.10.1=pyhd8ed1ab_1
90+
- jsonschema-specifications=2025.4.1=pyh29332c3_0
9191
- jsonschema-with-format-nongpl=4.23.0=hd8ed1ab_1
9292
- jupyter-book=1.0.3=pyhd8ed1ab_1
9393
- jupyter-cache=1.0.1=pyhff2d567_0
@@ -97,7 +97,7 @@ dependencies:
9797
- jupyter_events=0.12.0=pyh29332c3_0
9898
- jupyter_server=2.15.0=pyhd8ed1ab_0
9999
- jupyter_server_terminals=0.5.3=pyhd8ed1ab_1
100-
- jupyterlab=4.4.0=pyhd8ed1ab_0
100+
- jupyterlab=4.4.1=pyhd8ed1ab_0
101101
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
102102
- jupyterlab_server=2.27.3=pyhd8ed1ab_1
103103
- jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
@@ -108,27 +108,29 @@ dependencies:
108108
- latexcodec=2.0.1=pyh9f0ad1d_0
109109
- lcms2=2.17=h717163a_0
110110
- ld_impl_linux-64=2.43=h712a8e2_4
111-
- lerc=4.0.0=h27087fc_0
111+
- lerc=4.0.0=h0aef613_1
112112
- libaec=1.1.3=h59595ed_0
113113
- libblas=3.9.0=31_hfdb39a5_mkl
114114
- libbrotlicommon=1.1.0=hb9d3cd8_2
115115
- libbrotlidec=1.1.0=hb9d3cd8_2
116116
- libbrotlienc=1.1.0=hb9d3cd8_2
117117
- libcblas=3.9.0=31_h372d94f_mkl
118118
- libcurl=8.13.0=h332b0f4_0
119-
- libdeflate=1.23=h4ddbbb0_0
119+
- libdeflate=1.23=h86f0d12_0
120120
- libdlf=0.3.0=pyhd8ed1ab_1
121121
- libedit=3.1.20250104=pl5321h7949ede_0
122122
- libev=4.33=hd590300_2
123123
- libexpat=2.7.0=h5888daf_0
124124
- libffi=3.4.6=h2dba641_1
125+
- libfreetype=2.13.3=ha770c72_1
126+
- libfreetype6=2.13.3=h48d6fc4_1
125127
- libgcc=14.2.0=h767d61c_2
126128
- libgcc-ng=14.2.0=h69a702a_2
127129
- libgfortran=14.2.0=h69a702a_2
128130
- libgfortran5=14.2.0=hf1ad2bd_2
129131
- libhwloc=2.11.2=default_h0d58e46_1001
130132
- libiconv=1.18=h4ce23a2_1
131-
- libjpeg-turbo=3.0.0=hd590300_1
133+
- libjpeg-turbo=3.1.0=hb9d3cd8_0
132134
- liblapack=3.9.0=31_hc41d3b0_mkl
133135
- liblzma=5.8.1=hb9d3cd8_0
134136
- libnghttp2=1.64.0=h161d5f1_0
@@ -140,7 +142,7 @@ dependencies:
140142
- libssh2=1.11.1=hf672d98_0
141143
- libstdcxx=14.2.0=h8f9b012_2
142144
- libstdcxx-ng=14.2.0=h4852527_2
143-
- libtiff=4.7.0=hd9ff511_3
145+
- libtiff=4.7.0=hd9ff511_4
144146
- libuuid=2.38.1=h0b41bf4_0
145147
- libwebp-base=1.5.0=h851e524_0
146148
- libxcb=1.17.0=h8a09558_0
@@ -161,8 +163,8 @@ dependencies:
161163
- mistune=3.1.3=pyh29332c3_0
162164
- mkl=2024.2.2=ha957f24_16
163165
- msgpack-python=1.1.0=py310h3788b33_0
164-
- mumps-include=5.7.3=h82cca05_9
165-
- mumps-seq=5.7.3=hb5d91fa_9
166+
- mumps-include=5.7.3=h82cca05_10
167+
- mumps-seq=5.7.3=h06cbf8f_10
166168
- munkres=1.1.4=pyh9f0ad1d_0
167169
- myst-nb=1.2.0=pyh29332c3_0
168170
- myst-parser=1.0.0=pyhd8ed1ab_0
@@ -173,14 +175,14 @@ dependencies:
173175
- nbformat=5.10.4=pyhd8ed1ab_1
174176
- ncurses=6.5=h2d0b736_3
175177
- nest-asyncio=1.6.0=pyhd8ed1ab_1
176-
- notebook=7.4.0=pyhd8ed1ab_0
178+
- notebook=7.4.1=pyhd8ed1ab_0
177179
- notebook-shim=0.2.4=pyhd8ed1ab_1
178180
- numcodecs=0.13.1=py310h5eaa309_0
179181
- numpy=1.26.4=py310hb13e2d6_0
180182
- openjpeg=2.5.3=h5fbd93e_0
181183
- openssl=3.5.0=h7b32b05_0
182184
- overrides=7.7.0=pyhd8ed1ab_1
183-
- packaging=24.2=pyhd8ed1ab_2
185+
- packaging=25.0=pyh29332c3_1
184186
- pandas=2.2.3=py310h5eaa309_3
185187
- pandoc=3.6.4=ha770c72_0
186188
- pandocfilters=1.5.0=pyhd8ed1ab_0
@@ -219,7 +221,7 @@ dependencies:
219221
- python-json-logger=2.0.7=pyhd8ed1ab_0
220222
- python-mumps=0.0.3=py310h6410a28_0
221223
- python-tzdata=2025.2=pyhd8ed1ab_0
222-
- python_abi=3.10=6_cp310
224+
- python_abi=3.10=7_cp310
223225
- pytz=2025.2=pyhd8ed1ab_0
224226
- pyyaml=6.0.2=py310h89163eb_2
225227
- pyzmq=26.4.0=py310h71f11fc_0
@@ -233,7 +235,7 @@ dependencies:
233235
- scikit-learn=1.4.2=py310h981052a_1
234236
- scipy=1.14.1=py310hfcf56fc_2
235237
- send2trash=1.8.3=pyh0d859eb_1
236-
- setuptools=78.1.0=pyhff2d567_0
238+
- setuptools=79.0.1=pyhff2d567_0
237239
- six=1.17.0=pyhd8ed1ab_0
238240
- sniffio=1.3.1=pyhd8ed1ab_1
239241
- snowballstemmer=2.2.0=pyhd8ed1ab_0
@@ -299,11 +301,11 @@ dependencies:
299301
- zstandard=0.23.0=py310ha75aee5_1
300302
- zstd=1.5.7=hb8e6e7a_2
301303
- pip:
302-
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
303-
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
304-
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
305-
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
306-
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
304+
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
305+
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
306+
- mira-simpeg == 0.23.0.1a3 --hash=sha256:14467e65d801e082bac8a4d972a30b162018df27d06310fb1f2c6960968f88d2
307+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
308+
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
307309

308310
variables:
309311
KMP_WARNINGS: 0

environments/py-3.10-linux-64.conda.lock.yml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Generated by conda-lock.
22
# platform: linux-64
3-
# input_hash: 56e602b8af1ebc1738ca576ebfcf93cddf7a032057e30ac11481638bad29d0fc
3+
# input_hash: 6792419f707082db0392c7c66ae972128d5c2dcf3407d75de33f30b4e4f1e33d
44

55
channels:
66
- conda-forge
@@ -15,7 +15,7 @@ dependencies:
1515
- brotli-python=1.1.0=py310hf71b8c6_2
1616
- bzip2=1.0.8=h4bc722e_7
1717
- c-ares=1.34.5=hb9d3cd8_0
18-
- ca-certificates=2025.1.31=hbcca054_0
18+
- ca-certificates=2025.1.31=hbd8a1cb_1
1919
- cached-property=1.5.2=hd8ed1ab_1
2020
- cached_property=1.5.2=pyha770c72_1
2121
- certifi=2025.1.31=pyhd8ed1ab_0
@@ -31,7 +31,7 @@ dependencies:
3131
- distributed=2025.3.0=pyhd8ed1ab_0
3232
- fasteners=0.19=pyhd8ed1ab_1
3333
- fonttools=4.57.0=py310h89163eb_0
34-
- freetype=2.13.3=h48d6fc4_0
34+
- freetype=2.13.3=ha770c72_1
3535
- fsspec=2025.3.2=pyhd8ed1ab_0
3636
- geoana=0.7.2=py310ha2bacc8_0
3737
- h2=4.2.0=pyhd8ed1ab_0
@@ -47,27 +47,29 @@ dependencies:
4747
- krb5=1.21.3=h659f571_0
4848
- lcms2=2.17=h717163a_0
4949
- ld_impl_linux-64=2.43=h712a8e2_4
50-
- lerc=4.0.0=h27087fc_0
50+
- lerc=4.0.0=h0aef613_1
5151
- libaec=1.1.3=h59595ed_0
5252
- libblas=3.9.0=31_hfdb39a5_mkl
5353
- libbrotlicommon=1.1.0=hb9d3cd8_2
5454
- libbrotlidec=1.1.0=hb9d3cd8_2
5555
- libbrotlienc=1.1.0=hb9d3cd8_2
5656
- libcblas=3.9.0=31_h372d94f_mkl
5757
- libcurl=8.13.0=h332b0f4_0
58-
- libdeflate=1.23=h4ddbbb0_0
58+
- libdeflate=1.23=h86f0d12_0
5959
- libdlf=0.3.0=pyhd8ed1ab_1
6060
- libedit=3.1.20250104=pl5321h7949ede_0
6161
- libev=4.33=hd590300_2
6262
- libexpat=2.7.0=h5888daf_0
6363
- libffi=3.4.6=h2dba641_1
64+
- libfreetype=2.13.3=ha770c72_1
65+
- libfreetype6=2.13.3=h48d6fc4_1
6466
- libgcc=14.2.0=h767d61c_2
6567
- libgcc-ng=14.2.0=h69a702a_2
6668
- libgfortran=14.2.0=h69a702a_2
6769
- libgfortran5=14.2.0=hf1ad2bd_2
6870
- libhwloc=2.11.2=default_h0d58e46_1001
6971
- libiconv=1.18=h4ce23a2_1
70-
- libjpeg-turbo=3.0.0=hd590300_1
72+
- libjpeg-turbo=3.1.0=hb9d3cd8_0
7173
- liblapack=3.9.0=31_hc41d3b0_mkl
7274
- liblzma=5.8.1=hb9d3cd8_0
7375
- libnghttp2=1.64.0=h161d5f1_0
@@ -78,7 +80,7 @@ dependencies:
7880
- libssh2=1.11.1=hf672d98_0
7981
- libstdcxx=14.2.0=h8f9b012_2
8082
- libstdcxx-ng=14.2.0=h4852527_2
81-
- libtiff=4.7.0=hd9ff511_3
83+
- libtiff=4.7.0=hd9ff511_4
8284
- libuuid=2.38.1=h0b41bf4_0
8385
- libwebp-base=1.5.0=h851e524_0
8486
- libxcb=1.17.0=h8a09558_0
@@ -92,15 +94,15 @@ dependencies:
9294
- metis=5.1.0=hd0bcaf9_1007
9395
- mkl=2024.2.2=ha957f24_16
9496
- msgpack-python=1.1.0=py310h3788b33_0
95-
- mumps-include=5.7.3=h82cca05_9
96-
- mumps-seq=5.7.3=hb5d91fa_9
97+
- mumps-include=5.7.3=h82cca05_10
98+
- mumps-seq=5.7.3=h06cbf8f_10
9799
- munkres=1.1.4=pyh9f0ad1d_0
98100
- ncurses=6.5=h2d0b736_3
99101
- numcodecs=0.13.1=py310h5eaa309_0
100102
- numpy=1.26.4=py310hb13e2d6_0
101103
- openjpeg=2.5.3=h5fbd93e_0
102104
- openssl=3.5.0=h7b32b05_0
103-
- packaging=24.2=pyhd8ed1ab_2
105+
- packaging=25.0=pyh29332c3_1
104106
- pandas=2.2.3=py310h5eaa309_3
105107
- partd=1.4.2=pyhd8ed1ab_0
106108
- pillow=10.3.0=py310hebfe307_1
@@ -118,13 +120,13 @@ dependencies:
118120
- python-dateutil=2.9.0.post0=pyhff2d567_1
119121
- python-mumps=0.0.3=py310h6410a28_0
120122
- python-tzdata=2025.2=pyhd8ed1ab_0
121-
- python_abi=3.10=6_cp310
123+
- python_abi=3.10=7_cp310
122124
- pytz=2025.2=pyhd8ed1ab_0
123125
- pyyaml=6.0.2=py310h89163eb_2
124126
- readline=8.2=h8c095d6_2
125127
- scikit-learn=1.4.2=py310h981052a_1
126128
- scipy=1.14.1=py310hfcf56fc_2
127-
- setuptools=78.1.0=pyhff2d567_0
129+
- setuptools=79.0.1=pyhff2d567_0
128130
- six=1.17.0=pyhd8ed1ab_0
129131
- sortedcontainers=2.4.0=pyhd8ed1ab_1
130132
- tbb=2021.13.0=hceb3a55_1
@@ -151,11 +153,11 @@ dependencies:
151153
- zstandard=0.23.0=py310ha75aee5_1
152154
- zstd=1.5.7=hb8e6e7a_2
153155
- pip:
154-
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
155-
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
156-
- mira-simpeg == 0.23.0.1a2 --hash=sha256:931b533984dfcca301bea0d8e4a72a5f482731f0561a9ad95a790c516262d830
157-
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
158-
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
156+
- geoapps-utils == 0.5.0a3 --hash=sha256:a752b0c8d4b11cf7f5906c1794631f1ee65e77bd17eb3c5bb85390ff06a61c3c
157+
- geoh5py == 0.11.0a4 --hash=sha256:4965e934b1e57460f98f76f96eca100abf48fd722245154c35af86e7ecbc10a6
158+
- mira-simpeg == 0.23.0.1a3 --hash=sha256:14467e65d801e082bac8a4d972a30b162018df27d06310fb1f2c6960968f88d2
159+
- octree-creation-app == 0.3.0a2 --hash=sha256:002896126bf5a958aad1bb9c0a272bfd3c6985d1456dc8022c4e07b5582730ff
160+
- param-sweeps == 0.2.1a1 --hash=sha256:777618dd6eef4b6e86b4976e01c29bb202abb9d295b0774baeabf7534fb9389c
159161

160162
variables:
161163
KMP_WARNINGS: 0

0 commit comments

Comments
 (0)