Skip to content

GEOPY-1729: Add option for MUMPS solver #161

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 4 commits into from
Mar 5, 2025
Merged

GEOPY-1729: Add option for MUMPS solver #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b6d381
Outfit ui.json with solver_type choice
domfournier Mar 3, 2025
aaace7b
Add solver choices to Options
domfournier Mar 3, 2025
c9ae797
Use Mumps in test. Try removing the pytest.skip
domfournier Mar 3, 2025
b507ef1
Merge branch 'develop' into GEOPY-1729
domfournier Mar 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
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": 1,
"max_chunk_size": {
"min": 0,
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": 1,
"store_sensitivities": {
"choiceList": [
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": 1,
"max_chunk_size": {
"min": 0,
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": 1,
"store_sensitivities": {
"choiceList": [
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/fem_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/fem_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": 1,
"max_chunk_size": {
"min": 0,
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": 1,
"max_ram": "",
"store_sensitivities": {
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": 1,
"max_chunk_size": {
"min": 0,
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": 1,
"store_sensitivities": {
"choiceList": [
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/tdem_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/tdem_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/tipper_forward.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
10 changes: 10 additions & 0 deletions simpeg_drivers-assets/uijson/tipper_inversion.ui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,16 @@
"value": 1,
"visible": false
},
"solver_type": {
"choiceList": [
"Pardiso",
"Mumps"
],
"group": "Compute",
"label": "Direct solver",
"tooltip": "Direct solver to use for the forward calculations",
"value": "Pardiso"
},
"tile_spatial": {
"group": "Compute",
"label": "Number of tiles",
Expand Down
2 changes: 1 addition & 1 deletion simpeg_drivers/components/factories/simulation_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def __init__(self, params: BaseParams | BaseOptions):
]:
import pymatsolver.direct as solver_module

self.solver = solver_module.Pardiso
self.solver = getattr(solver_module, params.solver_type)

def concrete_object(self):
if self.factory_type in ["magnetic scalar", "magnetic vector"]:
Expand Down
11 changes: 11 additions & 0 deletions simpeg_drivers/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from __future__ import annotations

import multiprocessing
from enum import Enum
from logging import getLogger
from pathlib import Path
from typing import ClassVar, TypeAlias
Expand Down Expand Up @@ -56,6 +57,15 @@ def at_least_one(cls, data):
return data


class SolverType(str, Enum):
"""
Supported solvers.
"""

Pardiso = "Pardiso"
Mumps = "Mumps"


class CoreOptions(BaseData):
"""
Core parameters shared by inverse and forward operations.
Expand Down Expand Up @@ -94,6 +104,7 @@ class CoreOptions(BaseData):
mesh: Octree | DrapeModel | None
starting_model: float | FloatData
active_cells: ActiveCellsOptions
solver_type: SolverType = SolverType.Pardiso
tile_spatial: int = 1
parallelized: bool = True
n_cpu: int | None = None
Expand Down
Loading