Skip to content

GEOPY-1879: Use MetaSimulations instead of custom misfit mapping towards distributed process #70

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

Merged
domfournier merged 86 commits into from
Feb 5, 2025
Merged

GEOPY-1879: Use MetaSimulations instead of custom misfit mapping towards distributed process #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
000c11b
Merge branch 'develop' into GEOPY-1729
domfournier Dec 4, 2024
917d253
Allow kwargs in metasim dpred
domfournier Dec 4, 2024
8875097
Start refactoring dask classes
domfournier Dec 4, 2024
958ffb2
Fix bad logic for re-compute
domfournier Dec 4, 2024
8d28d37
First full run
domfournier Dec 4, 2024
fc4c72b
Remove compute J out of dpred calls
domfournier Dec 9, 2024
5473998
Add compute_J to meta sims
domfournier Dec 9, 2024
269a367
Clean ups
domfournier Dec 9, 2024
e0ecc68
Remove duplicate dask Jtvec methods
domfournier Dec 9, 2024
d0229d0
Work in progress
domfournier Dec 10, 2024
e4cb2ba
Skip Jmatrix if not None
domfournier Dec 10, 2024
db3f85a
Stash fields
domfournier Dec 10, 2024
0257817
Remove dask misfit module
domfournier Dec 10, 2024
6b1213f
remove gather from meta.dask_sim, bring back dask dmisfit
domfournier Dec 11, 2024
04e937b
Implement dask misfit residual and deriv
domfournier Dec 12, 2024
93da36d
Don't stack dpred, full grav distributed run
domfournier Dec 12, 2024
1af2bf8
implement rest of dask classes
domfournier Dec 12, 2024
e333035
Start moving compute outside of delay
domfournier Dec 13, 2024
5e738d1
Remove future for fields, assume stashed on simulation
domfournier Dec 14, 2024
2cd396e
Fix double compute of sensitivities
domfournier Dec 15, 2024
b515538
Revert back to overload dask methods
domfournier Dec 15, 2024
00a0f02
Simplify PF compute Jmatrix
domfournier Dec 17, 2024
238f304
Handle G matrix on dask class
domfournier Dec 17, 2024
38a3b3c
Explicit re-assignement of G on grav and mag dask classes
domfournier Dec 18, 2024
02507f0
Continue work
domfournier Dec 22, 2024
c469bf9
Block compute rows for PF
domfournier Dec 27, 2024
ceda378
Add back client property on simulation
domfournier Dec 27, 2024
a472828
Comment explicit comp of J
domfournier Dec 27, 2024
de9ee29
Fix naming in get fields
domfournier Dec 27, 2024
14e7d2b
Comment out Explicit version. Clean ups
domfournier Dec 28, 2024
374a1de
Implement DaskComboMisfit
domfournier Jan 6, 2025
7bf43e2
Rely on MetaSim for handling of mapping
domfournier Jan 6, 2025
b2ad007
Remove unused dask.data_misfit module
domfournier Jan 6, 2025
704289b
Remove 2 multiplier
domfournier Jan 7, 2025
3cf2f4d
Fix for mag. Best so far
domfournier Jan 8, 2025
e647079
Outfit frequency simulations with client option
domfournier Jan 9, 2025
935d62d
Temp remove of overloaded dask dpred for FEM
domfournier Jan 10, 2025
f953297
Outfit time domain simulation with client run
domfournier Jan 10, 2025
96c3a5f
Update ip
domfournier Jan 12, 2025
e882cf1
Remove parallel compute of RHS
domfournier Jan 13, 2025
e85eb83
Remove inner parallelization if client
domfournier Jan 13, 2025
6adc81f
Never store Ainv on FEM
domfournier Jan 14, 2025
3e3e8ad
Don't pass fields and use internal
domfournier Jan 16, 2025
8a8c968
Use client inside base potential fields integral
domfournier Jan 16, 2025
3e1ec4a
Run futures in blocks
domfournier Jan 16, 2025
bab728f
Bring back internal parallelization of FEM
domfournier Jan 16, 2025
0b072be
Change reduce to plain gather and sum
domfournier Jan 16, 2025
936f9af
Add temporary debug prints (to be reverted)
domfournier Jan 16, 2025
b501e16
Remove fields calls
domfournier Jan 16, 2025
16d0f4c
More prints around save geoh5
domfournier Jan 17, 2025
a2727e1
Skip dpred for residuals
domfournier Jan 17, 2025
580bda9
Unhook special dpred
domfournier Jan 17, 2025
74777e5
Revert "Skip dpred for residuals"
domfournier Jan 17, 2025
1f62565
Batch compute dpreds
domfournier Jan 17, 2025
92e531d
Remove test prints
domfournier Jan 17, 2025
4130256
Send residuals in batch too
domfournier Jan 17, 2025
e727575
Only store factorization on compute_J call
domfournier Jan 19, 2025
91d40c5
Add prints for debug
domfournier Jan 20, 2025
d08e90e
Simplify getSource
domfournier Jan 22, 2025
c69531e
Try again using local get_client
domfournier Jan 22, 2025
97fbfd6
Revert "Try again using local get_client"
domfournier Jan 22, 2025
8140c41
Fix issue with client not stored on FEM class
domfournier Jan 24, 2025
39aa97a
Remove client from property of simulation
domfournier Jan 25, 2025
f92e750
Fix for non-client run
domfournier Jan 25, 2025
61403e4
Fix potential fields for client not on simulaiton
domfournier Jan 26, 2025
7d0ceba
Don't use mesh object to index Projection
domfournier Jan 26, 2025
0b1709a
Fix handling of spatialP differently on FEM and TEM receivers
domfournier Jan 27, 2025
3a29a23
Use n_cell instead of mesh
domfournier Jan 27, 2025
406b25d
Re-implement parallel getSourceTerm
domfournier Jan 28, 2025
d4b78ef
Don't use the mesh itself to index projections on NS receivers. Scatt…
domfournier Jan 29, 2025
1f4b223
Clean out prints. Update time domain
domfournier Jan 30, 2025
8f58f51
Clean up tem simulation for distributed process
domfournier Jan 30, 2025
925f3e4
Add small quantity to avoid zero division
domfournier Feb 3, 2025
72d0fcf
Stash RHS as sparse arrays. Index receiver projection without mesh
domfournier Feb 3, 2025
76efdfd
Stash sources on TEM simulation as sparse array
domfournier Feb 3, 2025
50aa18e
Don't store Ainv on simulation. Fix imports of Jvec, Jtvec
domfournier Feb 3, 2025
6811443
Remove test print
domfournier Feb 3, 2025
eea390c
Fix 2D simulation
domfournier Feb 3, 2025
ad5b5f1
Clean out prints
domfournier Feb 3, 2025
c71182a
Merge branch 'develop' into GEOPY-1879c
domfournier Feb 3, 2025
39317c8
Fix indentation error
domfournier Feb 4, 2025
f807df0
Missing count increment
domfournier Feb 4, 2025
997bbe0
Remove self.Ainv in IP inversions
domfournier Feb 4, 2025
1035c93
Add ProgressBar to imports
domfournier Feb 5, 2025
4166931
Cleanups from review
domfournier Feb 5, 2025
b13da0f
Expose public attribute spatialP on dc receivers
domfournier Feb 5, 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
2 changes: 1 addition & 1 deletion meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "mira-simpeg" %}
{% set version = "0.21.2.1rc1" %}
{% set version = "0.21.2.1b3" %}

package:
name: {{ name|lower }}
Expand Down
1 change: 0 additions & 1 deletion simpeg/dask/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import simpeg.dask.potential_fields.gravity.simulation
import simpeg.dask.potential_fields.magnetics.simulation
import simpeg.dask.simulation
import simpeg.dask.data_misfit
import simpeg.dask.inverse_problem
import simpeg.dask.objective_function

Expand Down
96 changes: 0 additions & 96 deletions simpeg/dask/data_misfit.py
View file
Open in desktop

This file was deleted.

Loading