Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
cd7a9c8
Inner parallel process to create simulations
domfournier Oct 15, 2025
e21d7f0
Revert nested distributed
domfournier Oct 16, 2025
132b123
Add broadcasting and debug prints
domfournier Oct 16, 2025
f21f552
Add more prints
domfournier Oct 16, 2025
479574b
Remove broadcasting
domfournier Oct 16, 2025
40c4e51
Try with inner parallel blocks
domfournier Oct 16, 2025
967660b
Use temp file to pickle simulation instead of scattering. Simplify lo…
domfournier Oct 19, 2025
e10fdbb
Use local directory for pickling sim and local cluster
domfournier Oct 19, 2025
c52c718
Use max_chunk_size for 1D blocks
domfournier Oct 19, 2025
242ac2f
Change default chunk size for 1Ds
domfournier Oct 20, 2025
c6d1d5f
Clean up nested functions
domfournier Oct 20, 2025
1b2eca3
Remove fftfilt from simularion for picking. Improve defaults for 1D d…
domfournier Oct 20, 2025
bd85e2c
Suppress warning of workspace open
domfournier Oct 20, 2025
810e71c
Clean up misfit_factory, fix dc survey
domfournier Oct 20, 2025
5f14ec3
More clean ups
domfournier Oct 20, 2025
1de7f82
Re-do create_misfit function
domfournier Oct 20, 2025
d364e40
Merge branch 'develop' into GEOPY-2526
domfournier Oct 20, 2025
47ddc18
Use isin instead of intersect
domfournier Oct 21, 2025
e6fa531
improve logging. Don't close the file for PlateSim. changes to simpeg…
domfournier Oct 21, 2025
62de597
Merge branch 'GEOPY-2526' of https://github.com/MiraGeoscience/simpeg…
domfournier Oct 21, 2025
779eb1c
Coerce ordering of frequencies
domfournier Oct 22, 2025
5d75513
Make test runable with distributed
domfournier Oct 22, 2025
40ae467
adjust indexing in test
domfournier Oct 22, 2025
b96a7bb
re-lock
domfournier Oct 22, 2025
49da1f8
Switch to repeat
domfournier Oct 22, 2025
23f9cb8
More typing
domfournier Oct 22, 2025
72b0f13
Update typing on channel
domfournier Oct 22, 2025
503ba6b
Try sending smaller chunks of simulations to workers
domfournier Oct 23, 2025
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
52 changes: 25 additions & 27 deletions environments/py-3.10-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ channels:
- conda-forge
- nodefaults
dependencies:
- _openmp_mutex=4.5=4_kmp_llvm
- _openmp_mutex=4.5=5_kmp_llvm
- accessible-pygments=0.0.5=pyhd8ed1ab_1
- alabaster=0.7.16=pyhd8ed1ab_0
- annotated-types=0.7.0=pyhd8ed1ab_1
- anyio=4.11.0=pyhcf101f3_0
- argon2-cffi=25.1.0=pyhd8ed1ab_0
- argon2-cffi-bindings=25.1.0=py310h7c4b9e2_1
- arrow=1.3.0=pyhd8ed1ab_1
- arrow=1.4.0=pyhcf101f3_0
- asciitree=0.3.3=py_2
- astroid=4.0.1=py310hff52083_0
- asttokens=2.4.1=pyhd8ed1ab_0
Expand All @@ -40,9 +40,9 @@ dependencies:
- colorama=0.4.6=pyhd8ed1ab_1
- comm=0.2.3=pyhe01879c_0
- contourpy=1.3.2=py310h3788b33_0
- coverage=7.10.7=py310h3406613_0
- coverage=7.11.0=py310h3406613_0
- cycler=0.12.1=pyhd8ed1ab_1
- cytoolz=1.0.1=py310ha75aee5_0
- cytoolz=1.1.0=py310h7c4b9e2_1
- dask-core=2025.3.0=pyhd8ed1ab_0
- dataclasses=0.8=pyhc8e2a94_3
- debugpy=1.8.17=py310h25320af_0
Expand All @@ -59,22 +59,21 @@ dependencies:
- fqdn=1.5.1=pyhd8ed1ab_1
- freetype=2.14.1=ha770c72_0
- fsspec=2025.9.0=pyhd8ed1ab_0
- geoana=0.7.2=py310ha2bacc8_0
- geoana=0.7.2=py310hc563356_1
- greenlet=3.2.4=py310hea6c23e_1
- h11=0.16.0=pyhd8ed1ab_0
- h2=4.3.0=pyhcf101f3_0
- h5py=3.14.0=nompi_py310h4aa865e_101
- h5py=3.15.1=nompi_py310h4aa865e_100
- hdf5=1.14.6=nompi_h6e4c0c1_103
- hpack=4.1.0=pyhd8ed1ab_0
- httpcore=1.0.9=pyh29332c3_0
- httpx=0.28.1=pyhd8ed1ab_0
- hyperframe=6.1.0=pyhd8ed1ab_0
- icu=75.1=he02047a_0
- idna=3.11=pyhd8ed1ab_0
- imagesize=1.4.1=pyhd8ed1ab_0
- importlib-metadata=8.7.0=pyhe01879c_1
- importlib_metadata=8.7.0=h40b2b14_1
- iniconfig=2.0.0=pyhd8ed1ab_1
- iniconfig=2.3.0=pyhd8ed1ab_0
- ipykernel=7.0.1=pyha191276_0
- ipython=8.37.0=pyh8f84b5b_0
- ipython_genutils=0.2.0=pyhd8ed1ab_2
Expand All @@ -93,15 +92,15 @@ dependencies:
- jupyter-cache=1.0.1=pyhff2d567_0
- jupyter-lsp=2.3.0=pyhcf101f3_0
- jupyter_client=8.6.3=pyhd8ed1ab_1
- jupyter_core=5.8.1=pyh31011fe_0
- jupyter_core=5.9.1=pyhc90fa1f_0
- jupyter_events=0.12.0=pyh29332c3_0
- jupyter_server=2.17.0=pyhcf101f3_0
- jupyter_server_terminals=0.5.3=pyhd8ed1ab_1
- jupyterlab=4.4.9=pyhd8ed1ab_0
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
- jupyterlab_server=2.27.3=pyhd8ed1ab_1
- jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
- jupytext=1.17.3=pyh80e38bb_0
- jupytext=1.18.1=pyh80e38bb_0
- keyutils=1.6.3=hb9d3cd8_0
- kiwisolver=1.4.9=py310haaf941d_1
- krb5=1.21.3=h659f571_0
Expand All @@ -116,7 +115,7 @@ dependencies:
- libbrotlidec=1.1.0=hb03c661_4
- libbrotlienc=1.1.0=hb03c661_4
- libcblas=3.9.0=37_hfef963f_mkl
- libcurl=8.14.1=h332b0f4_0
- libcurl=8.16.0=h4e3cde8_0
- libdeflate=1.24=h86f0d12_0
- libdlf=0.3.0=pyhd8ed1ab_1
- libedit=3.1.20250104=pl5321h7949ede_0
Expand Down Expand Up @@ -149,11 +148,11 @@ dependencies:
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
- libxcrypt=4.4.36=hd590300_1
- libxml2=2.15.0=h26afc86_1
- libxml2-16=2.15.0=ha9997c6_1
- libxml2=2.15.1=h031cc0b_0
- libxml2-16=2.15.1=hf2a90c1_0
- libzlib=1.3.1=hb9d3cd8_2
- linkify-it-py=2.0.3=pyhd8ed1ab_1
- llvm-openmp=21.1.3=h4922eb0_0
- llvm-openmp=21.1.4=h4922eb0_0
- locket=1.0.0=pyhd8ed1ab_0
- markdown-it-py=2.2.0=pyhd8ed1ab_0
- markupsafe=3.0.3=py310h3406613_0
Expand All @@ -172,9 +171,9 @@ dependencies:
- myst-nb=1.3.0=pyhe01879c_0
- myst-parser=1.0.0=pyhd8ed1ab_0
- nbclient=0.10.2=pyhd8ed1ab_0
- nbconvert=7.16.6=hb482800_0
- nbconvert-core=7.16.6=pyh29332c3_0
- nbconvert-pandoc=7.16.6=hed9df3c_0
- nbconvert=7.16.6=hc388f54_1
- nbconvert-core=7.16.6=pyhcf101f3_1
- nbconvert-pandoc=7.16.6=h7d6f222_1
- nbformat=5.10.4=pyhd8ed1ab_1
- ncurses=6.5=h2d0b736_3
- nest-asyncio=1.6.0=pyhd8ed1ab_1
Expand All @@ -187,7 +186,7 @@ dependencies:
- overrides=7.7.0=pyhd8ed1ab_1
- packaging=25.0=pyh29332c3_1
- pandas=2.3.3=py310h0158d43_1
- pandoc=3.8.2=ha770c72_0
- pandoc=3.8.2.1=ha770c72_0
- pandocfilters=1.5.0=pyhd8ed1ab_0
- parso=0.8.5=pyhcf101f3_0
- partd=1.4.2=pyhd8ed1ab_0
Expand All @@ -206,12 +205,12 @@ dependencies:
- pybtex=0.25.1=pyhd8ed1ab_0
- pybtex-docutils=1.0.3=py310hff52083_3
- pycparser=2.22=pyh29332c3_1
- pydantic=2.12.1=pyh3cfb1c2_0
- pydantic-core=2.41.3=py310hd8f68c5_0
- pydantic=2.12.3=pyh3cfb1c2_0
- pydantic-core=2.41.4=py310hd8f68c5_0
- pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0
- pydiso=0.1.2=py310h69a6472_0
- pydiso=0.1.2=py310h4b187eb_1
- pygments=2.19.2=pyhd8ed1ab_0
- pylint=4.0.0=pyhcf101f3_0
- pylint=4.0.2=pyhcf101f3_0
- pymatsolver=0.3.1=pyh48887ae_201
- pyparsing=3.2.5=pyhcf101f3_0
- pysocks=1.7.1=pyha55dd90_7
Expand Down Expand Up @@ -273,12 +272,11 @@ dependencies:
- tk=8.6.13=noxft_hd72426e_102
- tomli=2.3.0=pyhcf101f3_0
- tomlkit=0.13.3=pyha770c72_0
- toolz=1.0.0=pyhd8ed1ab_1
- toolz=1.1.0=pyhd8ed1ab_1
- tornado=6.5.2=py310h7c4b9e2_1
- tqdm=4.67.1=pyhd8ed1ab_1
- traitlets=5.14.3=pyhd8ed1ab_1
- trimesh=4.1.8=pyhd8ed1ab_0
- types-python-dateutil=2.9.0.20251008=pyhd8ed1ab_0
- typing-extensions=4.15.0=h396c80c_0
- typing-inspection=0.4.2=pyhd8ed1ab_0
- typing_extensions=4.15.0=pyhcf101f3_0
Expand Down Expand Up @@ -306,9 +304,9 @@ dependencies:
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed5f5cf8cd1a3ef9c3ec13140215d4b5d3da0a31
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@b7e7ecdb90fb6daa40c9d7348380542fd1131994
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7564c0999208f9ff8f9e3733f5ffd22da9b333ee
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ad308257fed905370b41557f86dea6ea85fa6fb3
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b3352058d585613d34ff3042675a79a3b3e4bfbd
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@489775b595d5abce81d49b52bfefcecc3181c5c5

variables:
KMP_WARNINGS: 0
31 changes: 15 additions & 16 deletions environments/py-3.10-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
- conda-forge
- nodefaults
dependencies:
- _openmp_mutex=4.5=4_kmp_llvm
- _openmp_mutex=4.5=5_kmp_llvm
- annotated-types=0.7.0=pyhd8ed1ab_1
- asciitree=0.3.3=py_2
- bokeh=3.6.3=pyhd8ed1ab_0
Expand All @@ -25,21 +25,20 @@ dependencies:
- colorama=0.4.6=pyhd8ed1ab_1
- contourpy=1.3.2=py310h3788b33_0
- cycler=0.12.1=pyhd8ed1ab_1
- cytoolz=1.0.1=py310ha75aee5_0
- cytoolz=1.1.0=py310h7c4b9e2_1
- dask-core=2025.3.0=pyhd8ed1ab_0
- discretize=0.11.3=py310hc563356_1
- distributed=2025.3.0=pyhd8ed1ab_0
- fasteners=0.19=pyhd8ed1ab_1
- fonttools=4.60.1=py310h3406613_0
- freetype=2.14.1=ha770c72_0
- fsspec=2025.9.0=pyhd8ed1ab_0
- geoana=0.7.2=py310ha2bacc8_0
- geoana=0.7.2=py310hc563356_1
- h2=4.3.0=pyhcf101f3_0
- h5py=3.14.0=nompi_py310h4aa865e_101
- h5py=3.15.1=nompi_py310h4aa865e_100
- hdf5=1.14.6=nompi_h6e4c0c1_103
- hpack=4.1.0=pyhd8ed1ab_0
- hyperframe=6.1.0=pyhd8ed1ab_0
- icu=75.1=he02047a_0
- importlib-metadata=8.7.0=pyhe01879c_1
- jinja2=3.1.6=pyhd8ed1ab_0
- joblib=1.5.2=pyhd8ed1ab_0
Expand All @@ -55,7 +54,7 @@ dependencies:
- libbrotlidec=1.1.0=hb03c661_4
- libbrotlienc=1.1.0=hb03c661_4
- libcblas=3.9.0=37_hfef963f_mkl
- libcurl=8.14.1=h332b0f4_0
- libcurl=8.16.0=h4e3cde8_0
- libdeflate=1.24=h86f0d12_0
- libdlf=0.3.0=pyhd8ed1ab_1
- libedit=3.1.20250104=pl5321h7949ede_0
Expand Down Expand Up @@ -87,10 +86,10 @@ dependencies:
- libwebp-base=1.6.0=hd42ef1d_0
- libxcb=1.17.0=h8a09558_0
- libxcrypt=4.4.36=hd590300_1
- libxml2=2.15.0=h26afc86_1
- libxml2-16=2.15.0=ha9997c6_1
- libxml2=2.15.1=h031cc0b_0
- libxml2-16=2.15.1=hf2a90c1_0
- libzlib=1.3.1=hb9d3cd8_2
- llvm-openmp=21.1.3=h4922eb0_0
- llvm-openmp=21.1.4=h4922eb0_0
- locket=1.0.0=pyhd8ed1ab_0
- markupsafe=3.0.3=py310h3406613_0
- matplotlib-base=3.8.4=py310hef631a5_2
Expand All @@ -113,9 +112,9 @@ dependencies:
- psutil=7.1.0=py310h7c4b9e2_0
- pthread-stubs=0.4=hb9d3cd8_1002
- pycparser=2.22=pyh29332c3_1
- pydantic=2.12.1=pyh3cfb1c2_0
- pydantic-core=2.41.3=py310hd8f68c5_0
- pydiso=0.1.2=py310h69a6472_0
- pydantic=2.12.3=pyh3cfb1c2_0
- pydantic-core=2.41.4=py310hd8f68c5_0
- pydiso=0.1.2=py310h4b187eb_1
- pymatsolver=0.3.1=pyh48887ae_201
- pyparsing=3.2.5=pyhcf101f3_0
- pysocks=1.7.1=pyha55dd90_7
Expand All @@ -137,7 +136,7 @@ dependencies:
- tblib=3.1.0=pyhd8ed1ab_0
- threadpoolctl=3.6.0=pyhecae5ae_0
- tk=8.6.13=noxft_hd72426e_102
- toolz=1.0.0=pyhd8ed1ab_1
- toolz=1.1.0=pyhd8ed1ab_1
- tornado=6.5.2=py310h7c4b9e2_1
- tqdm=4.67.1=pyhd8ed1ab_1
- trimesh=4.1.8=pyhd8ed1ab_0
Expand All @@ -159,9 +158,9 @@ dependencies:
- zstd=1.5.7=hb8e6e7a_2
- pip:
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed5f5cf8cd1a3ef9c3ec13140215d4b5d3da0a31
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@b7e7ecdb90fb6daa40c9d7348380542fd1131994
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@ed6918388d6fc4062f72e471e415a1a22cc15d0d
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7564c0999208f9ff8f9e3733f5ffd22da9b333ee
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@ad308257fed905370b41557f86dea6ea85fa6fb3
- grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@b3352058d585613d34ff3042675a79a3b3e4bfbd
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@489775b595d5abce81d49b52bfefcecc3181c5c5

variables:
KMP_WARNINGS: 0
Loading