Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
5670575
Create meta_simulation from local_sim
domfournier Dec 4, 2024
07c69bb
First full run
domfournier Dec 4, 2024
c1337ea
Merge branch 'develop' into GEOPY-1879
domfournier Dec 6, 2024
a5ffb05
Fix mapping for joint drivers
domfournier Dec 10, 2024
a918a1c
Create distributed client and parse DaskSimulations
domfournier Dec 11, 2024
fa9ad02
Change imports to Dask classes
domfournier Dec 12, 2024
861445b
Better detection of client
domfournier Dec 14, 2024
de91b1f
Revert back to overloaded classes
domfournier Dec 15, 2024
5d89c0b
Use explicit dask class. Add diagnostics to driver
domfournier Dec 27, 2024
311fb1b
Print out profile
domfournier Dec 27, 2024
d6cf936
Try with flatten simulations
domfournier Dec 28, 2024
d136d86
Revert back to meta simulations
domfournier Jan 8, 2025
4cd7904
Avoid re-computing identical local meshes on components
domfournier Jan 13, 2025
6cbc063
Only compute z on unique xy centroids
domfournier Jan 13, 2025
324296e
Add bokeh
domfournier Jan 20, 2025
3a0d9b0
Improve diagnostic naming
domfournier Jan 22, 2025
89d63ce
Compute projections ahead of time for FEM
domfournier Jan 25, 2025
cc0683b
Move pre-computation of receiver projection to misfit factory
domfournier Jan 27, 2025
d0b87ab
Merge branch 'develop' into GEOPY-1879
domfournier Jan 27, 2025
8301b46
Use context for cluster
domfournier Jan 30, 2025
be27c7a
Pre-compute projections for DC and IP surveys
domfournier Feb 3, 2025
a9f40ac
Bad indexing of tensor mesh
domfournier Feb 3, 2025
3e88421
Re-lock on simpeg GEOPY-1879
domfournier Feb 4, 2025
affed71
Merge branch 'develop' into GEOPY-1879
domfournier Feb 4, 2025
6822865
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 4, 2025
b8b20cb
Clean out stuff
domfournier Feb 5, 2025
12a320c
Merge branch 'develop' into GEOPY-1879
domfournier Feb 5, 2025
2b37109
Merge branch 'GEOPY-1879' of https://github.com/MiraGeoscience/simpeg…
domfournier Feb 5, 2025
6586563
Update locks
domfournier Feb 5, 2025
75ed988
Fix tile estimator
domfournier Feb 5, 2025
7453ffd
Cleanups and use public spatialP attribute
domfournier Feb 5, 2025
1f9679a
Fix typo
domfournier Feb 5, 2025
aa1f832
Cleanup driver. Move LocalCluster mechanism to runtest/mag for later.
domfournier Feb 5, 2025
5934134
Fix data test
domfournier Feb 5, 2025
bf3daae
Update IP test after fixing multiplier
domfournier Feb 5, 2025
dc57d4c
Update locks
domfournier Feb 5, 2025
77163f2
Revert default cooling rate to 1
domfournier Feb 5, 2025
be69f3e
Relock
domfournier Feb 6, 2025
67b57fd
Expand tile meshes
domfournier Feb 6, 2025
18ee8d8
Update test target after increasing padding on tiles
domfournier Feb 6, 2025
bf9d181
Relock
domfournier Feb 7, 2025
901d5de
Merge branch 'develop' into GEOPY-1879
domfournier Feb 7, 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
48 changes: 25 additions & 23 deletions environments/py-3.10-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: ca22b3cf594fe1241f8f87f565fd22f40f4228a4f15b395006f4324731b6a772
# input_hash: d73ecef65ed7b0f752cc2f320c00b21f7170a26ac3e84514a882fcfe83a9605f

channels:
- conda-forge
Expand All @@ -20,16 +20,17 @@ dependencies:
- asttokens=3.0.0=pyhd8ed1ab_1
- async-lru=2.0.4=pyhd8ed1ab_1
- attrs=25.1.0=pyh71513ae_0
- babel=2.16.0=pyhd8ed1ab_1
- beautifulsoup4=4.12.3=pyha770c72_1
- babel=2.17.0=pyhd8ed1ab_0
- beautifulsoup4=4.13.3=pyha770c72_0
- bleach=6.2.0=pyh29332c3_4
- bleach-with-css=6.2.0=h82add2a_4
- bokeh=3.6.3=pyhd8ed1ab_0
- brotli=1.1.0=hb9d3cd8_2
- brotli-bin=1.1.0=hb9d3cd8_2
- brotli-python=1.1.0=py310hf71b8c6_2
- bzip2=1.0.8=h4bc722e_7
- c-ares=1.34.4=hb9d3cd8_0
- ca-certificates=2024.12.14=hbcca054_0
- ca-certificates=2025.1.31=hbcca054_0
- cached-property=1.5.2=hd8ed1ab_1
- cached_property=1.5.2=pyha770c72_1
- certifi=2024.12.14=pyhd8ed1ab_0
Expand All @@ -56,14 +57,14 @@ dependencies:
- exceptiongroup=1.2.2=pyhd8ed1ab_1
- executing=2.1.0=pyhd8ed1ab_1
- fasteners=0.19=pyhd8ed1ab_1
- fonttools=4.55.6=py310h89163eb_0
- fonttools=4.55.8=py310h89163eb_0
- fqdn=1.5.1=pyhd8ed1ab_1
- freetype=2.12.1=h267a509_2
- fsspec=2022.11.0=pyhd8ed1ab_0
- geoana=0.5.0=py310hcb52e73_4
- greenlet=3.1.1=py310hf71b8c6_1
- h11=0.14.0=pyhd8ed1ab_1
- h2=4.1.0=pyhd8ed1ab_1
- h2=4.2.0=pyhd8ed1ab_0
- h5py=3.12.1=nompi_py310hacc6608_103
- hdf5=1.14.4=nompi_h2d575fe_105
- hpack=4.1.0=pyhd8ed1ab_0
Expand All @@ -77,7 +78,7 @@ dependencies:
- importlib_resources=6.5.2=pyhd8ed1ab_0
- iniconfig=2.0.0=pyhd8ed1ab_1
- ipykernel=6.29.5=pyh3099207_0
- ipython=8.31.0=pyh707e725_0
- ipython=8.32.0=pyh907856f_0
- ipython_genutils=0.2.0=pyhd8ed1ab_2
- ipywidgets=7.8.5=pyhd8ed1ab_0
- isoduration=20.11.0=pyhd8ed1ab_1
Expand All @@ -95,10 +96,10 @@ dependencies:
- jupyter-lsp=2.2.5=pyhd8ed1ab_1
- jupyter_client=8.6.3=pyhd8ed1ab_1
- jupyter_core=5.7.2=pyh31011fe_1
- jupyter_events=0.11.0=pyhd8ed1ab_0
- jupyter_events=0.12.0=pyh29332c3_0
- jupyter_server=2.15.0=pyhd8ed1ab_0
- jupyter_server_terminals=0.5.3=pyhd8ed1ab_1
- jupyterlab=4.3.4=pyhd8ed1ab_0
- jupyterlab=4.3.5=pyhd8ed1ab_0
- jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
- jupyterlab_server=2.27.3=pyhd8ed1ab_1
- jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
Expand All @@ -119,7 +120,7 @@ dependencies:
- libcurl=8.11.1=h332b0f4_0
- libdeflate=1.23=h4ddbbb0_0
- libdlf=0.3.0=pyhd8ed1ab_1
- libedit=3.1.20240808=pl5321h7949ede_0
- libedit=3.1.20250104=pl5321h7949ede_0
- libev=4.33=hd590300_2
- libffi=3.4.2=h7f98852_5
- libgcc=14.2.0=h77fa898_1
Expand All @@ -130,8 +131,8 @@ dependencies:
- libiconv=1.17=hd590300_2
- libjpeg-turbo=3.0.0=hd590300_1
- liblapack=3.9.0=20_linux64_mkl
- libllvm14=14.0.6=hcd5def8_4
- liblzma=5.6.3=hb9d3cd8_1
- libllvm15=15.0.7=hb3ce162_4
- liblzma=5.6.4=hb9d3cd8_0
- libnghttp2=1.64.0=h161d5f1_0
- libnsl=2.0.1=hd590300_0
- libpng=1.6.46=h943b412_0
Expand All @@ -149,7 +150,7 @@ dependencies:
- libzlib=1.3.1=hb9d3cd8_2
- linkify-it-py=2.0.3=pyhd8ed1ab_1
- llvm-openmp=19.1.7=h024ca30_0
- llvmlite=0.43.0=py310h1a6248f_1
- llvmlite=0.44.0=py310h1a6248f_0
- locket=1.0.0=pyhd8ed1ab_0
- markdown-it-py=2.2.0=pyhd8ed1ab_0
- markupsafe=3.0.2=py310h89163eb_1
Expand All @@ -158,7 +159,7 @@ dependencies:
- mccabe=0.7.0=pyhd8ed1ab_1
- mdit-py-plugins=0.4.2=pyhd8ed1ab_1
- mdurl=0.1.2=pyhd8ed1ab_1
- mistune=3.1.0=pyhd8ed1ab_0
- mistune=3.1.1=pyhd8ed1ab_0
- mkl=2023.2.0=h84fe81f_50496
- msgpack-python=1.1.0=py310h3788b33_0
- munkres=1.1.4=pyh9f0ad1d_0
Expand All @@ -169,11 +170,11 @@ dependencies:
- nbconvert-core=7.16.6=pyh29332c3_0
- nbconvert-pandoc=7.16.6=hed9df3c_0
- nbformat=5.10.4=pyhd8ed1ab_1
- ncurses=6.5=h2d0b736_2
- ncurses=6.5=h2d0b736_3
- nest-asyncio=1.6.0=pyhd8ed1ab_1
- notebook=7.3.2=pyhd8ed1ab_0
- notebook-shim=0.2.4=pyhd8ed1ab_1
- numba=0.60.0=py310h5dc88bb_0
- numba=0.61.0=py310h699fe88_0
- numcodecs=0.13.1=py310h5eaa309_0
- numpy=1.26.4=py310hb13e2d6_0
- openjpeg=2.5.3=h5fbd93e_0
Expand Down Expand Up @@ -221,7 +222,7 @@ dependencies:
- python_abi=3.10=5_cp310
- pytz=2024.1=pyhd8ed1ab_0
- pyyaml=6.0.2=py310h89163eb_2
- pyzmq=26.2.0=py310h71f11fc_3
- pyzmq=26.2.1=py310h71f11fc_0
- readline=8.2=h8228510_1
- readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1
- referencing=0.36.2=pyh29332c3_0
Expand All @@ -236,7 +237,7 @@ dependencies:
- six=1.17.0=pyhd8ed1ab_0
- sniffio=1.3.1=pyhd8ed1ab_1
- snowballstemmer=2.2.0=pyhd8ed1ab_0
- sortedcontainers=2.4.0=pyhd8ed1ab_0
- sortedcontainers=2.4.0=pyhd8ed1ab_1
- soupsieve=2.5=pyhd8ed1ab_1
- sphinx=5.3.0=pyhd8ed1ab_0
- sphinx-book-theme=1.1.3=pyhd8ed1ab_1
Expand Down Expand Up @@ -288,6 +289,7 @@ dependencies:
- widgetsnbextension=3.6.10=pyhd8ed1ab_0
- xorg-libxau=1.0.12=hb9d3cd8_0
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
- xyzservices=2025.1.0=pyhd8ed1ab_0
- yaml=0.2.5=h7f98852_2
- zarr=2.14.2=pyhd8ed1ab_0
- zeromq=4.3.5=h3b0a872_7
Expand All @@ -296,11 +298,11 @@ dependencies:
- zstandard=0.23.0=py310ha39cb0e_1
- zstd=1.5.6=ha6fb4c9_0
- pip:
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3acc55f9f9a849f6f1537977471913e9f6331125
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@728633f4332d7b5052a4b7e3f8958b287222f26b
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@0074bae221e775aa3d8abff37de2304a94c411f3
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@8a2af2a57144c32419db9335ba623518930b9621
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@dbb6a6e2131f4fb6ab26ffe0dcd1bd8adbbbd74d
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac

variables:
KMP_WARNINGS: 0
34 changes: 18 additions & 16 deletions environments/py-3.10-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: ca22b3cf594fe1241f8f87f565fd22f40f4228a4f15b395006f4324731b6a772
# input_hash: d73ecef65ed7b0f752cc2f320c00b21f7170a26ac3e84514a882fcfe83a9605f

channels:
- conda-forge
Expand All @@ -10,12 +10,13 @@ dependencies:
- _openmp_mutex=4.5=2_kmp_llvm
- annotated-types=0.7.0=pyhd8ed1ab_1
- asciitree=0.3.3=py_2
- bokeh=3.6.3=pyhd8ed1ab_0
- brotli=1.1.0=hb9d3cd8_2
- brotli-bin=1.1.0=hb9d3cd8_2
- brotli-python=1.1.0=py310hf71b8c6_2
- bzip2=1.0.8=h4bc722e_7
- c-ares=1.34.4=hb9d3cd8_0
- ca-certificates=2024.12.14=hbcca054_0
- ca-certificates=2025.1.31=hbcca054_0
- cached-property=1.5.2=hd8ed1ab_1
- cached_property=1.5.2=pyha770c72_1
- certifi=2024.12.14=pyhd8ed1ab_0
Expand All @@ -31,11 +32,11 @@ dependencies:
- distributed=2024.6.2=pyhd8ed1ab_0
- empymod=2.2.2=pyhd8ed1ab_0
- fasteners=0.19=pyhd8ed1ab_1
- fonttools=4.55.6=py310h89163eb_0
- fonttools=4.55.8=py310h89163eb_0
- freetype=2.12.1=h267a509_2
- fsspec=2022.11.0=pyhd8ed1ab_0
- geoana=0.5.0=py310hcb52e73_4
- h2=4.1.0=pyhd8ed1ab_1
- h2=4.2.0=pyhd8ed1ab_0
- h5py=3.12.1=nompi_py310hacc6608_103
- hdf5=1.14.4=nompi_h2d575fe_105
- hpack=4.1.0=pyhd8ed1ab_0
Expand All @@ -59,7 +60,7 @@ dependencies:
- libcurl=8.11.1=h332b0f4_0
- libdeflate=1.23=h4ddbbb0_0
- libdlf=0.3.0=pyhd8ed1ab_1
- libedit=3.1.20240808=pl5321h7949ede_0
- libedit=3.1.20250104=pl5321h7949ede_0
- libev=4.33=hd590300_2
- libffi=3.4.2=h7f98852_5
- libgcc=14.2.0=h77fa898_1
Expand All @@ -70,8 +71,8 @@ dependencies:
- libiconv=1.17=hd590300_2
- libjpeg-turbo=3.0.0=hd590300_1
- liblapack=3.9.0=20_linux64_mkl
- libllvm14=14.0.6=hcd5def8_4
- liblzma=5.6.3=hb9d3cd8_1
- libllvm15=15.0.7=hb3ce162_4
- liblzma=5.6.4=hb9d3cd8_0
- libnghttp2=1.64.0=h161d5f1_0
- libnsl=2.0.1=hd590300_0
- libpng=1.6.46=h943b412_0
Expand All @@ -87,15 +88,15 @@ dependencies:
- libxml2=2.13.5=h0d44e9d_1
- libzlib=1.3.1=hb9d3cd8_2
- llvm-openmp=19.1.7=h024ca30_0
- llvmlite=0.43.0=py310h1a6248f_1
- llvmlite=0.44.0=py310h1a6248f_0
- locket=1.0.0=pyhd8ed1ab_0
- markupsafe=3.0.2=py310h89163eb_1
- matplotlib-base=3.8.4=py310hef631a5_2
- mkl=2023.2.0=h84fe81f_50496
- msgpack-python=1.1.0=py310h3788b33_0
- munkres=1.1.4=pyh9f0ad1d_0
- ncurses=6.5=h2d0b736_2
- numba=0.60.0=py310h5dc88bb_0
- ncurses=6.5=h2d0b736_3
- numba=0.61.0=py310h699fe88_0
- numcodecs=0.13.1=py310h5eaa309_0
- numpy=1.26.4=py310hb13e2d6_0
- openjpeg=2.5.3=h5fbd93e_0
Expand Down Expand Up @@ -126,7 +127,7 @@ dependencies:
- scipy=1.14.1=py310hfcf56fc_2
- setuptools=75.8.0=pyhff2d567_0
- six=1.17.0=pyhd8ed1ab_0
- sortedcontainers=2.4.0=pyhd8ed1ab_0
- sortedcontainers=2.4.0=pyhd8ed1ab_1
- tbb=2021.12.0=h84d6215_4
- tblib=3.0.0=pyhd8ed1ab_1
- threadpoolctl=3.5.0=pyhc1e730c_0
Expand All @@ -142,18 +143,19 @@ dependencies:
- wheel=0.45.1=pyhd8ed1ab_1
- xorg-libxau=1.0.12=hb9d3cd8_0
- xorg-libxdmcp=1.1.5=hb9d3cd8_0
- xyzservices=2025.1.0=pyhd8ed1ab_0
- yaml=0.2.5=h7f98852_2
- zarr=2.14.2=pyhd8ed1ab_0
- zict=3.0.0=pyhd8ed1ab_1
- zipp=3.21.0=pyhd8ed1ab_1
- zstandard=0.23.0=py310ha39cb0e_1
- zstd=1.5.6=ha6fb4c9_0
- pip:
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3acc55f9f9a849f6f1537977471913e9f6331125
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@728633f4332d7b5052a4b7e3f8958b287222f26b
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@0074bae221e775aa3d8abff37de2304a94c411f3
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@8a2af2a57144c32419db9335ba623518930b9621
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@dbb6a6e2131f4fb6ab26ffe0dcd1bd8adbbbd74d
- geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9
- geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1
- mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442
- octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f
- param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac

variables:
KMP_WARNINGS: 0
Loading