Skip to content

Commit ad77f65

Browse files
sebhmgsebhmg
committed
[GEOPY-2274] for now, pay the cost of the openmp implementation and hope all is well at runtime...
openmp will weight some more on disk, and it is unclear if simpeg using mkl will play well with numpy using openblas. See the origin of the problem here: conda-forge/conda-forge-repodata-patches-feedstock#1057
1 parent 1049120 commit ad77f65

16 files changed

Lines changed: 1199 additions & 1181 deletions

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

Lines changed: 34 additions & 34 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: aa70c6c517bbe8472b7de3ce4e8d391ca7e1d86e6bfe0e2a4e53e756c6e8388b
3+
# input_hash: ea80e8faafb5e2c783138b0fad2b33db1e6eaf17288643fcb33ba5d2c66d108b
44

55
channels:
66
- conda-forge
@@ -10,9 +10,9 @@ dependencies:
1010
- accessible-pygments=0.0.5=pyhd8ed1ab_1
1111
- alabaster=0.7.16=pyhd8ed1ab_0
1212
- annotated-types=0.7.0=pyhd8ed1ab_1
13-
- anyio=4.9.0=pyh29332c3_0
13+
- anyio=4.10.0=pyhe01879c_0
1414
- argon2-cffi=25.1.0=pyhd8ed1ab_0
15-
- argon2-cffi-bindings=21.2.0=py310ha75aee5_5
15+
- argon2-cffi-bindings=25.1.0=py310h7c4b9e2_0
1616
- arrow=1.3.0=pyhd8ed1ab_1
1717
- asciitree=0.3.3=py_2
1818
- astroid=3.3.11=py310hff52083_0
@@ -29,18 +29,18 @@ dependencies:
2929
- brotli-python=1.1.0=py310hf71b8c6_3
3030
- bzip2=1.0.8=h4bc722e_7
3131
- c-ares=1.34.5=hb9d3cd8_0
32-
- ca-certificates=2025.7.14=hbd8a1cb_0
32+
- ca-certificates=2025.8.3=hbd8a1cb_0
3333
- cached-property=1.5.2=hd8ed1ab_1
3434
- cached_property=1.5.2=pyha770c72_1
35-
- certifi=2025.7.14=pyhd8ed1ab_0
35+
- certifi=2025.8.3=pyhd8ed1ab_0
3636
- cffi=1.17.1=py310h8deb56e_0
3737
- charset-normalizer=3.4.2=pyhd8ed1ab_0
3838
- click=8.2.1=pyh707e725_0
3939
- cloudpickle=3.1.1=pyhd8ed1ab_0
4040
- colorama=0.4.6=pyhd8ed1ab_1
4141
- comm=0.2.3=pyhe01879c_0
4242
- contourpy=1.3.2=py310h3788b33_0
43-
- coverage=7.10.1=py310h3406613_0
43+
- coverage=7.10.2=py310h3406613_0
4444
- cycler=0.12.1=pyhd8ed1ab_1
4545
- cytoolz=1.0.1=py310ha75aee5_0
4646
- dask-core=2025.3.0=pyhd8ed1ab_0
@@ -69,13 +69,12 @@ dependencies:
6969
- httpcore=1.0.9=pyh29332c3_0
7070
- httpx=0.28.1=pyhd8ed1ab_0
7171
- hyperframe=6.1.0=pyhd8ed1ab_0
72-
- icu=75.1=he02047a_0
7372
- idna=3.10=pyhd8ed1ab_1
7473
- imagesize=1.4.1=pyhd8ed1ab_0
7574
- importlib-metadata=8.7.0=pyhe01879c_1
7675
- importlib_metadata=8.7.0=h40b2b14_1
7776
- iniconfig=2.0.0=pyhd8ed1ab_1
78-
- ipykernel=6.30.0=pyh82676e8_0
77+
- ipykernel=6.30.1=pyh82676e8_0
7978
- ipython=8.37.0=pyh8f84b5b_0
8079
- ipython_genutils=0.2.0=pyhd8ed1ab_2
8180
- ipywidgets=7.8.5=pyhd8ed1ab_0
@@ -111,11 +110,11 @@ dependencies:
111110
- ld_impl_linux-64=2.44=h1423503_1
112111
- lerc=4.0.0=h0aef613_1
113112
- libaec=1.1.4=h3f801dc_0
114-
- libblas=3.9.0=32_hfdb39a5_mkl
113+
- libblas=3.9.0=33_h59b9bed_openblas
115114
- libbrotlicommon=1.1.0=hb9d3cd8_3
116115
- libbrotlidec=1.1.0=hb9d3cd8_3
117116
- libbrotlienc=1.1.0=hb9d3cd8_3
118-
- libcblas=3.9.0=32_h372d94f_mkl
117+
- libcblas=3.9.0=33_he106b2a_openblas
119118
- libcurl=8.14.1=h332b0f4_0
120119
- libdeflate=1.24=h86f0d12_0
121120
- libdlf=0.3.0=pyhd8ed1ab_1
@@ -125,34 +124,35 @@ dependencies:
125124
- libffi=3.4.6=h2dba641_1
126125
- libfreetype=2.13.3=ha770c72_1
127126
- libfreetype6=2.13.3=h48d6fc4_1
128-
- libgcc=15.1.0=h767d61c_3
129-
- libgcc-ng=15.1.0=h69a702a_3
130-
- libgfortran=15.1.0=h69a702a_3
131-
- libgfortran5=15.1.0=hcea5267_3
132-
- libhwloc=2.11.2=default_h3d81e11_1002
127+
- libgcc=15.1.0=h767d61c_4
128+
- libgcc-ng=15.1.0=h69a702a_4
129+
- libgfortran=15.1.0=h69a702a_4
130+
- libgfortran5=15.1.0=hcea5267_4
131+
- libhwloc=2.12.1=default_h3d81e11_1000
133132
- libiconv=1.18=h4ce23a2_1
134133
- libjpeg-turbo=3.1.0=hb9d3cd8_0
135-
- liblapack=3.9.0=32_hc41d3b0_mkl
134+
- liblapack=3.9.0=33_h7ac8fdf_openblas
136135
- liblzma=5.8.1=hb9d3cd8_2
137136
- libnghttp2=1.64.0=h161d5f1_0
138137
- libnsl=2.0.1=hb9d3cd8_1
139-
- libpng=1.6.50=h943b412_0
138+
- libopenblas=0.3.30=openmp_hd680484_1
139+
- libpng=1.6.50=h421ea60_1
140140
- libscotch=7.0.6=hea33c07_1
141141
- libsodium=1.0.20=h4ab18f5_0
142142
- libspatialindex=2.0.0=he02047a_0
143-
- libsqlite=3.50.3=hee844dc_1
143+
- libsqlite=3.50.4=h0c1763c_0
144144
- libssh2=1.11.1=hcf80075_0
145-
- libstdcxx=15.1.0=h8f9b012_3
146-
- libstdcxx-ng=15.1.0=h4852527_3
145+
- libstdcxx=15.1.0=h8f9b012_4
146+
- libstdcxx-ng=15.1.0=h4852527_4
147147
- libtiff=4.7.0=hf01ce69_5
148148
- libuuid=2.38.1=h0b41bf4_0
149149
- libwebp-base=1.6.0=hd42ef1d_0
150150
- libxcb=1.17.0=h8a09558_0
151151
- libxcrypt=4.4.36=hd590300_1
152-
- libxml2=2.13.8=h4bc477f_0
152+
- libxml2=2.13.8=h2cb61b6_1
153153
- libzlib=1.3.1=hb9d3cd8_2
154154
- linkify-it-py=2.0.3=pyhd8ed1ab_1
155-
- llvm-openmp=20.1.8=h4922eb0_0
155+
- llvm-openmp=20.1.8=h4922eb0_1
156156
- locket=1.0.0=pyhd8ed1ab_0
157157
- markdown-it-py=2.2.0=pyhd8ed1ab_0
158158
- markupsafe=3.0.2=py310h89163eb_1
@@ -163,7 +163,7 @@ dependencies:
163163
- mdurl=0.1.2=pyhd8ed1ab_1
164164
- metis=5.1.0=hd0bcaf9_1007
165165
- mistune=3.1.3=pyh29332c3_0
166-
- mkl=2024.2.2=ha770c72_16
166+
- mkl=2024.2.2=ha770c72_17
167167
- msgpack-python=1.1.1=py310h3788b33_0
168168
- mumps-include=5.7.3=h82cca05_10
169169
- mumps-seq=5.7.3=h06cbf8f_10
@@ -177,12 +177,12 @@ dependencies:
177177
- nbformat=5.10.4=pyhd8ed1ab_1
178178
- ncurses=6.5=h2d0b736_3
179179
- nest-asyncio=1.6.0=pyhd8ed1ab_1
180-
- notebook=7.4.4=pyhd8ed1ab_0
180+
- notebook=7.4.5=pyhd8ed1ab_0
181181
- notebook-shim=0.2.4=pyhd8ed1ab_1
182182
- numcodecs=0.13.1=py310h5eaa309_0
183183
- numpy=1.26.4=py310hb13e2d6_0
184-
- openjpeg=2.5.3=h5fbd93e_0
185-
- openssl=3.5.1=h7b32b05_0
184+
- openjpeg=2.5.3=h55fea9a_1
185+
- openssl=3.5.2=h26f9b46_0
186186
- overrides=7.7.0=pyhd8ed1ab_1
187187
- packaging=25.0=pyh29332c3_1
188188
- pandas=2.3.1=py310h0158d43_0
@@ -193,7 +193,7 @@ dependencies:
193193
- pexpect=4.9.0=pyhd8ed1ab_1
194194
- pickleshare=0.7.5=pyhd8ed1ab_1004
195195
- pillow=10.3.0=py310hebfe307_1
196-
- pip=25.1.1=pyh8b19718_0
196+
- pip=25.2=pyh8b19718_0
197197
- platformdirs=4.3.8=pyhe01879c_0
198198
- pluggy=1.6.0=pyhd8ed1ab_0
199199
- prometheus_client=0.22.1=pyhd8ed1ab_0
@@ -212,7 +212,7 @@ dependencies:
212212
- pygments=2.19.2=pyhd8ed1ab_0
213213
- pylint=3.3.7=pyhe01879c_0
214214
- pymatsolver=0.3.1=pyh48887ae_201
215-
- pyparsing=3.2.3=pyhd8ed1ab_1
215+
- pyparsing=3.2.3=pyhe01879c_2
216216
- pysocks=1.7.1=pyha55dd90_7
217217
- pytest=8.4.1=pyhd8ed1ab_0
218218
- pytest-cov=6.2.1=pyhd8ed1ab_0
@@ -225,7 +225,7 @@ dependencies:
225225
- python_abi=3.10=8_cp310
226226
- pytz=2025.2=pyhd8ed1ab_0
227227
- pyyaml=6.0.2=py310h89163eb_2
228-
- pyzmq=27.0.0=py310h71f11fc_0
228+
- pyzmq=27.0.1=py310h9a5fd63_0
229229
- readline=8.2=h8c095d6_2
230230
- readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1
231231
- referencing=0.36.2=pyh29332c3_0
@@ -261,10 +261,10 @@ dependencies:
261261
- sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1
262262
- sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1
263263
- sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1
264-
- sqlalchemy=2.0.41=py310ha75aee5_0
264+
- sqlalchemy=2.0.42=py310h7c4b9e2_0
265265
- stack_data=0.6.3=pyhd8ed1ab_1
266266
- tabulate=0.9.0=pyhd8ed1ab_2
267-
- tbb=2021.13.0=hceb3a55_1
267+
- tbb=2021.13.0=hb60516a_2
268268
- tblib=3.1.0=pyhd8ed1ab_0
269269
- terminado=0.18.1=pyh0d859eb_0
270270
- threadpoolctl=3.6.0=pyhecae5ae_0
@@ -305,9 +305,9 @@ dependencies:
305305
- zstandard=0.23.0=py310ha75aee5_2
306306
- zstd=1.5.7=hb8e6e7a_2
307307
- pip:
308-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8
309-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a
310-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df
308+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1dbe97d441d65962a94e071b5c1c27d9facd2050
309+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@41271883c83f9ad1c9f7b662335dd1d54f880547
310+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e1d9b31ba74e900b7f41f903b73ec2b4e4217b4
311311
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81
312312
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434
313313

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

Lines changed: 27 additions & 27 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: aa70c6c517bbe8472b7de3ce4e8d391ca7e1d86e6bfe0e2a4e53e756c6e8388b
3+
# input_hash: ea80e8faafb5e2c783138b0fad2b33db1e6eaf17288643fcb33ba5d2c66d108b
44

55
channels:
66
- conda-forge
@@ -15,10 +15,10 @@ dependencies:
1515
- brotli-python=1.1.0=py310hf71b8c6_3
1616
- bzip2=1.0.8=h4bc722e_7
1717
- c-ares=1.34.5=hb9d3cd8_0
18-
- ca-certificates=2025.7.14=hbd8a1cb_0
18+
- ca-certificates=2025.8.3=hbd8a1cb_0
1919
- cached-property=1.5.2=hd8ed1ab_1
2020
- cached_property=1.5.2=pyha770c72_1
21-
- certifi=2025.7.14=pyhd8ed1ab_0
21+
- certifi=2025.8.3=pyhd8ed1ab_0
2222
- cffi=1.17.1=py310h8deb56e_0
2323
- click=8.2.1=pyh707e725_0
2424
- cloudpickle=3.1.1=pyhd8ed1ab_0
@@ -39,7 +39,6 @@ dependencies:
3939
- hdf5=1.14.6=nompi_h6e4c0c1_103
4040
- hpack=4.1.0=pyhd8ed1ab_0
4141
- hyperframe=6.1.0=pyhd8ed1ab_0
42-
- icu=75.1=he02047a_0
4342
- importlib-metadata=8.7.0=pyhe01879c_1
4443
- jinja2=3.1.6=pyhd8ed1ab_0
4544
- joblib=1.5.1=pyhd8ed1ab_0
@@ -50,11 +49,11 @@ dependencies:
5049
- ld_impl_linux-64=2.44=h1423503_1
5150
- lerc=4.0.0=h0aef613_1
5251
- libaec=1.1.4=h3f801dc_0
53-
- libblas=3.9.0=32_hfdb39a5_mkl
52+
- libblas=3.9.0=33_h59b9bed_openblas
5453
- libbrotlicommon=1.1.0=hb9d3cd8_3
5554
- libbrotlidec=1.1.0=hb9d3cd8_3
5655
- libbrotlienc=1.1.0=hb9d3cd8_3
57-
- libcblas=3.9.0=32_h372d94f_mkl
56+
- libcblas=3.9.0=33_he106b2a_openblas
5857
- libcurl=8.14.1=h332b0f4_0
5958
- libdeflate=1.24=h86f0d12_0
6059
- libdlf=0.3.0=pyhd8ed1ab_1
@@ -64,59 +63,60 @@ dependencies:
6463
- libffi=3.4.6=h2dba641_1
6564
- libfreetype=2.13.3=ha770c72_1
6665
- libfreetype6=2.13.3=h48d6fc4_1
67-
- libgcc=15.1.0=h767d61c_3
68-
- libgcc-ng=15.1.0=h69a702a_3
69-
- libgfortran=15.1.0=h69a702a_3
70-
- libgfortran5=15.1.0=hcea5267_3
71-
- libhwloc=2.11.2=default_h3d81e11_1002
66+
- libgcc=15.1.0=h767d61c_4
67+
- libgcc-ng=15.1.0=h69a702a_4
68+
- libgfortran=15.1.0=h69a702a_4
69+
- libgfortran5=15.1.0=hcea5267_4
70+
- libhwloc=2.12.1=default_h3d81e11_1000
7271
- libiconv=1.18=h4ce23a2_1
7372
- libjpeg-turbo=3.1.0=hb9d3cd8_0
74-
- liblapack=3.9.0=32_hc41d3b0_mkl
73+
- liblapack=3.9.0=33_h7ac8fdf_openblas
7574
- liblzma=5.8.1=hb9d3cd8_2
7675
- libnghttp2=1.64.0=h161d5f1_0
7776
- libnsl=2.0.1=hb9d3cd8_1
78-
- libpng=1.6.50=h943b412_0
77+
- libopenblas=0.3.30=openmp_hd680484_1
78+
- libpng=1.6.50=h421ea60_1
7979
- libscotch=7.0.6=hea33c07_1
8080
- libspatialindex=2.0.0=he02047a_0
81-
- libsqlite=3.50.3=hee844dc_1
81+
- libsqlite=3.50.4=h0c1763c_0
8282
- libssh2=1.11.1=hcf80075_0
83-
- libstdcxx=15.1.0=h8f9b012_3
84-
- libstdcxx-ng=15.1.0=h4852527_3
83+
- libstdcxx=15.1.0=h8f9b012_4
84+
- libstdcxx-ng=15.1.0=h4852527_4
8585
- libtiff=4.7.0=hf01ce69_5
8686
- libuuid=2.38.1=h0b41bf4_0
8787
- libwebp-base=1.6.0=hd42ef1d_0
8888
- libxcb=1.17.0=h8a09558_0
8989
- libxcrypt=4.4.36=hd590300_1
90-
- libxml2=2.13.8=h4bc477f_0
90+
- libxml2=2.13.8=h2cb61b6_1
9191
- libzlib=1.3.1=hb9d3cd8_2
92-
- llvm-openmp=20.1.8=h4922eb0_0
92+
- llvm-openmp=20.1.8=h4922eb0_1
9393
- locket=1.0.0=pyhd8ed1ab_0
9494
- markupsafe=3.0.2=py310h89163eb_1
9595
- matplotlib-base=3.8.4=py310hef631a5_2
9696
- metis=5.1.0=hd0bcaf9_1007
97-
- mkl=2024.2.2=ha770c72_16
97+
- mkl=2024.2.2=ha770c72_17
9898
- msgpack-python=1.1.1=py310h3788b33_0
9999
- mumps-include=5.7.3=h82cca05_10
100100
- mumps-seq=5.7.3=h06cbf8f_10
101101
- munkres=1.1.4=pyhd8ed1ab_1
102102
- ncurses=6.5=h2d0b736_3
103103
- numcodecs=0.13.1=py310h5eaa309_0
104104
- numpy=1.26.4=py310hb13e2d6_0
105-
- openjpeg=2.5.3=h5fbd93e_0
106-
- openssl=3.5.1=h7b32b05_0
105+
- openjpeg=2.5.3=h55fea9a_1
106+
- openssl=3.5.2=h26f9b46_0
107107
- packaging=25.0=pyh29332c3_1
108108
- pandas=2.3.1=py310h0158d43_0
109109
- partd=1.4.2=pyhd8ed1ab_0
110110
- pillow=10.3.0=py310hebfe307_1
111-
- pip=25.1.1=pyh8b19718_0
111+
- pip=25.2=pyh8b19718_0
112112
- psutil=7.0.0=py310ha75aee5_0
113113
- pthread-stubs=0.4=hb9d3cd8_1002
114114
- pycparser=2.22=pyh29332c3_1
115115
- pydantic=2.11.7=pyh3cfb1c2_0
116116
- pydantic-core=2.33.2=py310hbcd0ec0_0
117117
- pydiso=0.1.2=py310h69a6472_0
118118
- pymatsolver=0.3.1=pyh48887ae_201
119-
- pyparsing=3.2.3=pyhd8ed1ab_1
119+
- pyparsing=3.2.3=pyhe01879c_2
120120
- pysocks=1.7.1=pyha55dd90_7
121121
- python=3.10.18=hd6af730_0_cpython
122122
- python-dateutil=2.9.0.post0=pyhe01879c_2
@@ -132,7 +132,7 @@ dependencies:
132132
- setuptools=80.9.0=pyhff2d567_0
133133
- six=1.17.0=pyhe01879c_1
134134
- sortedcontainers=2.4.0=pyhd8ed1ab_1
135-
- tbb=2021.13.0=hceb3a55_1
135+
- tbb=2021.13.0=hb60516a_2
136136
- tblib=3.1.0=pyhd8ed1ab_0
137137
- threadpoolctl=3.6.0=pyhecae5ae_0
138138
- tk=8.6.13=noxft_hd72426e_102
@@ -157,9 +157,9 @@ dependencies:
157157
- zstandard=0.23.0=py310ha75aee5_2
158158
- zstd=1.5.7=hb8e6e7a_2
159159
- pip:
160-
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@c64e2db54bfdacc19ef675a7d54288aaad8b78a8
161-
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@53f7981670df120297945a4c3c1f7fce74f5ed3a
162-
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@01a7068fdab7fba8695ad371c9fd9164760a09df
160+
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1dbe97d441d65962a94e071b5c1c27d9facd2050
161+
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@41271883c83f9ad1c9f7b662335dd1d54f880547
162+
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@2e1d9b31ba74e900b7f41f903b73ec2b4e4217b4
163163
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@02fbd85bf7d54b8f4336f1f0094c1c3e27714e81
164164
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@9ed6091534d638171957a17324e1a1e8f067b434
165165

0 commit comments

Comments
 (0)