From 86ae112b4240a49576f1e0bdcbaf15af73ea6540 Mon Sep 17 00:00:00 2001 From: benjamink Date: Fri, 14 Mar 2025 14:45:39 -0700 Subject: [PATCH 01/13] fix warning about different length data, uijson. --- .../uijson/direct_current_2d_forward.ui.json | 1 + .../uijson/gravity_forward.ui.json | 50 ++----------- .../uijson/gravity_inversion.ui.json | 12 ++++ .../factories/directives_factory.py | 11 ++- .../sensitivity_cutoff/params.py | 7 +- .../pseudo_three_dimensions/params.py | 8 +-- .../direct_current/three_dimensions/params.py | 8 +-- .../direct_current/two_dimensions/params.py | 8 +-- .../pseudo_three_dimensions/params.py | 8 +-- .../three_dimensions/params.py | 8 +-- .../two_dimensions/params.py | 8 +-- .../frequency_domain/params.py | 8 +-- .../electromagnetics/time_domain/params.py | 8 +-- .../joint/joint_cross_gradient/params.py | 5 +- simpeg_drivers/joint/joint_surveys/params.py | 3 +- .../magnetotellurics/params.py | 8 +-- .../natural_sources/tipper/params.py | 8 +-- simpeg_drivers/params.py | 72 +++++++++---------- .../potential_fields/gravity/params.py | 13 ++-- .../potential_fields/gravity/uijson.py | 15 ++-- .../magnetic_scalar/params.py | 8 +-- .../magnetic_vector/params.py | 9 +-- simpeg_drivers/uijson.py | 4 +- tests/driver_test.py | 2 +- tests/run_tests/driver_airborne_tem_test.py | 4 +- tests/run_tests/driver_dc_2d_test.py | 4 +- tests/run_tests/driver_dc_b2d_test.py | 4 +- tests/run_tests/driver_dc_test.py | 4 +- tests/run_tests/driver_fem_test.py | 4 +- tests/run_tests/driver_grav_test.py | 2 +- tests/run_tests/driver_ground_tem_test.py | 4 +- tests/run_tests/driver_ip_2d_test.py | 4 +- tests/run_tests/driver_ip_b2d_test.py | 4 +- tests/run_tests/driver_ip_test.py | 4 +- .../driver_joint_cross_gradient_test.py | 2 +- tests/run_tests/driver_joint_surveys_test.py | 2 +- tests/run_tests/driver_mt_test.py | 4 +- tests/run_tests/driver_mvi_test.py | 2 +- tests/run_tests/driver_tipper_test.py | 4 +- tests/run_tests/sensitivity_cutoff_test.py | 2 +- tests/uijson_test.py | 24 ++++++- 41 files changed, 186 insertions(+), 184 deletions(-) diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index a166847d..a194494a 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -10,6 +10,7 @@ "workspace_geoh5": "", "inversion_type": "direct current 2d", "forward_only": true, + "physical_property": "conductivity", "data_object": { "main": true, "group": "Survey", diff --git a/simpeg_drivers-assets/uijson/gravity_forward.ui.json b/simpeg_drivers-assets/uijson/gravity_forward.ui.json index 1b535208..c9dfd8f5 100644 --- a/simpeg_drivers-assets/uijson/gravity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_forward.ui.json @@ -10,6 +10,7 @@ "workspace_geoh5": "", "inversion_type": "gravity", "forward_only": true, + "physical_property": "density", "data_object": { "main": true, "group": "Survey", @@ -25,40 +26,6 @@ ], "value": "" }, - "z_from_topo": { - "group": "Data pre-processing", - "label": "Take z from topography", - "tooltip": "Sets survey elevation to topography before any offsets are applied.", - "value": false, - "verbose": 3, - "visible": false - }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", "gz_channel_bool": { "group": "Survey", "main": true, @@ -194,7 +161,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -235,13 +207,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -252,7 +217,6 @@ "enabled": false, "tooltip": "Optionally set the SimPEG group to which results will be saved." }, - "ga_group": "", "generate_sweep": { "label": "Generate sweep file", "group": "Python run preferences", diff --git a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json index 6e75b0da..598e4568 100644 --- a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json @@ -10,6 +10,7 @@ "workspace_geoh5": "", "inversion_type": "gravity", "forward_only": false, + "physical_property": "density", "data_object": { "main": true, "group": "Data", @@ -675,6 +676,7 @@ "verbose": 2, "enabled": true }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -760,6 +762,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", diff --git a/simpeg_drivers/components/factories/directives_factory.py b/simpeg_drivers/components/factories/directives_factory.py index 2732852c..b56737c6 100644 --- a/simpeg_drivers/components/factories/directives_factory.py +++ b/simpeg_drivers/components/factories/directives_factory.py @@ -257,13 +257,10 @@ def update_irls_directive(self): f_min_change=self.params.f_min_change, max_irls_iterations=self.params.max_irls_iterations, misfit_tolerance=self.params.beta_tol, - percentile=getattr(self.params, "percentile", None) - or self.params.prctile, - cooling_rate=getattr(self.params, "cooling_rate", None) - or self.params.coolingRate, - cooling_factor=getattr(self.params, "cooling_factor", None) - or self.params.coolingFactor, - irls_cooling_factor=self.params.coolEpsFact, + percentile=self.params.percentile, + cooling_rate=self.params.cooling_rate, + cooling_factor=self.params.cooling_factor, + irls_cooling_factor=self.params.epsilon_cooling_factor, chifact_start=( self.params.starting_chi_factor if has_chi_start diff --git a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/params.py b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/params.py index 9db40a3b..ab9f2117 100644 --- a/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/params.py +++ b/simpeg_drivers/depth_of_investigation/sensitivity_cutoff/params.py @@ -48,10 +48,9 @@ class SensitivityCutoffParams(BaseData): default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/sensitivity_cutoff.ui.json" ) - title: ClassVar[str] = "Depth of Investigation: Sensitivity Cutoff" - run_command: ClassVar[str] = ( - "simpeg_drivers.depth_of_investigation.sensitivity_cutoff.driver" - ) + + title: str = "Depth of Investigation: Sensitivity Cutoff" + run_command: str = "simpeg_drivers.depth_of_investigation.sensitivity_cutoff.driver" conda_environment: str = "simpeg_drivers" mesh: Octree diff --git a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py index 6d8e6dd2..171e37b7 100644 --- a/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py +++ b/simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/params.py @@ -41,13 +41,13 @@ class DCBatch2DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Direct Current Pseudo 3D Forward" - title: ClassVar[str] = "Direct Current (DC) 2D Batch Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_batch2d_forward.ui.json" ) - inversion_type: str = "direct current pseudo 3d" + title: str = "Direct Current (DC) 2D Batch Forward" physical_property: str = "conductivity" + inversion_type: str = "direct current pseudo 3d" data_object: PotentialElectrode potential_channel_bool: bool = True @@ -76,13 +76,13 @@ class DCBatch2DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Direct Current Pseudo 3D Inversion" - title: ClassVar[str] = "Direct Current (DC) 2D Batch Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_batch2d_inversion.ui.json" ) - inversion_type: str = "direct current pseudo 3d" + title: str = "Direct Current (DC) 2D Batch Inversion" physical_property: str = "conductivity" + inversion_type: str = "direct current pseudo 3d" data_object: PotentialElectrode potential_channel: FloatData diff --git a/simpeg_drivers/electricals/direct_current/three_dimensions/params.py b/simpeg_drivers/electricals/direct_current/three_dimensions/params.py index 177a7378..7550478e 100644 --- a/simpeg_drivers/electricals/direct_current/three_dimensions/params.py +++ b/simpeg_drivers/electricals/direct_current/three_dimensions/params.py @@ -30,13 +30,13 @@ class DC3DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Direct Current 3D Forward" - title: ClassVar[str] = "Direct Current 3D Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_3d_forward.ui.json" ) - inversion_type: str = "direct current 3d" + title: str = "Direct Current 3D Forward" physical_property: str = "conductivity" + inversion_type: str = "direct current 3d" potential_channel_bool: bool = True model_type: str = "Conductivity (S/m)" @@ -53,13 +53,13 @@ class DC3DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Direct Current 3D Inversion" - title: ClassVar[str] = "Direct Current 3D Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_3d_inversion.ui.json" ) - inversion_type: str = "direct current 3d" + title: str = "Direct Current 3D Inversion" physical_property: str = "conductivity" + inversion_type: str = "direct current 3d" potential_channel: FloatData potential_uncertainty: float | FloatData | None = None diff --git a/simpeg_drivers/electricals/direct_current/two_dimensions/params.py b/simpeg_drivers/electricals/direct_current/two_dimensions/params.py index b0206fe4..53fff8e0 100644 --- a/simpeg_drivers/electricals/direct_current/two_dimensions/params.py +++ b/simpeg_drivers/electricals/direct_current/two_dimensions/params.py @@ -38,13 +38,13 @@ class DC2DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Direct Current 2D Forward" - title: ClassVar[str] = "Direct Current 2D Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_2d_forward.ui.json" ) - inversion_type: str = "direct current 2d" + title: str = "Direct Current 2D Forward" physical_property: str = "conductivity" + inversion_type: str = "direct current 2d" potential_channel_bool: bool = True line_selection: LineSelectionOptions @@ -66,13 +66,13 @@ class DC2DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Direct Current 2D Inversion" - title: ClassVar[str] = "Direct Current 2D Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/direct_current_2d_inversion.ui.json" ) - inversion_type: str = "direct current 2d" + title: str = "Direct Current 2D Inversion" physical_property: str = "conductivity" + inversion_type: str = "direct current 2d" potential_channel: FloatData potential_uncertainty: float | FloatData | None = None diff --git a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py index c465b0e8..992626dc 100644 --- a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py @@ -41,13 +41,13 @@ class IPBatch2DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Induced Polarization Pseudo 3D Forward" - title: ClassVar[str] = "Induced Polarization (IP) 2D Batch Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_batch2d_forward.ui.json" ) - inversion_type: str = "induced polarization pseudo 3d" + title: str = "Induced Polarization (IP) 2D Batch Forward" physical_property: str = "chargeability" + inversion_type: str = "induced polarization pseudo 3d" data_object: PotentialElectrode chargeability_channel_bool: bool = True @@ -75,13 +75,13 @@ class IPBatch2DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Induced Polarization Pseudo 3D Inversion" - title: ClassVar[str] = "Induced Polarization (IP) 2D Batch Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_batch2d_inversion.ui.json" ) - inversion_type: str = "induced polarization pseudo 3d" + title: str = "Induced Polarization (IP) 2D Batch Inversion" physical_property: str = "chargeability" + inversion_type: str = "induced polarization pseudo 3d" data_object: PotentialElectrode chargeability_channel: FloatData diff --git a/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py index 6f6dffcd..83a001bc 100644 --- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py @@ -29,13 +29,13 @@ class IP3DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Induced Polarization 3D Forward" - title: ClassVar[str] = "Induced Polarization 3D Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_3d_forward.ui.json" ) - inversion_type: str = "induced polarization 3d" + title: str = "Induced Polarization 3D Forward" physical_property: str = "chargeability" + inversion_type: str = "induced polarization 3d" chargeability_channel_bool: bool = True conductivity_model: float | FloatData @@ -51,13 +51,13 @@ class IP3DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Induced Polarization 3D Inversion" - title: ClassVar[str] = "Induced Polarization 3D Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_3d_inversion.ui.json" ) - inversion_type: str = "induced polarization 3d" + title: str = "Induced Polarization 3D Inversion" physical_property: str = "chargeability" + inversion_type: str = "induced polarization 3d" chargeability_channel: FloatData chargeability_uncertainty: float | FloatData | None = None diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py index 5559dec2..a86747a8 100644 --- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py @@ -37,13 +37,13 @@ class IP2DForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Induced Polarization 2D Forward" - title: ClassVar[str] = "Induced Polarization 2D Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_2d_forward.ui.json" ) - inversion_type: str = "induced polarization 2d" + title: str = "Induced Polarization 2D Forward" physical_property: str = "chargeability" + inversion_type: str = "induced polarization 2d" chargeability_channel_bool: bool = True line_selection: LineSelectionOptions @@ -67,13 +67,13 @@ class IP2DInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Induced Polarization 2D Inversion" - title: ClassVar[str] = "Induced Polarization 2D Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/induced_polarization_2d_inversion.ui.json" ) - inversion_type: str = "induced polarization 2d" + title: str = "Induced Polarization 2D Inversion" physical_property: str = "chargeability" + inversion_type: str = "induced polarization 2d" chargeability_channel: FloatData chargeability_uncertainty: float | FloatData | None = None diff --git a/simpeg_drivers/electromagnetics/frequency_domain/params.py b/simpeg_drivers/electromagnetics/frequency_domain/params.py index 9834aaef..1012f6da 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/params.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/params.py @@ -40,11 +40,11 @@ class FDEMForwardOptions(EMDataMixin, BaseForwardOptions): """ name: ClassVar[str] = "Frequency Domain Electromagnetics Forward" - title: ClassVar[str] = "Frequency-domain EM (FEM) Forward" default_ui_json: ClassVar[Path] = assets_path() / "uijson/fem_forward.ui.json" - inversion_type: str = "fem" + title: str = "Frequency-domain EM (FEM) Forward" physical_property: str = "conductivity" + inversion_type: str = "fem" data_object: Receivers z_real_channel_bool: bool @@ -88,11 +88,11 @@ class FDEMInversionOptions(EMDataMixin, BaseInversionOptions): """ name: ClassVar[str] = "Frequency Domain Electromagnetics Inversion" - title: ClassVar[str] = "Frequency-domain EM (FEM) Inversion" default_ui_json: ClassVar[Path] = assets_path() / "uijson/fem_inversion.ui.json" - inversion_type: str = "fem" + title: str = "Frequency-domain EM (FEM) Inversion" physical_property: str = "conductivity" + inversion_type: str = "fem" data_object: Receivers z_real_channel: PropertyGroup | None = None diff --git a/simpeg_drivers/electromagnetics/time_domain/params.py b/simpeg_drivers/electromagnetics/time_domain/params.py index 30946950..95ab42ca 100644 --- a/simpeg_drivers/electromagnetics/time_domain/params.py +++ b/simpeg_drivers/electromagnetics/time_domain/params.py @@ -42,11 +42,11 @@ class TDEMForwardOptions(EMDataMixin, BaseForwardOptions): """ name: ClassVar[str] = "Time Domain Electromagnetics Forward" - title: ClassVar[str] = "Time-domain EM (TEM) Forward" default_ui_json: ClassVar[Path] = assets_path() / "uijson/tdem_forward.ui.json" - inversion_type: str = "tdem" + title: str = "Time-domain EM (TEM) Forward" physical_property: str = "conductivity" + inversion_type: str = "tdem" data_object: Receivers z_channel_bool: bool | None = None @@ -81,11 +81,11 @@ class TDEMInversionOptions(EMDataMixin, BaseInversionOptions): """ name: ClassVar[str] = "Time Domain Electromagnetics Inversion" - title: ClassVar[str] = "Time-domain EM (TEM) Inversion" default_ui_json: ClassVar[Path] = assets_path() / "uijson/tdem_inversion.ui.json" - inversion_type: str = "tdem" + title: str = "Time-domain EM (TEM) Inversion" physical_property: str = "conductivity" + inversion_type: str = "tdem" data_object: Receivers z_channel: PropertyGroup | None = None diff --git a/simpeg_drivers/joint/joint_cross_gradient/params.py b/simpeg_drivers/joint/joint_cross_gradient/params.py index 77eb66af..31b31ef9 100644 --- a/simpeg_drivers/joint/joint_cross_gradient/params.py +++ b/simpeg_drivers/joint/joint_cross_gradient/params.py @@ -15,6 +15,7 @@ from typing import ClassVar from geoh5py.objects import Octree +from pydantic import ConfigDict from simpeg_drivers import assets_path from simpeg_drivers.joint.params import BaseJointOptions @@ -33,11 +34,13 @@ class JointCrossGradientOptions(BaseJointOptions): """ name: ClassVar[str] = "Joint Cross Gradient Inversion" - title: ClassVar[str] = "Joint Cross Gradient Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/joint_cross_gradient_inversion.ui.json" ) + title: str = "Joint Cross Gradient Inversion" + physical_property: list[str] = [""] + inversion_type: str = "joint cross gradient" data_object: None = None diff --git a/simpeg_drivers/joint/joint_surveys/params.py b/simpeg_drivers/joint/joint_surveys/params.py index 463d4173..d4935247 100644 --- a/simpeg_drivers/joint/joint_surveys/params.py +++ b/simpeg_drivers/joint/joint_surveys/params.py @@ -24,11 +24,12 @@ class JointSurveysOptions(BaseJointOptions): """Joint Surveys inversion options.""" name: ClassVar[str] = "Joint Surveys Inversion" - title: ClassVar[str] = "Joint Surveys Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/joint_surveys_inversion.ui.json" ) + title: str = "Joint Surveys Inversion" + inversion_type: str = "joint surveys" @model_validator(mode="after") diff --git a/simpeg_drivers/natural_sources/magnetotellurics/params.py b/simpeg_drivers/natural_sources/magnetotellurics/params.py index db0df7f9..3d8de712 100644 --- a/simpeg_drivers/natural_sources/magnetotellurics/params.py +++ b/simpeg_drivers/natural_sources/magnetotellurics/params.py @@ -39,13 +39,13 @@ class MTForwardOptions(EMDataMixin, BaseForwardOptions): """ name: ClassVar[str] = "Magnetotellurics Forward" - title: ClassVar[str] = "Magnetotellurics Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetotellurics_forward.ui.json" ) - inversion_type: str = "magnetotellurics" + title: str = "Magnetotellurics Forward" physical_property: str = "conductivity" + inversion_type: str = "magnetotellurics" data_object: MTReceivers zxx_real_channel_bool: bool | None = None @@ -89,13 +89,13 @@ class MTInversionOptions(EMDataMixin, BaseInversionOptions): """ name: ClassVar[str] = "Magnetotellurics Inversion" - title: ClassVar[str] = "Magnetotellurics Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetotellurics_inversion.ui.json" ) - inversion_type: str = "magnetotellurics" + title: str = "Magnetotellurics Inversion" physical_property: str = "conductivity" + inversion_type: str = "magnetotellurics" data_object: MTReceivers zxx_real_channel: PropertyGroup | None = None diff --git a/simpeg_drivers/natural_sources/tipper/params.py b/simpeg_drivers/natural_sources/tipper/params.py index 664454b1..40723196 100644 --- a/simpeg_drivers/natural_sources/tipper/params.py +++ b/simpeg_drivers/natural_sources/tipper/params.py @@ -35,11 +35,11 @@ class TipperForwardOptions(EMDataMixin, BaseForwardOptions): """ name: ClassVar[str] = "Tipper Forward" - title: ClassVar[str] = "Tipper Forward" default_ui_json: ClassVar[Path] = assets_path() / "uijson/tipper_forward.ui.json" - inversion_type: str = "tipper" + title: str = "Tipper Forward" physical_property: str = "conductivity" + inversion_type: str = "tipper" data_object: TipperReceivers txz_real_channel_bool: bool | None = None @@ -67,11 +67,11 @@ class TipperInversionOptions(EMDataMixin, BaseInversionOptions): """ name: ClassVar[str] = "Tipper Inversion" - title: ClassVar[str] = "Tipper Inversion" default_ui_json: ClassVar[Path] = assets_path() / "uijson/tipper_inversion.ui.json" - inversion_type: str = "tipper" + title: str = "Tipper Inversion" physical_property: str = "conductivity" + inversion_type: str = "tipper" data_object: TipperReceivers txz_real_channel: PropertyGroup | None = None diff --git a/simpeg_drivers/params.py b/simpeg_drivers/params.py index 52954334..0f96fa73 100644 --- a/simpeg_drivers/params.py +++ b/simpeg_drivers/params.py @@ -25,6 +25,8 @@ from geoh5py.shared.utils import fetch_active_workspace from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator +import simpeg_drivers + logger = getLogger(__name__) @@ -94,34 +96,30 @@ class CoreOptions(BaseData): # TODO: Refactor to allow frozen True. Currently params.data_object is # updated after z_from_topo applied in entity_factory.py. See # simpeg_drivers/components/data.py ln. 127 - model_config = ConfigDict(frozen=False, arbitrary_types_allowed=True, extra="allow") - run_command: ClassVar[str] = "simpeg_drivers.driver" + model_config = ConfigDict( + frozen=False, + arbitrary_types_allowed=True, + extra="allow", + validate_default=True, + ) + + version: str = simpeg_drivers.__version__ + run_command: str = "simpeg_drivers.driver" conda_environment: str = "simpeg_drivers" inversion_type: str - physical_property: str data_object: Points - z_from_topo: bool = Field(default=False, deprecated=True) mesh: Octree | DrapeModel | None starting_model: float | FloatData active_cells: ActiveCellsOptions - solver_type: SolverType = SolverType.Pardiso tile_spatial: int = 1 parallelized: bool = True + solver_type: SolverType = SolverType.Pardiso + save_sensitivities: bool = False n_cpu: int | None = None max_chunk_size: int = 128 - save_sensitivities: bool = False out_group: SimPEGGroup | UIJsonGroup | None = None generate_sweep: bool = False - - @field_validator("z_from_topo", mode="before") - @classmethod - def deprecated(cls, v, info): - logger.warning( - "Field %s is deprecated. Since version 0.3.0, " - "any data location adjustments must be done in pre-processing.", - info.field_name, - ) - return v + distributed_workers: str | None = None @field_validator("n_cpu", mode="before") @classmethod @@ -148,7 +146,11 @@ def out_group_if_none(cls, data): return data if isinstance(group, UIJsonGroup | type(None)): - name = cls.title if group is None else group.name + name = ( + cls.model_fields["title"].default # pylint: disable=unsubscriptable-object + if group is None + else group.name + ) with fetch_active_workspace(data["geoh5"], mode="r+") as geoh5: group = SimPEGGroup.create(geoh5, name=name) @@ -277,16 +279,16 @@ class BaseInversionOptions(CoreOptions): :param max_irls_iterations: Maximum IRLS iterations. :param starting_chi_factor: Starting chi factor. - :param prctile: Prctile. + :param percentile: Percentile. :param beta_tol: Beta tolerance. :param chi_factor: Chi factor. :param auto_scale_misfits: Automatically scale misfits. :param initial_beta: Initial beta. :param initial_beta_ratio: Initial beta ratio. - :param coolingFactor: Cooling factor. + :param cooling_factor: Cooling factor. - :param coolingRate: Cooling rate. + :param cooling_rate: Cooling rate. :param max_global_iterations: Maximum global iterations. :param max_line_search_iterations: Maximum line search iterations. :param max_cg_iterations: Maximum CG iterations. @@ -295,10 +297,9 @@ class BaseInversionOptions(CoreOptions): :param sens_wts_threshold: Sensitivity weights threshold. :param every_iteration_bool: Every iteration bool. - :param save_sensitivities: Save sensitivities. :param parallelized: Parallelized. - :param n_cpu: Number of CPUs. + :param solver_type: Direct solver provider. Either Mumps or Pardiso. :param tile_spatial: Tile the data spatially. :param store_sensitivities: Store sensitivities. :param max_chunk_size: Maximum chunk size. @@ -323,8 +324,9 @@ class BaseInversionOptions(CoreOptions): ) name: ClassVar[str] = "Inversion" - title: ClassVar[str] = "Geophysical inversion" - run_command: ClassVar[str] = "simpeg_drivers.driver" + + title: str = "Geophysical inversion" + run_command: str = "simpeg_drivers.driver" forward_only: bool = False conda_environment: str = "simpeg_drivers" @@ -350,35 +352,27 @@ class BaseInversionOptions(CoreOptions): auto_scale_misfits: bool = True initial_beta_ratio: float | None = 100.0 initial_beta: float | None = None - coolingFactor: float = 2.0 + cooling_factor: float = 2.0 - coolingRate: float = 1.0 + cooling_rate: float = 1.0 max_global_iterations: int = 50 max_line_search_iterations: int = 20 max_cg_iterations: int = 30 tol_cg: float = 1e-4 f_min_change: float = 1e-2 + solver_type: SolverType = SolverType.Pardiso sens_wts_threshold: float = 1e-3 every_iteration_bool: bool = True - save_sensitivities: bool = False tile_spatial: int = 1 store_sensitivities: str = "ram" beta_tol: float = 0.5 - prctile: float = 95.0 - coolEps_q: bool = True - coolEpsFact: float = 1.2 - beta_search: bool = False - - chunk_by_rows: bool = True - output_tile_files: bool = False - inversion_style: str = "voxel" - max_ram: float | None = None - ga_group: SimPEGGroup | None = None - distributed_workers: int | None = None - no_data_value: float | None = None + percentile: float = 95.0 + epsilon_cooling_factor: float = 1.2 + + distributed_workers: str | None = None class EMDataMixin: diff --git a/simpeg_drivers/potential_fields/gravity/params.py b/simpeg_drivers/potential_fields/gravity/params.py index b819431c..1be787df 100644 --- a/simpeg_drivers/potential_fields/gravity/params.py +++ b/simpeg_drivers/potential_fields/gravity/params.py @@ -36,15 +36,16 @@ class GravityForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Gravity Forward" - title: ClassVar[str] = "Gravity Forward" default_ui_json: ClassVar[Path] = assets_path() / "uijson/gravity_forward.ui.json" - inversion_type: str = "gravity" + title: str = "Gravity Forward" physical_property: str = "density" + inversion_type: str = "gravity" gx_channel_bool: bool = False gy_channel_bool: bool = False gz_channel_bool: bool = True + guv_channel_bool: bool = False gxx_channel_bool: bool = False gxy_channel_bool: bool = False gxz_channel_bool: bool = False @@ -77,16 +78,17 @@ class GravityInversionOptions(BaseInversionOptions): :param gzz_uncertainty: gzz uncertainty. """ - name: ClassVar[str] = "Gravity Inversion" - title: ClassVar[str] = "Gravity Inversion" default_ui_json: ClassVar[Path] = assets_path() / "uijson/gravity_inversion.ui.json" + name: ClassVar[str] = "Gravity Inversion" - inversion_type: str = "gravity" + title: str = "Gravity Inversion" physical_property: str = "density" + inversion_type: str = "gravity" gx_channel: FloatData | None = None gy_channel: FloatData | None = None gz_channel: FloatData | None = None + guv_channel: FloatData | None = None gxx_channel: FloatData | None = None gxy_channel: FloatData | None = None gxz_channel: FloatData | None = None @@ -96,6 +98,7 @@ class GravityInversionOptions(BaseInversionOptions): gx_uncertainty: FloatData | float | None = None gy_uncertainty: FloatData | float | None = None gz_uncertainty: FloatData | float | None = None + guv_uncertainty: FloatData | float | None = None gxx_uncertainty: FloatData | float | None = None gxy_uncertainty: FloatData | float | None = None gxz_uncertainty: FloatData | float | None = None diff --git a/simpeg_drivers/potential_fields/gravity/uijson.py b/simpeg_drivers/potential_fields/gravity/uijson.py index a90ef59d..473f26a9 100644 --- a/simpeg_drivers/potential_fields/gravity/uijson.py +++ b/simpeg_drivers/potential_fields/gravity/uijson.py @@ -50,6 +50,7 @@ class GravityForwardUIJson(SimPEGDriversUIJson): topography_object: ObjectForm topography: DataForm active_model: DataForm + save_sensitivities: BoolForm parallelized: BoolForm n_cpu: IntegerForm tile_spatial: DataForm @@ -127,6 +128,9 @@ class GravityInversionUIJson(SimPEGDriversUIJson): cooling_rate: IntegerForm = Field( validation_alias=AliasChoices("cooling_rate", "coolingRate") ) + epsilon_cooling_factor: float = Field( + validation_alias=AliasChoices("epsilon_cooling_factor", "coolEpsFact") + ) max_global_iterations: IntegerForm max_line_search_iterations: IntegerForm max_cg_iterations: IntegerForm @@ -140,11 +144,12 @@ class GravityInversionUIJson(SimPEGDriversUIJson): tile_spatial: DataForm store_sensitivities: ChoiceForm max_chunk_size: IntegerForm + out_group: GroupForm generate_sweep: BoolForm distributed_workers: str - output_tile_files: Deprecated - inversion_style: Deprecated - max_ram: Deprecated - chunk_by_rows: Deprecated - ga_group: Deprecated + output_tile_files: Deprecated | None = None + inversion_style: Deprecated | None = None + max_ram: Deprecated | None = None + chunk_by_rows: Deprecated | None = None + ga_group: Deprecated | None = None diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/params.py b/simpeg_drivers/potential_fields/magnetic_scalar/params.py index b1eb06c8..e0748e9b 100644 --- a/simpeg_drivers/potential_fields/magnetic_scalar/params.py +++ b/simpeg_drivers/potential_fields/magnetic_scalar/params.py @@ -37,13 +37,13 @@ class MagneticForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Magnetic Scalar Forward" - title: ClassVar[str] = "Magnetic Scalar Forward" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetic_scalar_forward.ui.json" ) - inversion_type: str = "magnetic scalar" + title: str = "Magnetic Scalar Forward" physical_property: str = "susceptibility" + inversion_type: str = "magnetic scalar" tmi_channel_bool: bool = True bx_channel_bool: bool = False @@ -87,13 +87,13 @@ class MagneticInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Magnetic Scalar Inversion" - title: ClassVar[str] = "Magnetic Scalar Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetic_scalar_inversion.ui.json" ) - inversion_type: str = "magnetic scalar" + title: str = "Magnetic Scalar Inversion" physical_property: str = "susceptibility" + inversion_type: str = "magnetic scalar" tmi_channel: FloatData | None = None bx_channel: FloatData | None = None diff --git a/simpeg_drivers/potential_fields/magnetic_vector/params.py b/simpeg_drivers/potential_fields/magnetic_vector/params.py index fe5f515f..fc511ce3 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/params.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/params.py @@ -37,13 +37,14 @@ class MVIForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Magnetic Vector Forward" - title: ClassVar[str] = "Magnetic Vector Forward" + physical_property: ClassVar[str] = "susceptibility" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetic_vector_forward.ui.json" ) + title: str = "Magnetic Vector Forward" + inversion_type: str = "magnetic vector" - physical_property: str = "susceptibility" tmi_channel_bool: bool = True bx_channel_bool: bool = False @@ -91,13 +92,13 @@ class MVIInversionOptions(BaseInversionOptions): """ name: ClassVar[str] = "Magnetic Vector Inversion" - title: ClassVar[str] = "Magnetic Vector Inversion" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetic_vector_inversion.ui.json" ) - inversion_type: str = "magnetic vector" + title: str = "Magnetic Vector Inversion" physical_property: str = "susceptibility" + inversion_type: str = "magnetic vector" tmi_channel: FloatData | None = None bx_channel: FloatData | None = None diff --git a/simpeg_drivers/uijson.py b/simpeg_drivers/uijson.py index dafd2b40..2b4321c0 100644 --- a/simpeg_drivers/uijson.py +++ b/simpeg_drivers/uijson.py @@ -24,7 +24,7 @@ class SimPEGDriversUIJson(BaseUIJson): """Base class for simpeg-drivers UIJson.""" icon: str - documentation: str + documentation: str = "https://mirageoscience-simpeg-drivers.readthedocs-hosted.com/en/stable/intro.html" @field_validator("version", mode="before") @classmethod @@ -49,6 +49,6 @@ def write_default(cls): data["version"] = simpeg_drivers.__version__ uijson = cls.model_construct(**data) - data = uijson.model_dump_json(indent=4) + data = uijson.model_dump_json(indent=4, exclude_unset=False) with open(cls.default_ui_json, "w", encoding="utf-8") as file: file.write(data) diff --git a/tests/driver_test.py b/tests/driver_test.py index aace593d..41e10969 100644 --- a/tests/driver_test.py +++ b/tests/driver_test.py @@ -52,7 +52,7 @@ def test_smallness_terms(tmp_path: Path): lower_bound=0.0, max_global_iterations=1, initial_beta_ratio=1e-2, - prctile=100, + percentile=100, store_sensitivities="ram", ) params.alpha_s = None diff --git a/tests/run_tests/driver_airborne_tem_test.py b/tests/run_tests/driver_airborne_tem_test.py index 27122067..615ac509 100644 --- a/tests/run_tests/driver_airborne_tem_test.py +++ b/tests/run_tests/driver_airborne_tem_test.py @@ -180,9 +180,9 @@ def test_airborne_tem_run(tmp_path: Path, max_iterations=1, pytest=True): upper_bound=1e2, max_global_iterations=max_iterations, initial_beta_ratio=1e2, - coolingRate=4, + cooling_rate=4, max_cg_iterations=200, - prctile=5, + percentile=5, sens_wts_threshold=1.0, store_sensitivities="ram", solver_type="Mumps", diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py index 4e59c304..add53d28 100644 --- a/tests/run_tests/driver_dc_2d_test.py +++ b/tests/run_tests/driver_dc_2d_test.py @@ -121,9 +121,9 @@ def test_dc_2d_run(tmp_path: Path, max_iterations=1, pytest=True): max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=1e0, - prctile=100, + percentile=100, lower_bound=0.1, - coolingRate=1, + cooling_rate=1, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_dc_b2d_test.py b/tests/run_tests/driver_dc_b2d_test.py index 0cd9db13..41f16ac7 100644 --- a/tests/run_tests/driver_dc_b2d_test.py +++ b/tests/run_tests/driver_dc_b2d_test.py @@ -124,9 +124,9 @@ def test_dc_p3d_run( max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=10.0, - prctile=100, + percentile=100, upper_bound=10, - coolingRate=1, + cooling_rate=1, file_control=FileControlOptions(cleanup=False), ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_dc_test.py b/tests/run_tests/driver_dc_test.py index e5cb8add..61a0b412 100644 --- a/tests/run_tests/driver_dc_test.py +++ b/tests/run_tests/driver_dc_test.py @@ -113,13 +113,13 @@ def test_dc_3d_run( max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=10.0, - prctile=100, + percentile=100, upper_bound=10, tile_spatial=n_lines, store_sensitivities="ram", auto_scale_misfits=False, save_sensitivities=True, - coolingRate=1, + cooling_rate=1, chi_factor=0.5, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_fem_test.py b/tests/run_tests/driver_fem_test.py index 28a168ff..45d47684 100644 --- a/tests/run_tests/driver_fem_test.py +++ b/tests/run_tests/driver_fem_test.py @@ -142,8 +142,8 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True): upper_bound=0.75, max_global_iterations=max_iterations, initial_beta_ratio=1e1, - prctile=100, - coolingRate=3, + percentile=100, + cooling_rate=3, chi_factor=0.25, store_sensitivities="ram", sens_wts_threshold=1.0, diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py index acf942b2..4820823d 100644 --- a/tests/run_tests/driver_grav_test.py +++ b/tests/run_tests/driver_grav_test.py @@ -150,7 +150,7 @@ def test_gravity_run( lower_bound=0.0, max_global_iterations=max_iterations, initial_beta_ratio=1e-2, - prctile=100, + percentile=100, store_sensitivities="ram", save_sensitivities=True, ) diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py index 6472e090..094d8b86 100644 --- a/tests/run_tests/driver_ground_tem_test.py +++ b/tests/run_tests/driver_ground_tem_test.py @@ -210,9 +210,9 @@ def test_ground_tem_run(tmp_path: Path, max_iterations=1, pytest=True): upper_bound=1e2, max_global_iterations=max_iterations, initial_beta_ratio=1e1, - coolingRate=2, + cooling_rate=2, max_cg_iterations=200, - prctile=100, + percentile=100, sens_wts_threshold=1.0, store_sensitivities="ram", solver_type="Mumps", diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py index 0aed0373..c9db9d6e 100644 --- a/tests/run_tests/driver_ip_2d_test.py +++ b/tests/run_tests/driver_ip_2d_test.py @@ -106,10 +106,10 @@ def test_ip_2d_run( max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=1e0, - prctile=100, + percentile=100, upper_bound=0.1, store_sensitivities="ram", - coolingRate=1, + cooling_rate=1, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_ip_b2d_test.py b/tests/run_tests/driver_ip_b2d_test.py index 9533f3f1..0e425686 100644 --- a/tests/run_tests/driver_ip_b2d_test.py +++ b/tests/run_tests/driver_ip_b2d_test.py @@ -132,9 +132,9 @@ def test_ip_p3d_run( max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=1e0, - prctile=100, + percentile=100, upper_bound=0.1, - coolingRate=1, + cooling_rate=1, file_control=FileControlOptions(cleanup=False), ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py index 5c67bae2..b3d71bf3 100644 --- a/tests/run_tests/driver_ip_test.py +++ b/tests/run_tests/driver_ip_test.py @@ -98,11 +98,11 @@ def test_ip_3d_run( max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=1e0, - prctile=100, + percentile=100, upper_bound=0.1, tile_spatial=n_lines, store_sensitivities="ram", - coolingRate=1, + cooling_rate=1, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_test.py index 0089bc46..cd8d9ebb 100644 --- a/tests/run_tests/driver_joint_cross_gradient_test.py +++ b/tests/run_tests/driver_joint_cross_gradient_test.py @@ -261,7 +261,7 @@ def test_joint_cross_gradient_inv_run( y_norm=0.0, z_norm=0.0, gradient_type="components", - prctile=100, + percentile=100, store_sensitivities="ram", ) diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py index b685efc6..f8081ea9 100644 --- a/tests/run_tests/driver_joint_surveys_test.py +++ b/tests/run_tests/driver_joint_surveys_test.py @@ -158,7 +158,7 @@ def test_joint_surveys_inv_run( lower_bound=0.0, max_global_iterations=max_iterations, initial_beta_ratio=1e-2, - prctile=100, + percentile=100, store_sensitivities="ram", ) diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index 008aac41..fbfa6e9f 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -157,14 +157,14 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True): y_norm=1.0, z_norm=1.0, gradient_type="components", - coolingRate=1, + cooling_rate=1, lower_bound=0.75, model_type="Resistivity (Ohm-m)", background_conductivity=100.0, max_global_iterations=max_iterations, initial_beta_ratio=1e3, sens_wts_threshold=1.0, - prctile=100, + percentile=100, store_sensitivities="ram", **data_kwargs, ) diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index ce3a006c..7bf90e73 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -123,7 +123,7 @@ def test_magnetic_vector_run( initial_beta_ratio=1e1, store_sensitivities="ram", save_sensitivities=True, - prctile=100, + percentile=100, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py index eea6f237..b8e54b2b 100644 --- a/tests/run_tests/driver_tipper_test.py +++ b/tests/run_tests/driver_tipper_test.py @@ -150,8 +150,8 @@ def test_tipper_run(tmp_path: Path, max_iterations=1, pytest=True): max_global_iterations=max_iterations, initial_beta_ratio=1e3, starting_chi_factor=1.0, - coolingRate=1, - prctile=100, + cooling_rate=1, + percentile=100, chi_factor=1.0, max_line_search_iterations=5, store_sensitivities="ram", diff --git a/tests/run_tests/sensitivity_cutoff_test.py b/tests/run_tests/sensitivity_cutoff_test.py index 30053808..8519c535 100644 --- a/tests/run_tests/sensitivity_cutoff_test.py +++ b/tests/run_tests/sensitivity_cutoff_test.py @@ -62,7 +62,7 @@ def setup_inversion_results( lower_bound=0.0, max_global_iterations=1, initial_beta_ratio=1e-2, - prctile=100, + percentile=100, store_sensitivities="ram", save_sensitivities=True, ) diff --git a/tests/uijson_test.py b/tests/uijson_test.py index db6b477b..3b60f4b0 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -93,6 +93,27 @@ class MyUIJson(SimPEGDriversUIJson): assert "Skipping deprecated field my_param." in caplog.text +def test_pydantic_deprecation(tmp_path): + workspace = Workspace(tmp_path / "test.geoh5") + + class MyUIJson(SimPEGDriversUIJson): + my_param: str = Field(deprecated="Use my_param2 instead.", exclude=True) + + uijson = MyUIJson( + version="0.3.0-alpha.1", + title="My app", + icon="", + documentation="", + geoh5=str(workspace.h5file), + run_command="myapp.driver", + monitoring_directory="", + conda_environment="my-app", + workspace_geoh5="", + my_param="whoopsie", + ) + assert "my_param" not in uijson.model_dump() + + def test_alias(tmp_path): workspace = Workspace(tmp_path / "test.geoh5") @@ -161,4 +182,5 @@ def test_gravity_uijson(tmp_path): field_data_nobraces = data params_data_nobraces[param] = field_data_nobraces - assert uijson_data == params_data_nobraces + for k, v in uijson_data.items(): + assert v == params_data_nobraces[k] From 02fa05ca5044a377fdf5e72f08efdec538c78d5f Mon Sep 17 00:00:00 2001 From: benjamink Date: Mon, 17 Mar 2025 10:04:29 -0700 Subject: [PATCH 02/13] add ui.json params to options class to bypass warning about different length of data/ui_json in InputFile class. --- simpeg_drivers-assets/uijson/gravity_forward.ui.json | 10 ++++++++++ simpeg_drivers/params.py | 3 +++ 2 files changed, 13 insertions(+) diff --git a/simpeg_drivers-assets/uijson/gravity_forward.ui.json b/simpeg_drivers-assets/uijson/gravity_forward.ui.json index c9dfd8f5..587219b3 100644 --- a/simpeg_drivers-assets/uijson/gravity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_forward.ui.json @@ -184,6 +184,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", diff --git a/simpeg_drivers/params.py b/simpeg_drivers/params.py index 0f96fa73..04f4db10 100644 --- a/simpeg_drivers/params.py +++ b/simpeg_drivers/params.py @@ -103,6 +103,9 @@ class CoreOptions(BaseData): validate_default=True, ) + title: str | None = None + icon: str | None = None + documentation: str | None = None version: str = simpeg_drivers.__version__ run_command: str = "simpeg_drivers.driver" conda_environment: str = "simpeg_drivers" From 5732b3d440b320f6ca168d6e03df8635d1e2ce8e Mon Sep 17 00:00:00 2001 From: benjamink Date: Tue, 18 Mar 2025 08:57:36 -0700 Subject: [PATCH 03/13] fix warnings of data/uijson lengths (all but joint). --- .../uijson/direct_current_2d_forward.ui.json | 51 +++---------------- .../direct_current_2d_inversion.ui.json | 47 +++-------------- .../uijson/direct_current_3d_forward.ui.json | 15 +++--- .../direct_current_3d_inversion.ui.json | 21 +++----- .../direct_current_batch2d_forward.ui.json | 16 +++--- .../direct_current_batch2d_inversion.ui.json | 20 +++----- .../uijson/fem_forward.ui.json | 15 +++--- .../uijson/fem_inversion.ui.json | 18 ++----- .../induced_polarization_2d_forward.ui.json | 32 +++--------- .../induced_polarization_2d_inversion.ui.json | 45 +++------------- .../induced_polarization_3d_forward.ui.json | 39 +++----------- .../induced_polarization_3d_inversion.ui.json | 44 ++-------------- ...duced_polarization_batch2d_forward.ui.json | 42 +++------------ ...ced_polarization_batch2d_inversion.ui.json | 47 +++-------------- .../uijson/joint_surveys_inversion.ui.json | 34 ++++++++----- .../uijson/magnetic_scalar_forward.ui.json | 26 ++++++---- .../uijson/magnetic_scalar_inversion.ui.json | 29 ++++++----- .../uijson/magnetic_vector_forward.ui.json | 26 ++++++---- .../uijson/magnetic_vector_inversion.ui.json | 29 ++++++----- .../uijson/magnetotellurics_forward.ui.json | 41 +++------------ .../uijson/magnetotellurics_inversion.ui.json | 44 ++-------------- .../uijson/sensitivity_cutoff.ui.json | 2 +- .../uijson/tdem_forward.ui.json | 15 +++--- .../uijson/tdem_inversion.ui.json | 18 ++----- .../uijson/tipper_forward.ui.json | 41 +++------------ .../uijson/tipper_inversion.ui.json | 44 ++-------------- .../pseudo_three_dimensions/params.py | 2 + simpeg_drivers/joint/params.py | 2 - simpeg_drivers/params.py | 1 - .../magnetic_vector/params.py | 4 ++ tests/run_tests/driver_dc_2d_test.py | 1 - tests/run_tests/driver_dc_test.py | 2 - tests/run_tests/driver_mvi_test.py | 1 - tests/run_tests/sensitivity_cutoff_test.py | 1 - tests/uijson_test.py | 3 ++ 35 files changed, 226 insertions(+), 592 deletions(-) diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index a194494a..5f49bd0a 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -36,30 +36,6 @@ "value": 1, "tooltip": "Selects the line of data to be processed." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "potential_channel_bool": true, "mesh": { "group": "Mesh and models", @@ -200,7 +176,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -240,13 +221,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -264,16 +238,5 @@ "value": false, "tooltip": "Generates a file for sweeping parameters instead of running the application." }, - "distributed_workers": "", - "gradient_type": { - "choiceList": [ - "total", - "components" - ], - "group": "Sparse/blocky model", - "label": "Gradient type", - "value": "total", - "verbose": 3, - "tooltip": "Choose whether the IRLS weights for regularization terms are updated using total or partial gradients." - } + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json index 2ae3f547..00d930de 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "direct current 2d", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -35,30 +36,6 @@ "value": 1, "tooltip": "Selects the line of data to be processed." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "potential_channel": { "association": "Cell", "dataType": "Float", @@ -258,8 +235,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -288,6 +263,7 @@ "property": "", "enabled": true }, + "length_scale_y": "", "length_scale_z": { "min": 0.0, "group": "Regularization", @@ -335,6 +311,7 @@ "enabled": true, "tooltip": "Lp-norm used in the x-smoothness term of the objective function." }, + "y_norm": "", "z_norm": { "association": "Cell", "dataType": "Float", @@ -387,7 +364,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -438,7 +415,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -449,7 +426,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -461,6 +438,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -567,7 +545,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -579,13 +556,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -603,6 +573,5 @@ "value": false, "tooltip": "Generates a file for sweeping parameters instead of running the application." }, - "distributed_workers": "", - "potential_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index 1d7c233d..e4d425e9 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "direct current 3d", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -104,7 +105,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -155,13 +161,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json index 3f2da74b..6b9b1fc8 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "direct current 3d", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -177,8 +178,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -335,7 +334,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -386,7 +385,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -397,7 +396,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -409,6 +408,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -526,7 +526,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -538,13 +537,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -562,6 +554,5 @@ "value": false, "tooltip": "Generates a file for sweeping parameters instead of running the application." }, - "distributed_workers": "", - "potential_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json index 850d01d7..4eaeaccf 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "direct current pseudo 3d", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -27,6 +28,7 @@ "value": "", "tooltip": "Selects the data representing the different lines in the survey." }, + "line_id": 1, "potential_channel_bool": true, "u_cell_size": { "min": 0.0, @@ -157,7 +159,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -197,13 +204,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json index 9b37d4cb..5ad57ab3 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "direct current pseudo 3d", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -27,6 +28,7 @@ "value": "", "tooltip": "Selects the data representing the different lines in the survey." }, + "line_id": 1, "potential_channel": { "association": "Cell", "dataType": "Float", @@ -215,7 +217,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, "inversion_style": "voxel", "alpha_s": { "min": 0.0, @@ -344,7 +345,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -395,7 +396,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -406,7 +407,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -418,6 +419,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -536,13 +538,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -572,6 +567,5 @@ "label": "Clean directory", "value": true }, - "distributed_workers": "", - "potential_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/fem_forward.ui.json b/simpeg_drivers-assets/uijson/fem_forward.ui.json index 5045ce80..3fd697bb 100644 --- a/simpeg_drivers-assets/uijson/fem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fem_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "fem", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -117,7 +118,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -168,13 +174,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/fem_inversion.ui.json b/simpeg_drivers-assets/uijson/fem_inversion.ui.json index 317f5420..c11c6462 100644 --- a/simpeg_drivers-assets/uijson/fem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fem_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "fem", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -213,8 +214,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -371,7 +370,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -422,7 +421,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -433,7 +432,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -445,6 +444,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -562,7 +562,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -574,13 +573,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index 411310f5..62ffca02 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization 2d", + "physical_property": "chargeability", "forward_only": true, "data_object": { "main": true, @@ -35,30 +36,6 @@ "value": 1, "tooltip": "Selects the line of data to be processed." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "chargeability_channel_bool": true, "mesh": { "group": "Mesh and models", @@ -210,7 +187,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index 89bb2891..a994a375 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization 2d", + "physical_property": "chargeability", "forward_only": false, "data_object": { "main": true, @@ -35,30 +36,6 @@ "value": 1, "tooltip": "Selects the line of data to be processed." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "chargeability_channel": { "association": "Cell", "dataType": "Float", @@ -268,8 +245,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -397,7 +372,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -448,7 +423,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -459,7 +434,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -471,6 +446,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -567,7 +543,6 @@ "value": "Pardiso" }, "tile_spatial": 1, - "max_ram": "", "store_sensitivities": { "choiceList": [ "disk", @@ -589,13 +564,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -613,6 +581,5 @@ "value": false, "tooltip": "Generates a file for sweeping parameters instead of running the application." }, - "distributed_workers": "", - "chargeability_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json index b4839acf..32ac2fd7 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization 3d", + "physical_property": "chargeability", "forward_only": true, "data_object": { "main": true, @@ -17,30 +18,6 @@ "meshType": "{275ecee9-9c24-4378-bf94-65f3c5fbe163}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "chargeability_channel_bool": true, "mesh": { "group": "Mesh and models", @@ -144,7 +121,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -195,13 +177,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index a2ea78f4..cd3c07e6 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization 3d", + "physical_property": "chargeability", "forward_only": false, "data_object": { "main": true, @@ -17,30 +18,6 @@ "meshType": "{275ecee9-9c24-4378-bf94-65f3c5fbe163}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "visible": false - }, - "gps_receivers_offset": "", "chargeability_channel": { "association": [ "Cell", @@ -217,8 +194,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -375,7 +350,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -426,7 +401,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -437,7 +412,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -556,7 +531,6 @@ "verbose": 2, "tooltip": "Splits the objective function into spatial tiles for distributed computation using the Dask library." }, - "max_ram": "", "store_sensitivities": { "choiceList": [ "disk", @@ -578,13 +552,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -602,6 +569,5 @@ "value": false, "tooltip": "Generates a file for sweeping parameters instead of running the application." }, - "distributed_workers": "", - "chargeability_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json index 76415339..e42f30bc 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization pseudo 3d", + "physical_property": "chargeability", "forward_only": true, "data_object": { "main": true, @@ -27,32 +28,7 @@ "value": "", "tooltip": "Selects the data representing the different lines in the survey." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": true, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", + "line_id": 1, "chargeability_channel_bool": true, "u_cell_size": { "min": 0.0, @@ -194,7 +170,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -234,13 +215,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json index 11d17248..5684a72e 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "induced polarization pseudo 3d", + "physical_property": "chargeability", "forward_only": false, "data_object": { "main": true, @@ -27,32 +28,7 @@ "value": "", "tooltip": "Selects the data representing the different lines in the survey." }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": true, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", + "line_id": 1, "chargeability_channel": { "association": "Cell", "dataType": "Float", @@ -253,7 +229,6 @@ "value": "" }, "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -381,7 +356,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -432,7 +407,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -443,7 +418,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -455,6 +430,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -561,7 +537,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -573,13 +548,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -609,6 +577,5 @@ "label": "Clean directory", "value": true }, - "distributed_workers": "", - "chargeability_channel_bool": true + "distributed_workers": "" } diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index dbbe154e..79181cc3 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -182,8 +182,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -340,7 +338,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -391,7 +389,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -402,7 +400,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 1, @@ -414,6 +412,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -476,6 +475,12 @@ "verbose": 2, "enabled": true }, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -493,6 +498,17 @@ "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": [ "disk", @@ -503,7 +519,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -515,13 +530,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json index ee67902e..baddba98 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetic scalar", + "physical_property": "susceptibility", "forward_only": true, "inducing_field_strength": { "min": 0.0, @@ -190,7 +191,12 @@ "property": "", "value": 0.0001 }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -208,6 +214,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", @@ -231,13 +247,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -248,7 +257,6 @@ "enabled": false, "tooltip": "Optionally set the SimPEG group to which results will be saved." }, - "ga_group": "", "generate_sweep": { "label": "Generate sweep file", "group": "Python run preferences", diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index 452d77e4..0c8a5baf 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetic scalar", + "physical_property": "susceptibility", "forward_only": false, "inducing_field_strength": { "min": 0.0, @@ -478,8 +479,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -636,7 +635,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -687,7 +686,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -698,7 +697,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 1, @@ -709,6 +708,7 @@ "verbose": 2, "enabled": true }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -794,6 +794,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", @@ -816,7 +826,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -828,13 +837,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -845,7 +847,6 @@ "enabled": false, "tooltip": "Optionally set the SimPEG group to which results will be saved." }, - "ga_group": "", "generate_sweep": { "label": "Generate sweep file", "group": "Python run preferences", diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json index 8421abd4..0289c35a 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetic vector", + "physical_property": "susceptibility", "forward_only": true, "inducing_field_strength": { "min": 0.1, @@ -222,7 +223,12 @@ "property": "", "value": 0.0 }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -240,6 +246,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", @@ -263,13 +279,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -280,7 +289,6 @@ "enabled": false, "tooltip": "Optionally set the SimPEG group to which results will be saved." }, - "ga_group": "", "generate_sweep": { "label": "Generate sweep file", "group": "Python run preferences", diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index 48cd5ba5..80eb99de 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetic vector", + "physical_property": "susceptibility", "forward_only": false, "inducing_field_strength": { "min": 0.1, @@ -542,8 +543,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -700,7 +699,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -751,7 +750,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -762,7 +761,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 1, @@ -773,6 +772,7 @@ "verbose": 2, "enabled": true }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -858,6 +858,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", @@ -880,7 +890,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -892,13 +901,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", @@ -909,7 +911,6 @@ "enabled": false, "tooltip": "Optionally set the SimPEG group to which results will be saved." }, - "ga_group": "", "generate_sweep": { "label": "Generate sweep file", "group": "Python run preferences", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index 1d0634ef..c7c5ab45 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetotellurics", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -17,32 +18,6 @@ "meshType": "{b99bd6e5-4fe1-45a5-bd2f-75fc31f91b38}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", "zxx_real_channel_bool": { "group": "Survey", "main": true, @@ -184,7 +159,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -235,13 +215,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index c68922fc..771cc057 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "magnetotellurics", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -17,32 +18,6 @@ "meshType": "{b99bd6e5-4fe1-45a5-bd2f-75fc31f91b38}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", "zxx_real_channel": { "association": [ "Cell", @@ -424,8 +399,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -582,7 +555,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -633,7 +606,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -644,7 +617,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -656,6 +629,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -773,7 +747,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -785,13 +758,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/sensitivity_cutoff.ui.json b/simpeg_drivers-assets/uijson/sensitivity_cutoff.ui.json index 3729451f..d9e0b5a3 100644 --- a/simpeg_drivers-assets/uijson/sensitivity_cutoff.ui.json +++ b/simpeg_drivers-assets/uijson/sensitivity_cutoff.ui.json @@ -30,7 +30,7 @@ "main": true, "group": "Sensitivity", "label": "Cutoff (%)", - "toottip": "The created mask will eliminate cells below the cutoff percentage.", + "tooltip": "The created mask will eliminate cells below the cutoff percentage.", "value": 10.0, "min": 0.0, "max": 100.0, diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index b8afa77c..bf57f19d 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "tdem", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -136,7 +137,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -187,13 +193,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index a47a67d9..ceed6a75 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "tdem", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -250,8 +251,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -408,7 +407,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -459,7 +458,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -470,7 +469,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -482,6 +481,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -598,7 +598,6 @@ "tooltip": "Only RAM storage available for now.", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -610,13 +609,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index 8ffcd7f3..4dfdccf8 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "tipper", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -17,32 +18,6 @@ "meshType": "{0b639533-f35b-44d8-92a8-f70ecff3fd26}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", "txz_real_channel_bool": { "group": "Survey", "main": true, @@ -160,7 +135,12 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -211,13 +191,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index 654182fa..8dff8e04 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "tipper", + "physical_property": "conductivity", "forward_only": false, "data_object": { "main": true, @@ -17,32 +18,6 @@ "meshType": "{0b639533-f35b-44d8-92a8-f70ecff3fd26}", "value": "" }, - "receivers_radar_drape": { - "association": [ - "Cell", - "Vertex" - ], - "dataType": "Float", - "group": "Data pre-processing", - "label": "Z radar offset", - "tooltip": "Apply a non-homogeneous offset to survey object from radar channel.", - "optional": true, - "parent": "data_object", - "value": "", - "enabled": false, - "verbose": 3, - "visible": false - }, - "receivers_offset_z": { - "group": "Data pre-processing", - "label": "Z static offset", - "optional": true, - "enabled": false, - "value": 0.0, - "verbose": 3, - "visible": false - }, - "gps_receivers_offset": "", "txz_real_channel": { "association": [ "Cell", @@ -304,8 +279,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -462,7 +435,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -513,7 +486,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -524,7 +497,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 2, @@ -536,6 +509,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -643,7 +617,6 @@ "verbose": 2, "tooltip": "Splits the objective function into spatial tiles for distributed computation using the Dask library." }, - "max_ram": "", "store_sensitivities": { "choiceList": [ "disk", @@ -665,13 +638,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py index 992626dc..935662ad 100644 --- a/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/params.py @@ -55,6 +55,7 @@ class IPBatch2DForwardOptions(BaseForwardOptions): mesh: Octree | None = None conductivity_model: float | FloatData drape_model: DrapeModelOptions = DrapeModelOptions() + model_type: str = "Conductivity (S/m)" file_control: FileControlOptions = FileControlOptions() @@ -89,6 +90,7 @@ class IPBatch2DInversionOptions(BaseInversionOptions): line_selection: LineSelectionOptions mesh: Octree | None = None drape_model: DrapeModelOptions = DrapeModelOptions() + model_type: str = "Conductivity (S/m)" conductivity_model: float | FloatData lower_bound: float | FloatData | None = 0.0 file_control: FileControlOptions = FileControlOptions() diff --git a/simpeg_drivers/joint/params.py b/simpeg_drivers/joint/params.py index a74fcfb6..3890e2b0 100644 --- a/simpeg_drivers/joint/params.py +++ b/simpeg_drivers/joint/params.py @@ -28,8 +28,6 @@ class BaseJointOptions(BaseInversionOptions): :param group_c_multiplier: Multiplier for the data misfit function for Group C. """ - physical_property: str = "" - data_object: None = None group_a: SimPEGGroup group_a_multiplier: float = 1.0 group_b: SimPEGGroup diff --git a/simpeg_drivers/params.py b/simpeg_drivers/params.py index 04f4db10..bc6eabde 100644 --- a/simpeg_drivers/params.py +++ b/simpeg_drivers/params.py @@ -77,7 +77,6 @@ class CoreOptions(BaseData): :param conda_environment: Name of the conda environment used to run the application with all of its dependencies. :param inversion_type: Type of inversion. - :param physical_property: Physical property of the model. :param data_object: Data object containing survey geometry and data channels. :param mesh: Mesh object containing models (starting, reference, active, etc..). diff --git a/simpeg_drivers/potential_fields/magnetic_vector/params.py b/simpeg_drivers/potential_fields/magnetic_vector/params.py index fc511ce3..896c0d22 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/params.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/params.py @@ -123,3 +123,7 @@ class MVIInversionOptions(BaseInversionOptions): inducing_field_strength: float | FloatData = 50000.0 inducing_field_inclination: float | FloatData = 90.0 inducing_field_declination: float | FloatData = 0.0 + starting_inclination: float | FloatData | None = None + starting_declination: float | FloatData | None = None + reference_inclination: float | FloatData | None = None + reference_declination: float | FloatData | None = None diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py index add53d28..475ee62b 100644 --- a/tests/run_tests/driver_dc_2d_test.py +++ b/tests/run_tests/driver_dc_2d_test.py @@ -117,7 +117,6 @@ def test_dc_2d_run(tmp_path: Path, max_iterations=1, pytest=True): x_norm=1.0, z_norm=1.0, gradient_type="components", - potential_channel_bool=True, max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=1e0, diff --git a/tests/run_tests/driver_dc_test.py b/tests/run_tests/driver_dc_test.py index 61a0b412..4512c31f 100644 --- a/tests/run_tests/driver_dc_test.py +++ b/tests/run_tests/driver_dc_test.py @@ -73,7 +73,6 @@ def test_dc_3d_fwr_run( active_cells=active_cells, data_object=survey, starting_model=model, - resolution=None, ) fwr_driver = DC3DForwardDriver(params) fwr_driver.run() @@ -164,7 +163,6 @@ def test_dc_single_line_fwr_run( active_cells=active_cells, data_object=survey, starting_model=model, - resolution=None, ) fwr_driver = DC3DForwardDriver(params) diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index 7bf90e73..e53bbc32 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -116,7 +116,6 @@ def test_magnetic_vector_run( y_norm=1.0, z_norm=1.0, gradient_type="components", - tmi_channel_bool=True, tmi_channel=tmi, tmi_uncertainty=4.0, max_global_iterations=max_iterations, diff --git a/tests/run_tests/sensitivity_cutoff_test.py b/tests/run_tests/sensitivity_cutoff_test.py index 8519c535..afd05b67 100644 --- a/tests/run_tests/sensitivity_cutoff_test.py +++ b/tests/run_tests/sensitivity_cutoff_test.py @@ -56,7 +56,6 @@ def setup_inversion_results( reference_model=0.0, s_norm=0.0, gradient_type="components", - gz_channel_bool=True, gz_channel=gz, gz_uncertainty=2e-3, lower_bound=0.0, diff --git a/tests/uijson_test.py b/tests/uijson_test.py index 3b60f4b0..9b8f2b61 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -139,6 +139,9 @@ class MyUIJson(SimPEGDriversUIJson): def test_gravity_uijson(tmp_path): + import warnings + + warnings.filterwarnings("error") geoh5, _, starting_model, survey, topography = setup_inversion_workspace( tmp_path, background=0.0, anomaly=0.75, inversion_type="gravity" ) From 821f703bc9299c89966d1d290141ca243b6c00a0 Mon Sep 17 00:00:00 2001 From: benjamink Date: Tue, 18 Mar 2025 13:00:42 -0700 Subject: [PATCH 04/13] Fix up the joint params/uijsons --- .../joint_cross_gradient_inversion.ui.json | 37 ++++-- .../uijson/joint_surveys_inversion.ui.json | 1 + simpeg_drivers/driver.py | 2 + .../joint/joint_cross_gradient/params.py | 3 - simpeg_drivers/joint/joint_surveys/params.py | 7 ++ simpeg_drivers/joint/params.py | 116 +++++++++++++++++- simpeg_drivers/params.py | 5 +- .../magnetic_vector/params.py | 8 +- tests/run_tests/driver_mvi_test.py | 1 - 9 files changed, 154 insertions(+), 26 deletions(-) diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index f0e051b6..a00b4cb6 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -9,6 +9,9 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "joint cross gradient", + "physical_property": [ + "" + ], "forward_only": false, "group_a": { "main": true, @@ -150,8 +153,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, - "inversion_style": "voxel", "alpha_s": { "min": 0.0, "group": "Regularization", @@ -261,7 +262,7 @@ "verbose": 3, "visible": false }, - "prctile": { + "percentile": { "group": "Update IRLS directive", "label": "Percentile", "value": 95, @@ -312,7 +313,7 @@ "verbose": 2, "tooltip": "Trade-off parameter between data misfit and regularization." }, - "coolingFactor": { + "cooling_factor": { "group": "Cooling schedule/target", "label": "Beta cooling factor", "tooltip": "Each beta cooling step will be calculated by dividing the current beta by this factor.", @@ -323,7 +324,7 @@ "lineEdit": false, "verbose": 2 }, - "coolingRate": { + "cooling_rate": { "group": "Optimization", "label": "Iterations per beta", "value": 1, @@ -335,6 +336,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, @@ -397,6 +399,12 @@ "verbose": 2, "enabled": true }, + "save_sensitivities": { + "group": "Update sensitivity weights directive", + "label": "Save sensitivities", + "tooltip": "Save the summed square row sensitivities to geoh5.", + "value": false + }, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -414,6 +422,17 @@ "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": [ "disk", @@ -424,7 +443,6 @@ "tooltip": "Use disk on a fast local SSD, and RAM elsewhere", "value": "ram" }, - "max_ram": "", "max_chunk_size": { "min": 0, "group": "Compute", @@ -436,13 +454,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 79181cc3..89c8dd5f 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -9,6 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "joint surveys", + "physical_property": "", "forward_only": false, "group_a": { "main": true, diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 1a01f80c..0cad1dbd 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -57,6 +57,7 @@ BaseForwardOptions, BaseInversionOptions, ) +from simpeg_drivers.joint.params import BaseJointOptions from simpeg_drivers.utils.utils import tile_locations mlogger = logging.getLogger("distributed") @@ -296,6 +297,7 @@ def params( BaseForwardOptions, BaseInversionOptions, SweepParams, + BaseJointOptions, ), ): raise TypeError( diff --git a/simpeg_drivers/joint/joint_cross_gradient/params.py b/simpeg_drivers/joint/joint_cross_gradient/params.py index 31b31ef9..4b5f2477 100644 --- a/simpeg_drivers/joint/joint_cross_gradient/params.py +++ b/simpeg_drivers/joint/joint_cross_gradient/params.py @@ -15,7 +15,6 @@ from typing import ClassVar from geoh5py.objects import Octree -from pydantic import ConfigDict from simpeg_drivers import assets_path from simpeg_drivers.joint.params import BaseJointOptions @@ -43,9 +42,7 @@ class JointCrossGradientOptions(BaseJointOptions): inversion_type: str = "joint cross gradient" - data_object: None = None mesh: Octree | None = None - starting_model: None = None cross_gradient_weight_a_b: float = 1.0 cross_gradient_weight_c_a: float | None = None cross_gradient_weight_c_b: float | None = None diff --git a/simpeg_drivers/joint/joint_surveys/params.py b/simpeg_drivers/joint/joint_surveys/params.py index d4935247..ec7d6d57 100644 --- a/simpeg_drivers/joint/joint_surveys/params.py +++ b/simpeg_drivers/joint/joint_surveys/params.py @@ -14,6 +14,7 @@ from pathlib import Path from typing import ClassVar +from geoh5py.data import FloatData from pydantic import model_validator from simpeg_drivers import assets_path @@ -32,6 +33,12 @@ class JointSurveysOptions(BaseJointOptions): inversion_type: str = "joint surveys" + model_type: str = "Conductivity (S/m)" + starting_model: float | FloatData + reference_model: float | FloatData | None = None + lower_bound: float | FloatData | None = None + upper_bound: float | FloatData | None = None + @model_validator(mode="after") def all_groups_same_physical_property(self): physical_properties = [k.options["physical_property"] for k in self.groups] diff --git a/simpeg_drivers/joint/params.py b/simpeg_drivers/joint/params.py index 3890e2b0..b93f6953 100644 --- a/simpeg_drivers/joint/params.py +++ b/simpeg_drivers/joint/params.py @@ -11,12 +11,20 @@ from __future__ import annotations -from geoh5py.groups import SimPEGGroup +import multiprocessing -from simpeg_drivers.params import BaseInversionOptions +from geoapps_utils.driver.data import BaseData +from geoh5py.data import FloatData +from geoh5py.groups import SimPEGGroup, UIJsonGroup +from geoh5py.objects import DrapeModel, Octree +from geoh5py.shared.utils import fetch_active_workspace +from pydantic import ConfigDict, field_validator, model_validator +import simpeg_drivers +from simpeg_drivers.params import ActiveCellsOptions, SolverType -class BaseJointOptions(BaseInversionOptions): + +class BaseJointOptions(BaseData): """ Base Joint Options. @@ -28,6 +36,16 @@ class BaseJointOptions(BaseInversionOptions): :param group_c_multiplier: Multiplier for the data misfit function for Group C. """ + model_config = ConfigDict(frozen=False) + + icon: str | None = None + documentation: str | None = None + version: str = simpeg_drivers.__version__ + run_command: str = "simpeg_drivers.driver" + conda_environment: str = "simpeg-drivers" + forward_only: bool = False + physical_property: list[str] = ["conductivity"] + group_a: SimPEGGroup group_a_multiplier: float = 1.0 group_b: SimPEGGroup @@ -35,7 +53,99 @@ class BaseJointOptions(BaseInversionOptions): group_c: SimPEGGroup | None = None group_c_multiplier: float | None = None + mesh: Octree | DrapeModel | None + + active_cells: ActiveCellsOptions + tile_spatial: int = 1 + parallelized: bool = True + solver_type: SolverType = SolverType.Pardiso + save_sensitivities: bool = False + n_cpu: int | None = None + max_chunk_size: int = 128 + out_group: SimPEGGroup | UIJsonGroup | None = None + generate_sweep: bool = False + distributed_workers: str | None = None + alpha_s: float | FloatData | None = 1.0 + length_scale_x: float | FloatData = 1.0 + length_scale_y: float | FloatData | None = 1.0 + length_scale_z: float | FloatData = 1.0 + s_norm: float | FloatData | None = 0.0 + x_norm: float | FloatData = 2.0 + y_norm: float | FloatData | None = 2.0 + z_norm: float | FloatData = 2.0 + gradient_type: str = "total" + max_irls_iterations: int = 25 + starting_chi_factor: float = 1.0 + + chi_factor: float = 1.0 + auto_scale_misfits: bool = True + initial_beta_ratio: float | None = 100.0 + initial_beta: float | None = None + cooling_factor: float = 2.0 + + cooling_rate: float = 1.0 + max_global_iterations: int = 50 + max_line_search_iterations: int = 20 + max_cg_iterations: int = 30 + tol_cg: float = 1e-4 + f_min_change: float = 1e-2 + solver_type: SolverType = SolverType.Pardiso + + sens_wts_threshold: float = 1e-3 + every_iteration_bool: bool = True + + store_sensitivities: str = "ram" + + beta_tol: float = 0.5 + percentile: float = 95.0 + epsilon_cooling_factor: float = 1.2 + @property def groups(self) -> list[SimPEGGroup]: """List all active groups.""" return [k for k in [self.group_a, self.group_b, self.group_c] if k is not None] + + @field_validator("n_cpu", mode="before") + @classmethod + def maximize_cpu_if_none(cls, value): + if value is None: + value = int(multiprocessing.cpu_count()) + return value + + @field_validator("mesh", mode="before") + @classmethod + def mesh_cannot_be_rotated(cls, value: Octree): + if isinstance(value, Octree) and value.rotation not in [0.0, None]: + raise ValueError( + "Rotated meshes are not supported. Please use a mesh with an angle of 0.0." + ) + return value + + @model_validator(mode="before") + @classmethod + def out_group_if_none(cls, data): + group = data.get("out_group", None) + + if isinstance(group, SimPEGGroup): + return data + + if isinstance(group, UIJsonGroup | type(None)): + name = ( + cls.model_fields["title"].default # pylint: disable=unsubscriptable-object + if group is None + else group.name + ) + with fetch_active_workspace(data["geoh5"], mode="r+") as geoh5: + group = SimPEGGroup.create(geoh5, name=name) + + data["out_group"] = group + + return data + + @model_validator(mode="after") + def update_out_group_options(self): + assert self.out_group is not None + with fetch_active_workspace(self.geoh5, mode="r+"): + self.out_group.options = self.serialize() + self.out_group.metadata = None + return self diff --git a/simpeg_drivers/params.py b/simpeg_drivers/params.py index bc6eabde..67cc2c33 100644 --- a/simpeg_drivers/params.py +++ b/simpeg_drivers/params.py @@ -23,7 +23,7 @@ from geoh5py.groups import PropertyGroup, SimPEGGroup, UIJsonGroup from geoh5py.objects import DrapeModel, Octree, Points from geoh5py.shared.utils import fetch_active_workspace -from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator +from pydantic import BaseModel, ConfigDict, field_validator, model_validator import simpeg_drivers @@ -367,15 +367,12 @@ class BaseInversionOptions(CoreOptions): sens_wts_threshold: float = 1e-3 every_iteration_bool: bool = True - tile_spatial: int = 1 store_sensitivities: str = "ram" beta_tol: float = 0.5 percentile: float = 95.0 epsilon_cooling_factor: float = 1.2 - distributed_workers: str | None = None - class EMDataMixin: """ diff --git a/simpeg_drivers/potential_fields/magnetic_vector/params.py b/simpeg_drivers/potential_fields/magnetic_vector/params.py index 896c0d22..1be6d7a2 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/params.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/params.py @@ -37,13 +37,12 @@ class MVIForwardOptions(BaseForwardOptions): """ name: ClassVar[str] = "Magnetic Vector Forward" - physical_property: ClassVar[str] = "susceptibility" default_ui_json: ClassVar[Path] = ( assets_path() / "uijson/magnetic_vector_forward.ui.json" ) title: str = "Magnetic Vector Forward" - + physical_property: str = "susceptibility" inversion_type: str = "magnetic vector" tmi_channel_bool: bool = True @@ -56,6 +55,11 @@ class MVIForwardOptions(BaseForwardOptions): byy_channel_bool: bool = False byz_channel_bool: bool = False bzz_channel_bool: bool = False + inducing_field_strength: float | FloatData = 50000.0 + inducing_field_inclination: float | FloatData = 90.0 + inducing_field_declination: float | FloatData = 0.0 + starting_inclination: float | FloatData | None = None + starting_declination: float | FloatData | None = None class MVIInversionOptions(BaseInversionOptions): diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index e53bbc32..906a0233 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -70,7 +70,6 @@ def test_magnetic_vector_fwr_run( inducing_field_inclination=inducing_field[1], inducing_field_declination=inducing_field[2], data_object=survey, - starting_model_object=model.parent, starting_model=model, starting_inclination=45, starting_declination=270, From 30e3969bd3123bb6802983aa1162e216aaaef340 Mon Sep 17 00:00:00 2001 From: benjamink Date: Tue, 18 Mar 2025 13:20:35 -0700 Subject: [PATCH 05/13] Fix catching updated warning message --- tests/uijson_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/uijson_test.py b/tests/uijson_test.py index 9b8f2b61..2efb06ca 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -90,7 +90,7 @@ class MyUIJson(SimPEGDriversUIJson): workspace_geoh5="", my_param="whoopsie", ) - assert "Skipping deprecated field my_param." in caplog.text + assert "Skipping deprecated field: my_param." in caplog.text def test_pydantic_deprecation(tmp_path): From be213d4f35545f60dbf070d8226e78edb404e032 Mon Sep 17 00:00:00 2001 From: benjamink Date: Tue, 18 Mar 2025 13:39:51 -0700 Subject: [PATCH 06/13] update locks to include Annotation --- .../py-3.10-linux-64-dev.conda.lock.yml | 34 +- environments/py-3.10-linux-64.conda.lock.yml | 16 +- .../py-3.10-win-64-dev.conda.lock.yml | 32 +- environments/py-3.10-win-64.conda.lock.yml | 14 +- .../py-3.11-linux-64-dev.conda.lock.yml | 34 +- environments/py-3.11-linux-64.conda.lock.yml | 16 +- .../py-3.11-win-64-dev.conda.lock.yml | 32 +- environments/py-3.11-win-64.conda.lock.yml | 14 +- .../py-3.12-linux-64-dev.conda.lock.yml | 36 +-- environments/py-3.12-linux-64.conda.lock.yml | 18 +- .../py-3.12-win-64-dev.conda.lock.yml | 34 +- environments/py-3.12-win-64.conda.lock.yml | 16 +- py-3.10.conda-lock.yml | 284 ++++++++--------- py-3.11.conda-lock.yml | 280 ++++++++--------- py-3.12.conda-lock.yml | 294 +++++++++--------- 15 files changed, 579 insertions(+), 575 deletions(-) diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index a4451708..734a7ae7 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -10,15 +10,15 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.8.0=pyhd8ed1ab_0 + - anyio=4.9.0=pyh29332c3_0 - argon2-cffi=23.1.0=pyhd8ed1ab_1 - argon2-cffi-bindings=21.2.0=py310ha75aee5_5 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.9=py310hff52083_0 - asttokens=3.0.0=pyhd8ed1ab_1 - - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - async-lru=2.0.5=pyh29332c3_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -40,7 +40,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py310h3788b33_0 - - coverage=7.6.12=py310h89163eb_0 + - coverage=7.7.0=py310h89163eb_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha75aee5_0 - dask-core=2024.6.2=pyhd8ed1ab_0 @@ -57,7 +57,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py310h89163eb_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py310ha2bacc8_0 - greenlet=3.1.1=py310hf71b8c6_1 @@ -98,7 +98,7 @@ dependencies: - 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.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -136,7 +136,7 @@ dependencies: - libpng=1.6.47=h943b412_0 - libscotch=7.0.6=hea33c07_1 - libsodium=1.0.20=h4ab18f5_0 - - libsqlite=3.49.1=hee588c1_1 + - libsqlite=3.49.1=hee588c1_2 - libssh2=1.11.1=hf672d98_0 - libstdcxx=14.2.0=h8f9b012_2 - libstdcxx-ng=14.2.0=h4852527_2 @@ -161,8 +161,8 @@ dependencies: - mistune=3.1.2=pyhd8ed1ab_0 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py310h3788b33_0 - - mumps-include=5.7.3=ha770c72_8 - - mumps-seq=5.7.3=h2064c95_8 + - mumps-include=5.7.3=h82cca05_9 + - mumps-seq=5.7.3=hb5d91fa_9 - munkres=1.1.4=pyh9f0ad1d_0 - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 @@ -173,7 +173,7 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - ncurses=6.5=h2d0b736_3 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.3.2=pyhd8ed1ab_0 + - notebook=7.3.3=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.13.1=py310h5eaa309_0 - numpy=1.26.4=py310hb13e2d6_0 @@ -182,7 +182,7 @@ dependencies: - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py310h5eaa309_1 - - pandoc=3.6.3=ha770c72_0 + - pandoc=3.6.4=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 - partd=1.4.2=pyhd8ed1ab_0 @@ -222,7 +222,7 @@ dependencies: - python_abi=3.10=5_cp310 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h89163eb_2 - - pyzmq=26.2.1=py310h71f11fc_0 + - pyzmq=26.3.0=py310h71f11fc_0 - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 @@ -256,13 +256,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py310ha75aee5_0 + - sqlalchemy=2.0.39=py310ha75aee5_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=hceb3a55_1 - tblib=3.0.0=pyhd8ed1ab_1 - terminado=0.18.1=pyh0d859eb_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=noxft_h4845f30_101 - toml=0.10.2=pyhd8ed1ab_1 @@ -295,12 +295,12 @@ dependencies: - zeromq=4.3.5=h3b0a872_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py310h5764c6d_0 + - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 32cd4a02..46492f13 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -31,7 +31,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py310h89163eb_0 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py310ha2bacc8_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -75,7 +75,7 @@ dependencies: - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 - libscotch=7.0.6=hea33c07_1 - - libsqlite=3.49.1=hee588c1_1 + - libsqlite=3.49.1=hee588c1_2 - libssh2=1.11.1=hf672d98_0 - libstdcxx=14.2.0=h8f9b012_2 - libstdcxx-ng=14.2.0=h4852527_2 @@ -93,8 +93,8 @@ dependencies: - metis=5.1.0=hd0bcaf9_1007 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py310h3788b33_0 - - mumps-include=5.7.3=ha770c72_8 - - mumps-seq=5.7.3=h2064c95_8 + - mumps-include=5.7.3=h82cca05_9 + - mumps-seq=5.7.3=hb5d91fa_9 - munkres=1.1.4=pyh9f0ad1d_0 - ncurses=6.5=h2d0b736_3 - numcodecs=0.13.1=py310h5eaa309_0 @@ -130,7 +130,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_h4845f30_101 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py310ha75aee5_0 @@ -148,12 +148,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py310h5764c6d_0 + - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index eef40e8d..76d45c96 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -10,15 +10,15 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.8.0=pyhd8ed1ab_0 + - anyio=4.9.0=pyh29332c3_0 - argon2-cffi=23.1.0=pyhd8ed1ab_1 - argon2-cffi-bindings=21.2.0=py310ha8f682b_5 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.9=py310h5588dad_0 - asttokens=3.0.0=pyhd8ed1ab_1 - - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - async-lru=2.0.5=pyh29332c3_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -39,7 +39,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py310hc19bc0b_0 - - coverage=7.6.12=py310h38315fa_0 + - coverage=7.7.0=py310h38315fa_0 - cpython=3.10.16=py310hd8ed1ab_1 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha8f682b_0 @@ -57,7 +57,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py310h38315fa_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py310h3e8ed56_0 - greenlet=3.1.1=py310h9e98ed7_1 @@ -98,7 +98,7 @@ dependencies: - 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.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -127,7 +127,7 @@ dependencies: - liblzma=5.6.4=h2466b09_0 - libpng=1.6.47=had7236b_0 - libsodium=1.0.20=hc70643c_0 - - libsqlite=3.49.1=h67fdade_1 + - libsqlite=3.49.1=h67fdade_2 - libssh2=1.11.1=he619c9f_0 - libtiff=4.7.0=h797046b_3 - libwebp-base=1.5.0=h3b0e114_0 @@ -148,7 +148,7 @@ dependencies: - mistune=3.1.2=pyhd8ed1ab_0 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py310hc19bc0b_0 - - mumps-seq=5.7.3=h9576071_8 + - mumps-seq=5.7.3=hbaa6519_9 - munkres=1.1.4=pyh9f0ad1d_0 - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 @@ -158,7 +158,7 @@ dependencies: - nbconvert-pandoc=7.16.6=hed9df3c_0 - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.3.2=pyhd8ed1ab_0 + - notebook=7.3.3=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 @@ -167,7 +167,7 @@ dependencies: - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py310hb4db72f_1 - - pandoc=3.6.3=h57928b3_0 + - pandoc=3.6.4=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 - partd=1.4.2=pyhd8ed1ab_0 @@ -207,7 +207,7 @@ dependencies: - pywin32=307=py310h9e98ed7_3 - pywinpty=2.0.15=py310h9e98ed7_0 - pyyaml=6.0.2=py310h38315fa_2 - - pyzmq=26.2.1=py310h656833d_0 + - pyzmq=26.3.0=py310h656833d_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 - requests=2.32.3=pyhd8ed1ab_1 @@ -240,13 +240,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py310ha8f682b_0 + - sqlalchemy=2.0.39=py310ha8f682b_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=h62715c5_1 - tblib=3.0.0=pyhd8ed1ab_1 - terminado=0.18.1=pyh5737063_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=h5226925_1 - toml=0.10.2=pyhd8ed1ab_1 @@ -285,12 +285,12 @@ dependencies: - zeromq=4.3.5=ha9f60a1_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py310h8d17308_0 + - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 7ccc5e8a..9528a5db 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -30,7 +30,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py310h38315fa_0 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py310h3e8ed56_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -65,7 +65,7 @@ dependencies: - liblapack=3.9.0=31_h1aa476e_mkl - liblzma=5.6.4=h2466b09_0 - libpng=1.6.47=had7236b_0 - - libsqlite=3.49.1=h67fdade_1 + - libsqlite=3.49.1=h67fdade_2 - libssh2=1.11.1=he619c9f_0 - libtiff=4.7.0=h797046b_3 - libwebp-base=1.5.0=h3b0e114_0 @@ -79,7 +79,7 @@ dependencies: - matplotlib-base=3.8.4=py310hadb10a8_2 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py310hc19bc0b_0 - - mumps-seq=5.7.3=h9576071_8 + - mumps-seq=5.7.3=hbaa6519_9 - munkres=1.1.4=pyh9f0ad1d_0 - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 @@ -113,7 +113,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h5226925_1 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py310ha8f682b_0 @@ -136,12 +136,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py310h8d17308_0 + - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index f5abea3c..feed3cc0 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -10,15 +10,15 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.8.0=pyhd8ed1ab_0 + - anyio=4.9.0=pyh29332c3_0 - argon2-cffi=23.1.0=pyhd8ed1ab_1 - argon2-cffi-bindings=21.2.0=py311h9ecbd09_5 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.9=py311h38be061_0 - asttokens=3.0.0=pyhd8ed1ab_1 - - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - async-lru=2.0.5=pyh29332c3_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -40,7 +40,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py311hd18a35c_0 - - coverage=7.6.12=py311h2dc5d0c_0 + - coverage=7.7.0=py311h2dc5d0c_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py311h9ecbd09_0 - dask-core=2024.6.2=pyhd8ed1ab_0 @@ -58,7 +58,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py311h2dc5d0c_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h5b7b71f_0 - greenlet=3.1.1=py311hfdbb021_1 @@ -100,7 +100,7 @@ dependencies: - 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.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -139,7 +139,7 @@ dependencies: - libpng=1.6.47=h943b412_0 - libscotch=7.0.6=hea33c07_1 - libsodium=1.0.20=h4ab18f5_0 - - libsqlite=3.49.1=hee588c1_1 + - libsqlite=3.49.1=hee588c1_2 - libssh2=1.11.1=hf672d98_0 - libstdcxx=14.2.0=h8f9b012_2 - libstdcxx-ng=14.2.0=h4852527_2 @@ -164,8 +164,8 @@ dependencies: - mistune=3.1.2=pyhd8ed1ab_0 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py311hd18a35c_0 - - mumps-include=5.7.3=ha770c72_8 - - mumps-seq=5.7.3=h2064c95_8 + - mumps-include=5.7.3=h82cca05_9 + - mumps-seq=5.7.3=hb5d91fa_9 - munkres=1.1.4=pyh9f0ad1d_0 - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 @@ -176,7 +176,7 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - ncurses=6.5=h2d0b736_3 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.3.2=pyhd8ed1ab_0 + - notebook=7.3.3=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py311h7db5c69_0 - numpy=1.26.4=py311h64a7726_0 @@ -185,7 +185,7 @@ dependencies: - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py311h7db5c69_1 - - pandoc=3.6.3=ha770c72_0 + - pandoc=3.6.4=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 - partd=1.4.2=pyhd8ed1ab_0 @@ -225,7 +225,7 @@ dependencies: - python_abi=3.11=5_cp311 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h2dc5d0c_2 - - pyzmq=26.2.1=py311h7deb3e3_0 + - pyzmq=26.3.0=py311h7deb3e3_0 - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 @@ -259,13 +259,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py311h9ecbd09_0 + - sqlalchemy=2.0.39=py311h9ecbd09_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=hceb3a55_1 - tblib=3.0.0=pyhd8ed1ab_1 - terminado=0.18.1=pyh0d859eb_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=noxft_h4845f30_101 - toml=0.10.2=pyhd8ed1ab_1 @@ -299,12 +299,12 @@ dependencies: - zeromq=4.3.5=h3b0a872_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py311hd4cff14_0 + - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index fd64a60a..ee5bba97 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -32,7 +32,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py311h2dc5d0c_0 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h5b7b71f_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -77,7 +77,7 @@ dependencies: - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 - libscotch=7.0.6=hea33c07_1 - - libsqlite=3.49.1=hee588c1_1 + - libsqlite=3.49.1=hee588c1_2 - libssh2=1.11.1=hf672d98_0 - libstdcxx=14.2.0=h8f9b012_2 - libstdcxx-ng=14.2.0=h4852527_2 @@ -95,8 +95,8 @@ dependencies: - metis=5.1.0=hd0bcaf9_1007 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py311hd18a35c_0 - - mumps-include=5.7.3=ha770c72_8 - - mumps-seq=5.7.3=h2064c95_8 + - mumps-include=5.7.3=h82cca05_9 + - mumps-seq=5.7.3=hb5d91fa_9 - munkres=1.1.4=pyh9f0ad1d_0 - ncurses=6.5=h2d0b736_3 - numcodecs=0.15.1=py311h7db5c69_0 @@ -132,7 +132,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_h4845f30_101 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py311h9ecbd09_0 @@ -151,12 +151,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py311hd4cff14_0 + - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index a711fd79..413ddb01 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -10,15 +10,15 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.8.0=pyhd8ed1ab_0 + - anyio=4.9.0=pyh29332c3_0 - argon2-cffi=23.1.0=pyhd8ed1ab_1 - argon2-cffi-bindings=21.2.0=py311he736701_5 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.9=py311h1ea47a8_0 - asttokens=3.0.0=pyhd8ed1ab_1 - - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - async-lru=2.0.5=pyh29332c3_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -39,7 +39,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py311h3257749_0 - - coverage=7.6.12=py311h5082efb_0 + - coverage=7.7.0=py311h5082efb_0 - cpython=3.11.11=py311hd8ed1ab_2 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py311he736701_0 @@ -58,7 +58,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py311h5082efb_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h9b10771_0 - greenlet=3.1.1=py311hda3d55a_1 @@ -100,7 +100,7 @@ dependencies: - 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.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -130,7 +130,7 @@ dependencies: - liblzma=5.6.4=h2466b09_0 - libpng=1.6.47=had7236b_0 - libsodium=1.0.20=hc70643c_0 - - libsqlite=3.49.1=h67fdade_1 + - libsqlite=3.49.1=h67fdade_2 - libssh2=1.11.1=he619c9f_0 - libtiff=4.7.0=h797046b_3 - libwebp-base=1.5.0=h3b0e114_0 @@ -151,7 +151,7 @@ dependencies: - mistune=3.1.2=pyhd8ed1ab_0 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py311h3257749_0 - - mumps-seq=5.7.3=h9576071_8 + - mumps-seq=5.7.3=hbaa6519_9 - munkres=1.1.4=pyh9f0ad1d_0 - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 @@ -161,7 +161,7 @@ dependencies: - nbconvert-pandoc=7.16.6=hed9df3c_0 - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.3.2=pyhd8ed1ab_0 + - notebook=7.3.3=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py311hcf9f919_0 - numpy=1.26.4=py311h0b4df5a_0 @@ -170,7 +170,7 @@ dependencies: - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py311hcf9f919_1 - - pandoc=3.6.3=h57928b3_0 + - pandoc=3.6.4=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 - partd=1.4.2=pyhd8ed1ab_0 @@ -210,7 +210,7 @@ dependencies: - pywin32=307=py311hda3d55a_3 - pywinpty=2.0.15=py311hda3d55a_0 - pyyaml=6.0.2=py311h5082efb_2 - - pyzmq=26.2.1=py311h484c95c_0 + - pyzmq=26.3.0=py311h484c95c_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 - requests=2.32.3=pyhd8ed1ab_1 @@ -243,13 +243,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py311he736701_0 + - sqlalchemy=2.0.39=py311he736701_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=h62715c5_1 - tblib=3.0.0=pyhd8ed1ab_1 - terminado=0.18.1=pyh5737063_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=h5226925_1 - toml=0.10.2=pyhd8ed1ab_1 @@ -289,12 +289,12 @@ dependencies: - zeromq=4.3.5=ha9f60a1_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py311ha68e1ae_0 + - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 99a2e838..4008b04c 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -31,7 +31,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py311h5082efb_0 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h9b10771_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -67,7 +67,7 @@ dependencies: - liblapack=3.9.0=31_h1aa476e_mkl - liblzma=5.6.4=h2466b09_0 - libpng=1.6.47=had7236b_0 - - libsqlite=3.49.1=h67fdade_1 + - libsqlite=3.49.1=h67fdade_2 - libssh2=1.11.1=he619c9f_0 - libtiff=4.7.0=h797046b_3 - libwebp-base=1.5.0=h3b0e114_0 @@ -81,7 +81,7 @@ dependencies: - matplotlib-base=3.8.4=py311h9b31f6e_2 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py311h3257749_0 - - mumps-seq=5.7.3=h9576071_8 + - mumps-seq=5.7.3=hbaa6519_9 - munkres=1.1.4=pyh9f0ad1d_0 - numcodecs=0.15.1=py311hcf9f919_0 - numpy=1.26.4=py311h0b4df5a_0 @@ -115,7 +115,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h5226925_1 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py311he736701_0 @@ -139,12 +139,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py311ha68e1ae_0 + - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index 880f8814..d066f23f 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -10,15 +10,15 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.8.0=pyhd8ed1ab_0 + - anyio=4.9.0=pyh29332c3_0 - argon2-cffi=23.1.0=pyhd8ed1ab_1 - argon2-cffi-bindings=21.2.0=py312h66e93f0_5 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.9=py312h7900ff3_0 - asttokens=3.0.0=pyhd8ed1ab_1 - - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - async-lru=2.0.5=pyh29332c3_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -40,7 +40,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py312h68727a3_0 - - coverage=7.6.12=py312h178313f_0 + - coverage=7.7.0=py312h178313f_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py312h66e93f0_0 - dask-core=2024.6.2=pyhd8ed1ab_0 @@ -58,7 +58,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py312h178313f_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hc39e661_0 - greenlet=3.1.1=py312h2ec8cdc_1 @@ -100,7 +100,7 @@ dependencies: - 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.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -139,7 +139,7 @@ dependencies: - libpng=1.6.47=h943b412_0 - libscotch=7.0.6=hea33c07_1 - libsodium=1.0.20=h4ab18f5_0 - - libsqlite=3.49.1=hee588c1_1 + - libsqlite=3.49.1=hee588c1_2 - libssh2=1.11.1=hf672d98_0 - libstdcxx=14.2.0=h8f9b012_2 - libstdcxx-ng=14.2.0=h4852527_2 @@ -164,8 +164,8 @@ dependencies: - mistune=3.1.2=pyhd8ed1ab_0 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py312h68727a3_0 - - mumps-include=5.7.3=ha770c72_8 - - mumps-seq=5.7.3=h2064c95_8 + - mumps-include=5.7.3=h82cca05_9 + - mumps-seq=5.7.3=hb5d91fa_9 - munkres=1.1.4=pyh9f0ad1d_0 - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 @@ -176,7 +176,7 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - ncurses=6.5=h2d0b736_3 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.3.2=pyhd8ed1ab_0 + - notebook=7.3.3=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312hf9745cd_0 - numpy=1.26.4=py312heda63a1_0 @@ -185,7 +185,7 @@ dependencies: - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py312hf9745cd_1 - - pandoc=3.6.3=ha770c72_0 + - pandoc=3.6.4=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 - partd=1.4.2=pyhd8ed1ab_0 @@ -225,7 +225,7 @@ dependencies: - python_abi=3.12=5_cp312 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h178313f_2 - - pyzmq=26.2.1=py312hbf22597_0 + - pyzmq=26.3.0=py312hbf22597_0 - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 @@ -259,13 +259,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py312h66e93f0_0 + - sqlalchemy=2.0.39=py312h66e93f0_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=hceb3a55_1 - tblib=3.0.0=pyhd8ed1ab_1 - terminado=0.18.1=pyh0d859eb_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=noxft_h4845f30_101 - toml=0.10.2=pyhd8ed1ab_1 @@ -299,12 +299,12 @@ dependencies: - zeromq=4.3.5=h3b0a872_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.23.0=py312hef9b889_1 - - zstd=1.5.6=ha6fb4c9_0 + - zstandard=0.23.0=py312h66e93f0_1 + - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 396ce581..b8e5193f 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -32,7 +32,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py312h178313f_0 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hc39e661_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -77,7 +77,7 @@ dependencies: - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 - libscotch=7.0.6=hea33c07_1 - - libsqlite=3.49.1=hee588c1_1 + - libsqlite=3.49.1=hee588c1_2 - libssh2=1.11.1=hf672d98_0 - libstdcxx=14.2.0=h8f9b012_2 - libstdcxx-ng=14.2.0=h4852527_2 @@ -95,8 +95,8 @@ dependencies: - metis=5.1.0=hd0bcaf9_1007 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py312h68727a3_0 - - mumps-include=5.7.3=ha770c72_8 - - mumps-seq=5.7.3=h2064c95_8 + - mumps-include=5.7.3=h82cca05_9 + - mumps-seq=5.7.3=hb5d91fa_9 - munkres=1.1.4=pyh9f0ad1d_0 - ncurses=6.5=h2d0b736_3 - numcodecs=0.15.1=py312hf9745cd_0 @@ -132,7 +132,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_h4845f30_101 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py312h66e93f0_0 @@ -151,12 +151,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.23.0=py312hef9b889_1 - - zstd=1.5.6=ha6fb4c9_0 + - zstandard=0.23.0=py312h66e93f0_1 + - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index 13bbcdbb..f8dd8af5 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -10,15 +10,15 @@ dependencies: - accessible-pygments=0.0.5=pyhd8ed1ab_1 - alabaster=0.7.16=pyhd8ed1ab_0 - annotated-types=0.7.0=pyhd8ed1ab_1 - - anyio=4.8.0=pyhd8ed1ab_0 + - anyio=4.9.0=pyh29332c3_0 - argon2-cffi=23.1.0=pyhd8ed1ab_1 - argon2-cffi-bindings=21.2.0=py312h4389bb4_5 - arrow=1.3.0=pyhd8ed1ab_1 - asciitree=0.3.3=py_2 - astroid=3.3.9=py312h2e8e312_0 - asttokens=3.0.0=pyhd8ed1ab_1 - - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - async-lru=2.0.5=pyh29332c3_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -39,7 +39,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py312hd5eb7cc_0 - - coverage=7.6.12=py312h31fea79_0 + - coverage=7.7.0=py312h31fea79_0 - cpython=3.12.9=py312hd8ed1ab_1 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py312h4389bb4_0 @@ -58,7 +58,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py312h31fea79_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hbaa7e33_0 - greenlet=3.1.1=py312h275cf98_1 @@ -100,7 +100,7 @@ dependencies: - 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.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -130,7 +130,7 @@ dependencies: - liblzma=5.6.4=h2466b09_0 - libpng=1.6.47=had7236b_0 - libsodium=1.0.20=hc70643c_0 - - libsqlite=3.49.1=h67fdade_1 + - libsqlite=3.49.1=h67fdade_2 - libssh2=1.11.1=he619c9f_0 - libtiff=4.7.0=h797046b_3 - libwebp-base=1.5.0=h3b0e114_0 @@ -151,7 +151,7 @@ dependencies: - mistune=3.1.2=pyhd8ed1ab_0 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py312hd5eb7cc_0 - - mumps-seq=5.7.3=h9576071_8 + - mumps-seq=5.7.3=hbaa6519_9 - munkres=1.1.4=pyh9f0ad1d_0 - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 @@ -161,7 +161,7 @@ dependencies: - nbconvert-pandoc=7.16.6=hed9df3c_0 - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - - notebook=7.3.2=pyhd8ed1ab_0 + - notebook=7.3.3=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312h72972c8_0 - numpy=1.26.4=py312h8753938_0 @@ -170,7 +170,7 @@ dependencies: - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py312h72972c8_1 - - pandoc=3.6.3=h57928b3_0 + - pandoc=3.6.4=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 - partd=1.4.2=pyhd8ed1ab_0 @@ -210,7 +210,7 @@ dependencies: - pywin32=307=py312h275cf98_3 - pywinpty=2.0.15=py312h275cf98_0 - pyyaml=6.0.2=py312h31fea79_2 - - pyzmq=26.2.1=py312hd7027bb_0 + - pyzmq=26.3.0=py312hd7027bb_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 - requests=2.32.3=pyhd8ed1ab_1 @@ -243,13 +243,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py312h4389bb4_0 + - sqlalchemy=2.0.39=py312h4389bb4_1 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=h62715c5_1 - tblib=3.0.0=pyhd8ed1ab_1 - terminado=0.18.1=pyh5737063_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=h5226925_1 - toml=0.10.2=pyhd8ed1ab_1 @@ -289,12 +289,12 @@ dependencies: - zeromq=4.3.5=ha9f60a1_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.23.0=py312h7606c53_1 - - zstd=1.5.6=h0ea2cb4_0 + - zstandard=0.23.0=py312h4389bb4_1 + - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index a938bc73..ab427099 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -31,7 +31,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py312h31fea79_0 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hbaa7e33_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -67,7 +67,7 @@ dependencies: - liblapack=3.9.0=31_h1aa476e_mkl - liblzma=5.6.4=h2466b09_0 - libpng=1.6.47=had7236b_0 - - libsqlite=3.49.1=h67fdade_1 + - libsqlite=3.49.1=h67fdade_2 - libssh2=1.11.1=he619c9f_0 - libtiff=4.7.0=h797046b_3 - libwebp-base=1.5.0=h3b0e114_0 @@ -81,7 +81,7 @@ dependencies: - matplotlib-base=3.8.4=py312hfee7060_2 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py312hd5eb7cc_0 - - mumps-seq=5.7.3=h9576071_8 + - mumps-seq=5.7.3=hbaa6519_9 - munkres=1.1.4=pyh9f0ad1d_0 - numcodecs=0.15.1=py312h72972c8_0 - numpy=1.26.4=py312h8753938_0 @@ -115,7 +115,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h5226925_1 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py312h4389bb4_0 @@ -139,12 +139,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.23.0=py312h7606c53_1 - - zstd=1.5.6=h0ea2cb4_0 + - zstandard=0.23.0=py312h4389bb4_1 + - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 472eeecf..474c397f 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -131,23 +131,23 @@ package: category: main optional: false - name: anyio - version: 4.8.0 + version: 4.9.0 manager: conda platform: linux-64 dependencies: exceptiongroup: '>=1.0.2' idna: '>=2.8' - python: '>=3.9' + python: '' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.8.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.9.0-pyh29332c3_0.conda hash: - md5: 848d25bfbadf020ee4d4ba90e5668252 - sha256: f1455d2953e3eb6d71bc49881c8558d8e01888469dfd21061dd48afb6183e836 + md5: 9749a2c77a7c40d432ea0927662d7e52 + sha256: b28e0f78bb0c7962630001e63af25a89224ff504e135a02e50d4d80b6155d386 category: dev optional: true - name: anyio - version: 4.8.0 + version: 4.9.0 manager: conda platform: win-64 dependencies: @@ -156,10 +156,10 @@ package: python: '>=3.9' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.8.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.9.0-pyh29332c3_0.conda hash: - md5: 848d25bfbadf020ee4d4ba90e5668252 - sha256: f1455d2953e3eb6d71bc49881c8558d8e01888469dfd21061dd48afb6183e836 + md5: 9749a2c77a7c40d432ea0927662d7e52 + sha256: b28e0f78bb0c7962630001e63af25a89224ff504e135a02e50d4d80b6155d386 category: dev optional: true - name: argon2-cffi @@ -328,53 +328,53 @@ package: category: dev optional: true - name: async-lru - version: 2.0.4 + version: 2.0.5 manager: conda platform: linux-64 dependencies: - python: '>=3.9' + python: '' typing_extensions: '>=4.0.0' - url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.4-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: - md5: 40c673c7d585623b8f1ee650c8734eb6 - sha256: 344157f396dfdc929d1dff8fe010abe173cd168d22a56648583e616495f2929e + md5: d9d0f99095a9bb7e3641bca8c6ad2ac7 + sha256: 3b7233041e462d9eeb93ea1dfe7b18aca9c358832517072054bb8761df0c324b category: dev optional: true - name: async-lru - version: 2.0.4 + version: 2.0.5 manager: conda platform: win-64 dependencies: python: '>=3.9' typing_extensions: '>=4.0.0' - url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.4-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: - md5: 40c673c7d585623b8f1ee650c8734eb6 - sha256: 344157f396dfdc929d1dff8fe010abe173cd168d22a56648583e616495f2929e + md5: d9d0f99095a9bb7e3641bca8c6ad2ac7 + sha256: 3b7233041e462d9eeb93ea1dfe7b18aca9c358832517072054bb8761df0c324b category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: babel @@ -949,7 +949,7 @@ package: category: main optional: false - name: coverage - version: 7.6.12 + version: 7.7.0 manager: conda platform: linux-64 dependencies: @@ -958,14 +958,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* tomli: '' - url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.6.12-py310h89163eb_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.7.0-py310h89163eb_0.conda hash: - md5: 6fdad60a1f9adce8c1bf2eca277b3cc8 - sha256: 78cb9ec8b72b52a2846130663a8a54f28a32d3b3560d85eb3bae53e7917c1b94 + md5: 6782f8b6cfbc6a8a03b7efd8f8516010 + sha256: 9ef77cdce82d59bd044ebde506d104c8e387c115b14e42a76d45ae3cc5a75565 category: dev optional: true - name: coverage - version: 7.6.12 + version: 7.7.0 manager: conda platform: win-64 dependencies: @@ -975,10 +975,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/coverage-7.6.12-py310h38315fa_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/coverage-7.7.0-py310h38315fa_0.conda hash: - md5: ce4c964daa1f98c5158992352531945e - sha256: 880b8bc206618a9e685cbd22be92f0bc9522f35df94d69cd744449a4e45eb53a + md5: 2e2a90e1f695d76f4f64e821b770606e + sha256: 0b9b75800ebc6d2bbc9cb264aa1352323029e57059e7da834213ed83df99ea73 category: dev optional: true - name: cpython @@ -1473,33 +1473,34 @@ package: category: dev optional: true - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-h267a509_2.conda + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libpng: '>=1.6.47,<1.7.0a0' + libzlib: '>=1.3.1,<2.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.13.3-h48d6fc4_0.conda hash: - md5: 9ae35c3d96db2c94ce0cef86efdfa2cb - sha256: b2e3c449ec9d907dd4656cb0dc93e140f447175b125a3824b31368b06c666bb6 + md5: 9ecfd6f2ca17077dd9c2d24770bb9ccd + sha256: 7385577509a9c4730130f54bb6841b9b416249d5f4e9f74bf313e6378e313c57 category: main optional: false - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: win-64 dependencies: - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' + libpng: '>=1.6.47,<1.7.0a0' + libzlib: '>=1.3.1,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/freetype-2.12.1-hdaf720e_2.conda + url: https://conda.anaconda.org/conda-forge/win-64/freetype-2.13.3-h0b5ce68_0.conda hash: - md5: 3761b23693f768dc75a8fd0a73ca053f - sha256: 2c53ee8879e05e149a9e525481d36adfd660a6abda26fd731376fa64ff03e728 + md5: 9c461ed7b07fb360d2c8cfe726c7d521 + sha256: 67e3af0fbe6c25f5ab1af9a3d3000464c5e88a8a0b4b06602f4a5243a8a1fd42 category: main optional: false - name: fsspec @@ -2777,7 +2778,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: linux-64 dependencies: @@ -2797,14 +2798,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: win-64 dependencies: @@ -2824,10 +2825,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab_pygments @@ -3749,10 +3750,10 @@ package: __glibc: '>=2.17,<3.0.a0' libgcc: '>=13' libzlib: '>=1.3.1,<2.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.49.1-hee588c1_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.49.1-hee588c1_2.conda hash: - md5: 73cea06049cc4174578b432320a003b8 - sha256: 7a09eef804ef7cf4d88215c2297eabb72af8ad0bd5b012060111c289f14bbe7d + md5: 962d6ac93c30b1dfc54c9cccafd1003e + sha256: a086289bf75c33adc1daed3f1422024504ffb5c3c8b3285c49f025c29708ed16 category: main optional: false - name: libsqlite @@ -3763,10 +3764,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.49.1-h67fdade_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.49.1-h67fdade_2.conda hash: - md5: 88931435901c1f13d4e3a472c24965aa - sha256: 08669790e4de89201079e93e8a8d8c51a3cd57a19dd559bb0d5bc6c9a7970b99 + md5: b58b66d4ad1aaf1c2543cbbd6afb1a59 + sha256: c092d42d00fd85cf609cc58574ba2b03c141af5762283f36f5dd445ef7c0f4fe category: main optional: false - name: libssh2 @@ -4415,10 +4416,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/mumps-include-5.7.3-ha770c72_8.conda + url: https://conda.anaconda.org/conda-forge/linux-64/mumps-include-5.7.3-h82cca05_9.conda hash: - md5: 30b5ce863e6e77df2da3ff8022a4c23b - sha256: c71603418563278b58a5b271b168bc6bcd3d17e67521effc00fb83c1db99d237 + md5: 8207b975a176b5c08937bdeeeeecca20 + sha256: bb41dda1084bc29c79bdb1da693295c5bc55da223fb74c4ef8487a81964cbf48 category: main optional: false - name: mumps-seq @@ -4435,11 +4436,11 @@ package: liblapack: '>=3.9.0,<4.0a0' libscotch: '>=7.0.6,<7.0.7.0a0' metis: '>=5.1.0,<5.1.1.0a0' - mumps-include: 5.7.3 - url: https://conda.anaconda.org/conda-forge/linux-64/mumps-seq-5.7.3-h2064c95_8.conda + mumps-include: ==5.7.3 + url: https://conda.anaconda.org/conda-forge/linux-64/mumps-seq-5.7.3-hb5d91fa_9.conda hash: - md5: 975c26ce74dfb1af667957ab5381cce1 - sha256: b4feff171929f5368e913665416fd1e5dc593f4c1ee8720ec34b8f1d60b7a420 + md5: 33982046ecd8eed02447ddd7810aad37 + sha256: 196b227df4635ce4294d40d885fa231d8d037839a95a1eee8923319985276bbe category: main optional: false - name: mumps-seq @@ -4453,10 +4454,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/mumps-seq-5.7.3-h9576071_8.conda + url: https://conda.anaconda.org/conda-forge/win-64/mumps-seq-5.7.3-hbaa6519_9.conda hash: - md5: a0ccf121cc2241006d2dd9aa8fda07a1 - sha256: 69adba3b56e5d9f5b643e6c5feba16d1de5d47efafb59d7bd5958a5169fb44d7 + md5: 3a30d32db33cc226f7a2c78d485b0503 + sha256: 953c384a1b37b93bf7a2ee39b1c5763887f4d63ed220b65362103d6e6b4440a4 category: main optional: false - name: munkres @@ -4773,39 +4774,39 @@ package: category: dev optional: true - name: notebook - version: 7.3.2 + version: 7.3.3 manager: conda platform: linux-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.3.4,<4.4' + jupyterlab: '>=4.3.6,<4.4' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.9' tornado: '>=6.2.0' - url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.3-pyhd8ed1ab_0.conda hash: - md5: 48b0461a947a0537427fc836b9bd2d33 - sha256: 07138543549d6672376115a000c5fd26c3711f0b2b5c9464889bccfe711d8e59 + md5: 3b04a08fc654590f45e0a713982f898b + sha256: 5086c70ff352a72b9d47fcf73d37a1be583cf5b416c9729295a9b3710330d781 category: dev optional: true - name: notebook - version: 7.3.2 + version: 7.3.3 manager: conda platform: win-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.3.4,<4.4' + jupyterlab: '>=4.3.6,<4.4' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.9' tornado: '>=6.2.0' - url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.3-pyhd8ed1ab_0.conda hash: - md5: 48b0461a947a0537427fc836b9bd2d33 - sha256: 07138543549d6672376115a000c5fd26c3711f0b2b5c9464889bccfe711d8e59 + md5: 3b04a08fc654590f45e0a713982f898b + sha256: 5086c70ff352a72b9d47fcf73d37a1be583cf5b416c9729295a9b3710330d781 category: dev optional: true - name: notebook-shim @@ -5061,25 +5062,25 @@ package: category: main optional: false - name: pandoc - version: 3.6.3 + version: 3.6.4 manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.6.3-ha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.6.4-ha770c72_0.conda hash: - md5: 16ff7c679250dc09f9732aab14408d2c - sha256: a7392b0d5403676b0b3ab9ff09c1e65d8ab9e1c34349bba9be605d76cf622640 + md5: 53f2cd4128fa7053bb029bbeafbe3f2e + sha256: 16cbcab8a6d9a0cef47b9d3ebeced8a1a75ee54d379649e6260a333d1b2f743c category: dev optional: true - name: pandoc - version: 3.6.3 + version: 3.6.4 manager: conda platform: win-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/win-64/pandoc-3.6.3-h57928b3_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pandoc-3.6.4-h57928b3_0.conda hash: - md5: 9b999036cccf0d5a94ed3c0b0edbb905 - sha256: ffdb8fd1da7419f6625c8b2339a12f9669a705ada4177b763cc796c60763f734 + md5: dac005a8550579541a6b0b6a8f8c6ddc + sha256: 02ab6b0c12596f5d8481f546a1fef6cd4e3a52ec59bc32c0fa3708106e30972e category: dev optional: true - name: pandocfilters @@ -6231,7 +6232,7 @@ package: category: main optional: false - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: linux-64 dependencies: @@ -6242,14 +6243,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* zeromq: '>=4.3.5,<4.4.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.2.1-py310h71f11fc_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.3.0-py310h71f11fc_0.conda hash: - md5: 7793fb5339be966e5f28971fd6025a9e - sha256: fb5446c23c920970502e4288ee5a8c2b6a52c8c6761673716d7243f7feedf065 + md5: 930d3ad098bb986315a2f95814c5cf42 + sha256: 25c88b22d72a134793d3e294ec1398279cb5eab420d803a3c32e29e1831b2a56 category: dev optional: true - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: win-64 dependencies: @@ -6260,10 +6261,10 @@ package: vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' zeromq: '>=4.3.5,<4.3.6.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.2.1-py310h656833d_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.3.0-py310h656833d_0.conda hash: - md5: a32255b1e5bf69adf98b943fba791bc0 - sha256: 992e8813a540770e096d0bcfdd6152f7e57a8a2632957cdd3ec2f4609afd1e21 + md5: 1cc6a656b0b843d8988c4ed20d4d6c89 + sha256: 93687d8a698481e222abc30daa6d66d03ca0f10e32a7143629ad3a7b5d4244e7 category: dev optional: true - name: readline @@ -7198,7 +7199,7 @@ package: category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: linux-64 dependencies: @@ -7208,14 +7209,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* typing-extensions: '>=4.6.0' - url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.38-py310ha75aee5_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.39-py310ha75aee5_1.conda hash: - md5: 11bb9ab95d526337cb9672fe69209b29 - sha256: dda13ac7d41dadc8b5e55dc94772a24543190baebffd5fc228515d55ea1cb48b + md5: ec8f30932c8dcd1923873941c3f43322 + sha256: 267e69d64d7f1967b6c9e02ecfeb0503d5caf5b6297ba3609a7d576de06adf3e category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: win-64 dependencies: @@ -7226,10 +7227,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.38-py310ha8f682b_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.39-py310ha8f682b_1.conda hash: - md5: 86e42a739127af88d432ab49ae4778c3 - sha256: 84d82e16819e450f3b875461b8430f4433a9f6ab2143e43a018da382913acaf2 + md5: 7ef7d2d6a1e6a36dcd00e6ca06d97105 + sha256: e1b2a6dd6f900be3f73b35089382bf2e4eaa835700eff0e697c3c2eb1c55843f category: dev optional: true - name: stack_data @@ -7371,27 +7372,27 @@ package: category: dev optional: true - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: linux-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: win-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: tinycss2 @@ -8286,35 +8287,36 @@ package: category: main optional: false - name: zstandard - version: 0.19.0 + version: 0.23.0 manager: conda platform: linux-64 dependencies: - cffi: '>=1.8' - libgcc-ng: '>=12' + __glibc: '>=2.17,<3.0.a0' + cffi: '>=1.11' + libgcc: '>=13' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.19.0-py310h5764c6d_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.23.0-py310ha75aee5_1.conda hash: - md5: 74ea667169b1296fb31bb86f13abfa49 - sha256: 958e22d2b24204e08ca0d64db55d63520583db99852cecc82d22c1a3832b23a2 + md5: 0316e8d0e00c00631a6de89207db5b09 + sha256: 96f96336f76443f5efb05f8a7232cc62f8fff969c27d03aa4aae181745f6f961 category: main optional: false - name: zstandard - version: 0.19.0 + version: 0.23.0 manager: conda platform: win-64 dependencies: - cffi: '>=1.8' + cffi: '>=1.11' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' - vs2015_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.19.0-py310h8d17308_0.tar.bz2 + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.23.0-py310ha8f682b_1.conda hash: - md5: b0e5d4dbfffc73a86395f74959570006 - sha256: a528d70c08d22edb14358de8952e44a1ce04b5cf30fea424bf539f64c71964f3 + md5: 831d9f1bfdfc3616b4c0f91cdb36ed38 + sha256: 6bc275161380985ba7effabf53534e8b97479d0318329f345b2e936bd2e4dbe6 category: main optional: false - name: zstd @@ -8390,12 +8392,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 category: main optional: false - name: geoh5py @@ -8407,16 +8409,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: linux-64 dependencies: @@ -8428,16 +8430,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: win-64 dependencies: @@ -8449,12 +8451,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: octree-creation-app diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 3177ff5e..cdcee6f4 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -131,7 +131,7 @@ package: category: main optional: false - name: anyio - version: 4.8.0 + version: 4.9.0 manager: conda platform: linux-64 dependencies: @@ -140,14 +140,14 @@ package: python: '>=3.9' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.8.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.9.0-pyh29332c3_0.conda hash: - md5: 848d25bfbadf020ee4d4ba90e5668252 - sha256: f1455d2953e3eb6d71bc49881c8558d8e01888469dfd21061dd48afb6183e836 + md5: 9749a2c77a7c40d432ea0927662d7e52 + sha256: b28e0f78bb0c7962630001e63af25a89224ff504e135a02e50d4d80b6155d386 category: dev optional: true - name: anyio - version: 4.8.0 + version: 4.9.0 manager: conda platform: win-64 dependencies: @@ -156,10 +156,10 @@ package: python: '>=3.9' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.8.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.9.0-pyh29332c3_0.conda hash: - md5: 848d25bfbadf020ee4d4ba90e5668252 - sha256: f1455d2953e3eb6d71bc49881c8558d8e01888469dfd21061dd48afb6183e836 + md5: 9749a2c77a7c40d432ea0927662d7e52 + sha256: b28e0f78bb0c7962630001e63af25a89224ff504e135a02e50d4d80b6155d386 category: dev optional: true - name: argon2-cffi @@ -326,53 +326,53 @@ package: category: dev optional: true - name: async-lru - version: 2.0.4 + version: 2.0.5 manager: conda platform: linux-64 dependencies: python: '>=3.9' typing_extensions: '>=4.0.0' - url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.4-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: - md5: 40c673c7d585623b8f1ee650c8734eb6 - sha256: 344157f396dfdc929d1dff8fe010abe173cd168d22a56648583e616495f2929e + md5: d9d0f99095a9bb7e3641bca8c6ad2ac7 + sha256: 3b7233041e462d9eeb93ea1dfe7b18aca9c358832517072054bb8761df0c324b category: dev optional: true - name: async-lru - version: 2.0.4 + version: 2.0.5 manager: conda platform: win-64 dependencies: python: '>=3.9' typing_extensions: '>=4.0.0' - url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.4-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: - md5: 40c673c7d585623b8f1ee650c8734eb6 - sha256: 344157f396dfdc929d1dff8fe010abe173cd168d22a56648583e616495f2929e + md5: d9d0f99095a9bb7e3641bca8c6ad2ac7 + sha256: 3b7233041e462d9eeb93ea1dfe7b18aca9c358832517072054bb8761df0c324b category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: babel @@ -947,7 +947,7 @@ package: category: main optional: false - name: coverage - version: 7.6.12 + version: 7.7.0 manager: conda platform: linux-64 dependencies: @@ -956,14 +956,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* tomli: '' - url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.6.12-py311h2dc5d0c_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.7.0-py311h2dc5d0c_0.conda hash: - md5: c91e6ee1716a1893dfbbf67e6831516e - sha256: 3c9dbaa0ed4c22f312bff5dc54acc21888547a6267af0c136e00c3ae85a9807a + md5: 1923a8a1fd2b87318804f118273c1ab2 + sha256: 350b0c1eb54d38aa9631255f11a5b83ec924ffd20776d9a2e903f5c58f3d5904 category: dev optional: true - name: coverage - version: 7.6.12 + version: 7.7.0 manager: conda platform: win-64 dependencies: @@ -973,10 +973,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/coverage-7.6.12-py311h5082efb_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/coverage-7.7.0-py311h5082efb_0.conda hash: - md5: 514902ab62500c24970e35820b6b6b0a - sha256: 374fbd9d9c8dd4b05dd5292c694ede71fc977e8dc521cb8cd34af30269157886 + md5: a2a2feae26268f73c8ab06818b99b56c + sha256: 05b35904afac394868753abe745bdefe6c595f7fc5bc304bc8559c3faab6f05b category: dev optional: true - name: cpython @@ -1497,33 +1497,34 @@ package: category: dev optional: true - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-h267a509_2.conda + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libpng: '>=1.6.47,<1.7.0a0' + libzlib: '>=1.3.1,<2.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.13.3-h48d6fc4_0.conda hash: - md5: 9ae35c3d96db2c94ce0cef86efdfa2cb - sha256: b2e3c449ec9d907dd4656cb0dc93e140f447175b125a3824b31368b06c666bb6 + md5: 9ecfd6f2ca17077dd9c2d24770bb9ccd + sha256: 7385577509a9c4730130f54bb6841b9b416249d5f4e9f74bf313e6378e313c57 category: main optional: false - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: win-64 dependencies: - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' + libpng: '>=1.6.47,<1.7.0a0' + libzlib: '>=1.3.1,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/freetype-2.12.1-hdaf720e_2.conda + url: https://conda.anaconda.org/conda-forge/win-64/freetype-2.13.3-h0b5ce68_0.conda hash: - md5: 3761b23693f768dc75a8fd0a73ca053f - sha256: 2c53ee8879e05e149a9e525481d36adfd660a6abda26fd731376fa64ff03e728 + md5: 9c461ed7b07fb360d2c8cfe726c7d521 + sha256: 67e3af0fbe6c25f5ab1af9a3d3000464c5e88a8a0b4b06602f4a5243a8a1fd42 category: main optional: false - name: fsspec @@ -2829,7 +2830,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: linux-64 dependencies: @@ -2849,14 +2850,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: win-64 dependencies: @@ -2876,10 +2877,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab_pygments @@ -3828,10 +3829,10 @@ package: __glibc: '>=2.17,<3.0.a0' libgcc: '>=13' libzlib: '>=1.3.1,<2.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.49.1-hee588c1_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.49.1-hee588c1_2.conda hash: - md5: 73cea06049cc4174578b432320a003b8 - sha256: 7a09eef804ef7cf4d88215c2297eabb72af8ad0bd5b012060111c289f14bbe7d + md5: 962d6ac93c30b1dfc54c9cccafd1003e + sha256: a086289bf75c33adc1daed3f1422024504ffb5c3c8b3285c49f025c29708ed16 category: main optional: false - name: libsqlite @@ -3842,10 +3843,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.49.1-h67fdade_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.49.1-h67fdade_2.conda hash: - md5: 88931435901c1f13d4e3a472c24965aa - sha256: 08669790e4de89201079e93e8a8d8c51a3cd57a19dd559bb0d5bc6c9a7970b99 + md5: b58b66d4ad1aaf1c2543cbbd6afb1a59 + sha256: c092d42d00fd85cf609cc58574ba2b03c141af5762283f36f5dd445ef7c0f4fe category: main optional: false - name: libssh2 @@ -4494,10 +4495,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/mumps-include-5.7.3-ha770c72_8.conda + url: https://conda.anaconda.org/conda-forge/linux-64/mumps-include-5.7.3-h82cca05_9.conda hash: - md5: 30b5ce863e6e77df2da3ff8022a4c23b - sha256: c71603418563278b58a5b271b168bc6bcd3d17e67521effc00fb83c1db99d237 + md5: 8207b975a176b5c08937bdeeeeecca20 + sha256: bb41dda1084bc29c79bdb1da693295c5bc55da223fb74c4ef8487a81964cbf48 category: main optional: false - name: mumps-seq @@ -4514,11 +4515,11 @@ package: liblapack: '>=3.9.0,<4.0a0' libscotch: '>=7.0.6,<7.0.7.0a0' metis: '>=5.1.0,<5.1.1.0a0' - mumps-include: 5.7.3 - url: https://conda.anaconda.org/conda-forge/linux-64/mumps-seq-5.7.3-h2064c95_8.conda + mumps-include: ==5.7.3 + url: https://conda.anaconda.org/conda-forge/linux-64/mumps-seq-5.7.3-hb5d91fa_9.conda hash: - md5: 975c26ce74dfb1af667957ab5381cce1 - sha256: b4feff171929f5368e913665416fd1e5dc593f4c1ee8720ec34b8f1d60b7a420 + md5: 33982046ecd8eed02447ddd7810aad37 + sha256: 196b227df4635ce4294d40d885fa231d8d037839a95a1eee8923319985276bbe category: main optional: false - name: mumps-seq @@ -4532,10 +4533,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/mumps-seq-5.7.3-h9576071_8.conda + url: https://conda.anaconda.org/conda-forge/win-64/mumps-seq-5.7.3-hbaa6519_9.conda hash: - md5: a0ccf121cc2241006d2dd9aa8fda07a1 - sha256: 69adba3b56e5d9f5b643e6c5feba16d1de5d47efafb59d7bd5958a5169fb44d7 + md5: 3a30d32db33cc226f7a2c78d485b0503 + sha256: 953c384a1b37b93bf7a2ee39b1c5763887f4d63ed220b65362103d6e6b4440a4 category: main optional: false - name: munkres @@ -4852,39 +4853,39 @@ package: category: dev optional: true - name: notebook - version: 7.3.2 + version: 7.3.3 manager: conda platform: linux-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.3.4,<4.4' + jupyterlab: '>=4.3.6,<4.4' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.9' tornado: '>=6.2.0' - url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.3-pyhd8ed1ab_0.conda hash: - md5: 48b0461a947a0537427fc836b9bd2d33 - sha256: 07138543549d6672376115a000c5fd26c3711f0b2b5c9464889bccfe711d8e59 + md5: 3b04a08fc654590f45e0a713982f898b + sha256: 5086c70ff352a72b9d47fcf73d37a1be583cf5b416c9729295a9b3710330d781 category: dev optional: true - name: notebook - version: 7.3.2 + version: 7.3.3 manager: conda platform: win-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.3.4,<4.4' + jupyterlab: '>=4.3.6,<4.4' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.9' tornado: '>=6.2.0' - url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.3-pyhd8ed1ab_0.conda hash: - md5: 48b0461a947a0537427fc836b9bd2d33 - sha256: 07138543549d6672376115a000c5fd26c3711f0b2b5c9464889bccfe711d8e59 + md5: 3b04a08fc654590f45e0a713982f898b + sha256: 5086c70ff352a72b9d47fcf73d37a1be583cf5b416c9729295a9b3710330d781 category: dev optional: true - name: notebook-shim @@ -5142,25 +5143,25 @@ package: category: main optional: false - name: pandoc - version: 3.6.3 + version: 3.6.4 manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.6.3-ha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.6.4-ha770c72_0.conda hash: - md5: 16ff7c679250dc09f9732aab14408d2c - sha256: a7392b0d5403676b0b3ab9ff09c1e65d8ab9e1c34349bba9be605d76cf622640 + md5: 53f2cd4128fa7053bb029bbeafbe3f2e + sha256: 16cbcab8a6d9a0cef47b9d3ebeced8a1a75ee54d379649e6260a333d1b2f743c category: dev optional: true - name: pandoc - version: 3.6.3 + version: 3.6.4 manager: conda platform: win-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/win-64/pandoc-3.6.3-h57928b3_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pandoc-3.6.4-h57928b3_0.conda hash: - md5: 9b999036cccf0d5a94ed3c0b0edbb905 - sha256: ffdb8fd1da7419f6625c8b2339a12f9669a705ada4177b763cc796c60763f734 + md5: dac005a8550579541a6b0b6a8f8c6ddc + sha256: 02ab6b0c12596f5d8481f546a1fef6cd4e3a52ec59bc32c0fa3708106e30972e category: dev optional: true - name: pandocfilters @@ -6314,7 +6315,7 @@ package: category: main optional: false - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: linux-64 dependencies: @@ -6325,14 +6326,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* zeromq: '>=4.3.5,<4.4.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.2.1-py311h7deb3e3_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.3.0-py311h7deb3e3_0.conda hash: - md5: 52457fbaa0aef8136d5dd7bb8a36db9e - sha256: bd6309ef4629744aaaccd9b33d6389dfe879e9864386137e6e4ecc7e1b9ed0f3 + md5: 1ca9cbd0e1d3db5f4fda183977c8ae01 + sha256: a53a33de9f4dab1a3129324b4b4e7da2c6c642d8555fe591d3f6bc9772054389 category: dev optional: true - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: win-64 dependencies: @@ -6343,10 +6344,10 @@ package: vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' zeromq: '>=4.3.5,<4.3.6.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.2.1-py311h484c95c_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.3.0-py311h484c95c_0.conda hash: - md5: efe5e2d7ca651116dd17052ac4891746 - sha256: 1b102e3e6c8b5632c9e7b292c8fe4f06c761bffeee39389ec337d83a3388b6f0 + md5: e01cddfa1ebe1376589fa2f331030744 + sha256: 38fea35b67252e56e308f1af6e7694a414ff5e7d55d74cbcfb22a5b9aa344d9f category: dev optional: true - name: readline @@ -7281,7 +7282,7 @@ package: category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: linux-64 dependencies: @@ -7291,14 +7292,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* typing-extensions: '>=4.6.0' - url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.38-py311h9ecbd09_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.39-py311h9ecbd09_1.conda hash: - md5: abf26162851979957e29e2952b8a62d9 - sha256: ccfbba7080e7ce9d07eee8862c5c81f886b6496f96197cabdeb76e2523f56930 + md5: 6b5eb445386814e5cfb622030862e3bf + sha256: ff0fa5333e20a80fcba67eac2118ecbad29a5dc4bb3867110e5702c804800b82 category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: win-64 dependencies: @@ -7309,10 +7310,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.38-py311he736701_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.39-py311he736701_1.conda hash: - md5: 2376fff5037b991ef237a01b9c048f5a - sha256: 56515b53b4a641fce8364197460fb1b7dfe5c46aa5e3b8d285c7985b714bacb0 + md5: 48e9ba64e13402865f307b79a408e14f + sha256: 224bdac0c4a332d4dc16f194737d277063f5cec44f855015ae02edd2c71c9da4 category: dev optional: true - name: stack_data @@ -7454,27 +7455,27 @@ package: category: dev optional: true - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: linux-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: win-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: tinycss2 @@ -8400,35 +8401,36 @@ package: category: main optional: false - name: zstandard - version: 0.19.0 + version: 0.23.0 manager: conda platform: linux-64 dependencies: - cffi: '>=1.8' - libgcc-ng: '>=12' + __glibc: '>=2.17,<3.0.a0' + cffi: '>=1.11' + libgcc: '>=13' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.19.0-py311hd4cff14_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.23.0-py311h9ecbd09_1.conda hash: - md5: 056b3271f46abaa4673c8c6783283a07 - sha256: 8aac43cc4fbdcc420fe8a22c764b67f6ac9168b103bfd10d79a82b748304ddf6 + md5: 6d229edd907b6bb39961b74e3d52de9c + sha256: 1a824220227f356f35acec5ff6a4418b1ccd0238fd752ceebeb04a0bd37acf0f category: main optional: false - name: zstandard - version: 0.19.0 + version: 0.23.0 manager: conda platform: win-64 dependencies: - cffi: '>=1.8' + cffi: '>=1.11' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' - vs2015_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.19.0-py311ha68e1ae_0.tar.bz2 + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.23.0-py311he736701_1.conda hash: - md5: 94114ffe0cad9e1e704e2c0015c8aa87 - sha256: c687a7d884e98c69f4f1fee8cb9949157bba7c76a54176edeb3262c156e08e71 + md5: a4c147aaaf7e284762d7a6acc49e35e5 + sha256: 78afa8ce76763993a76da1b0120b690cba8926271cc9e0462f66155866817c84 category: main optional: false - name: zstd @@ -8504,12 +8506,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 category: main optional: false - name: geoh5py @@ -8521,16 +8523,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: linux-64 dependencies: @@ -8542,16 +8544,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: win-64 dependencies: @@ -8563,12 +8565,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: octree-creation-app diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 6f80616b..a8cdb301 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -131,7 +131,7 @@ package: category: main optional: false - name: anyio - version: 4.8.0 + version: 4.9.0 manager: conda platform: linux-64 dependencies: @@ -140,14 +140,14 @@ package: python: '>=3.9' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.8.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.9.0-pyh29332c3_0.conda hash: - md5: 848d25bfbadf020ee4d4ba90e5668252 - sha256: f1455d2953e3eb6d71bc49881c8558d8e01888469dfd21061dd48afb6183e836 + md5: 9749a2c77a7c40d432ea0927662d7e52 + sha256: b28e0f78bb0c7962630001e63af25a89224ff504e135a02e50d4d80b6155d386 category: dev optional: true - name: anyio - version: 4.8.0 + version: 4.9.0 manager: conda platform: win-64 dependencies: @@ -156,10 +156,10 @@ package: python: '>=3.9' sniffio: '>=1.1' typing_extensions: '>=4.5' - url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.8.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/anyio-4.9.0-pyh29332c3_0.conda hash: - md5: 848d25bfbadf020ee4d4ba90e5668252 - sha256: f1455d2953e3eb6d71bc49881c8558d8e01888469dfd21061dd48afb6183e836 + md5: 9749a2c77a7c40d432ea0927662d7e52 + sha256: b28e0f78bb0c7962630001e63af25a89224ff504e135a02e50d4d80b6155d386 category: dev optional: true - name: argon2-cffi @@ -326,53 +326,53 @@ package: category: dev optional: true - name: async-lru - version: 2.0.4 + version: 2.0.5 manager: conda platform: linux-64 dependencies: python: '>=3.9' typing_extensions: '>=4.0.0' - url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.4-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: - md5: 40c673c7d585623b8f1ee650c8734eb6 - sha256: 344157f396dfdc929d1dff8fe010abe173cd168d22a56648583e616495f2929e + md5: d9d0f99095a9bb7e3641bca8c6ad2ac7 + sha256: 3b7233041e462d9eeb93ea1dfe7b18aca9c358832517072054bb8761df0c324b category: dev optional: true - name: async-lru - version: 2.0.4 + version: 2.0.5 manager: conda platform: win-64 dependencies: python: '>=3.9' typing_extensions: '>=4.0.0' - url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.4-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/async-lru-2.0.5-pyh29332c3_0.conda hash: - md5: 40c673c7d585623b8f1ee650c8734eb6 - sha256: 344157f396dfdc929d1dff8fe010abe173cd168d22a56648583e616495f2929e + md5: d9d0f99095a9bb7e3641bca8c6ad2ac7 + sha256: 3b7233041e462d9eeb93ea1dfe7b18aca9c358832517072054bb8761df0c324b category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: babel @@ -947,7 +947,7 @@ package: category: main optional: false - name: coverage - version: 7.6.12 + version: 7.7.0 manager: conda platform: linux-64 dependencies: @@ -956,14 +956,14 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* tomli: '' - url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.6.12-py312h178313f_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.7.0-py312h178313f_0.conda hash: - md5: 5be370f84dac4fbd6596db97924ee101 - sha256: 4e619659a08fe46f48a04ee391888b04f60af92e8a587ca3b69cbefbe1b7b7f8 + md5: ec7b7abbdcfbac99336fadde6b75213c + sha256: 00b0153cc58e638713d8297000761d4b8ab2b75d4c7096192d802e5f362de716 category: dev optional: true - name: coverage - version: 7.6.12 + version: 7.7.0 manager: conda platform: win-64 dependencies: @@ -973,10 +973,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/coverage-7.6.12-py312h31fea79_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/coverage-7.7.0-py312h31fea79_0.conda hash: - md5: e5667b1a7898d95e5cb1dff3b576e6ba - sha256: 1d714b1b1e146afc1b8713dddd52c68d97eaf1ff39d5f9e39a44451749c8d9fd + md5: f2a8dc053d6523645333097a20710f97 + sha256: fba20ba73ff712a93c36d806492edb9f71a8453e3224301db03d6e0748dbf118 category: dev optional: true - name: cpython @@ -1497,33 +1497,34 @@ package: category: dev optional: true - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-h267a509_2.conda + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libpng: '>=1.6.47,<1.7.0a0' + libzlib: '>=1.3.1,<2.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.13.3-h48d6fc4_0.conda hash: - md5: 9ae35c3d96db2c94ce0cef86efdfa2cb - sha256: b2e3c449ec9d907dd4656cb0dc93e140f447175b125a3824b31368b06c666bb6 + md5: 9ecfd6f2ca17077dd9c2d24770bb9ccd + sha256: 7385577509a9c4730130f54bb6841b9b416249d5f4e9f74bf313e6378e313c57 category: main optional: false - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: win-64 dependencies: - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' + libpng: '>=1.6.47,<1.7.0a0' + libzlib: '>=1.3.1,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/freetype-2.12.1-hdaf720e_2.conda + url: https://conda.anaconda.org/conda-forge/win-64/freetype-2.13.3-h0b5ce68_0.conda hash: - md5: 3761b23693f768dc75a8fd0a73ca053f - sha256: 2c53ee8879e05e149a9e525481d36adfd660a6abda26fd731376fa64ff03e728 + md5: 9c461ed7b07fb360d2c8cfe726c7d521 + sha256: 67e3af0fbe6c25f5ab1af9a3d3000464c5e88a8a0b4b06602f4a5243a8a1fd42 category: main optional: false - name: fsspec @@ -2829,7 +2830,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: linux-64 dependencies: @@ -2849,14 +2850,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: win-64 dependencies: @@ -2876,10 +2877,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab_pygments @@ -3828,10 +3829,10 @@ package: __glibc: '>=2.17,<3.0.a0' libgcc: '>=13' libzlib: '>=1.3.1,<2.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.49.1-hee588c1_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.49.1-hee588c1_2.conda hash: - md5: 73cea06049cc4174578b432320a003b8 - sha256: 7a09eef804ef7cf4d88215c2297eabb72af8ad0bd5b012060111c289f14bbe7d + md5: 962d6ac93c30b1dfc54c9cccafd1003e + sha256: a086289bf75c33adc1daed3f1422024504ffb5c3c8b3285c49f025c29708ed16 category: main optional: false - name: libsqlite @@ -3842,10 +3843,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.49.1-h67fdade_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.49.1-h67fdade_2.conda hash: - md5: 88931435901c1f13d4e3a472c24965aa - sha256: 08669790e4de89201079e93e8a8d8c51a3cd57a19dd559bb0d5bc6c9a7970b99 + md5: b58b66d4ad1aaf1c2543cbbd6afb1a59 + sha256: c092d42d00fd85cf609cc58574ba2b03c141af5762283f36f5dd445ef7c0f4fe category: main optional: false - name: libssh2 @@ -4494,10 +4495,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/mumps-include-5.7.3-ha770c72_8.conda + url: https://conda.anaconda.org/conda-forge/linux-64/mumps-include-5.7.3-h82cca05_9.conda hash: - md5: 30b5ce863e6e77df2da3ff8022a4c23b - sha256: c71603418563278b58a5b271b168bc6bcd3d17e67521effc00fb83c1db99d237 + md5: 8207b975a176b5c08937bdeeeeecca20 + sha256: bb41dda1084bc29c79bdb1da693295c5bc55da223fb74c4ef8487a81964cbf48 category: main optional: false - name: mumps-seq @@ -4514,11 +4515,11 @@ package: liblapack: '>=3.9.0,<4.0a0' libscotch: '>=7.0.6,<7.0.7.0a0' metis: '>=5.1.0,<5.1.1.0a0' - mumps-include: 5.7.3 - url: https://conda.anaconda.org/conda-forge/linux-64/mumps-seq-5.7.3-h2064c95_8.conda + mumps-include: ==5.7.3 + url: https://conda.anaconda.org/conda-forge/linux-64/mumps-seq-5.7.3-hb5d91fa_9.conda hash: - md5: 975c26ce74dfb1af667957ab5381cce1 - sha256: b4feff171929f5368e913665416fd1e5dc593f4c1ee8720ec34b8f1d60b7a420 + md5: 33982046ecd8eed02447ddd7810aad37 + sha256: 196b227df4635ce4294d40d885fa231d8d037839a95a1eee8923319985276bbe category: main optional: false - name: mumps-seq @@ -4532,10 +4533,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/mumps-seq-5.7.3-h9576071_8.conda + url: https://conda.anaconda.org/conda-forge/win-64/mumps-seq-5.7.3-hbaa6519_9.conda hash: - md5: a0ccf121cc2241006d2dd9aa8fda07a1 - sha256: 69adba3b56e5d9f5b643e6c5feba16d1de5d47efafb59d7bd5958a5169fb44d7 + md5: 3a30d32db33cc226f7a2c78d485b0503 + sha256: 953c384a1b37b93bf7a2ee39b1c5763887f4d63ed220b65362103d6e6b4440a4 category: main optional: false - name: munkres @@ -4852,39 +4853,39 @@ package: category: dev optional: true - name: notebook - version: 7.3.2 + version: 7.3.3 manager: conda platform: linux-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.3.4,<4.4' + jupyterlab: '>=4.3.6,<4.4' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.9' tornado: '>=6.2.0' - url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.3-pyhd8ed1ab_0.conda hash: - md5: 48b0461a947a0537427fc836b9bd2d33 - sha256: 07138543549d6672376115a000c5fd26c3711f0b2b5c9464889bccfe711d8e59 + md5: 3b04a08fc654590f45e0a713982f898b + sha256: 5086c70ff352a72b9d47fcf73d37a1be583cf5b416c9729295a9b3710330d781 category: dev optional: true - name: notebook - version: 7.3.2 + version: 7.3.3 manager: conda platform: win-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.3.4,<4.4' + jupyterlab: '>=4.3.6,<4.4' jupyterlab_server: '>=2.27.1,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.9' tornado: '>=6.2.0' - url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/notebook-7.3.3-pyhd8ed1ab_0.conda hash: - md5: 48b0461a947a0537427fc836b9bd2d33 - sha256: 07138543549d6672376115a000c5fd26c3711f0b2b5c9464889bccfe711d8e59 + md5: 3b04a08fc654590f45e0a713982f898b + sha256: 5086c70ff352a72b9d47fcf73d37a1be583cf5b416c9729295a9b3710330d781 category: dev optional: true - name: notebook-shim @@ -5142,25 +5143,25 @@ package: category: main optional: false - name: pandoc - version: 3.6.3 + version: 3.6.4 manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.6.3-ha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.6.4-ha770c72_0.conda hash: - md5: 16ff7c679250dc09f9732aab14408d2c - sha256: a7392b0d5403676b0b3ab9ff09c1e65d8ab9e1c34349bba9be605d76cf622640 + md5: 53f2cd4128fa7053bb029bbeafbe3f2e + sha256: 16cbcab8a6d9a0cef47b9d3ebeced8a1a75ee54d379649e6260a333d1b2f743c category: dev optional: true - name: pandoc - version: 3.6.3 + version: 3.6.4 manager: conda platform: win-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/win-64/pandoc-3.6.3-h57928b3_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pandoc-3.6.4-h57928b3_0.conda hash: - md5: 9b999036cccf0d5a94ed3c0b0edbb905 - sha256: ffdb8fd1da7419f6625c8b2339a12f9669a705ada4177b763cc796c60763f734 + md5: dac005a8550579541a6b0b6a8f8c6ddc + sha256: 02ab6b0c12596f5d8481f546a1fef6cd4e3a52ec59bc32c0fa3708106e30972e category: dev optional: true - name: pandocfilters @@ -6314,7 +6315,7 @@ package: category: main optional: false - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: linux-64 dependencies: @@ -6325,14 +6326,14 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* zeromq: '>=4.3.5,<4.4.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.2.1-py312hbf22597_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.3.0-py312hbf22597_0.conda hash: - md5: 7cec8d0dac15a2d9fea8e49879aa779d - sha256: 90ec0da0317d3d76990a40c61e1709ef859dd3d8c63838bad2814f46a63c8a2e + md5: ec243006dd2b7dc72f1fba385e59f693 + sha256: aa96b9d13bc74f514ccbc3ad275d23bb837ec63894e6e7fb43786c7c41959bfd category: dev optional: true - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: win-64 dependencies: @@ -6343,10 +6344,10 @@ package: vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' zeromq: '>=4.3.5,<4.3.6.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.2.1-py312hd7027bb_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.3.0-py312hd7027bb_0.conda hash: - md5: e2ae9a063922c1798908cce9961a86fb - sha256: 9a139a04873a53eefb7b39d3b9f04ae99ab8079b68a80b3caaa310d93483e6ff + md5: 5795400c7af6fcc8dc30b72e77e52dca + sha256: 39e0fb384a516bbff9ee0ffdfbb765d0ee1180ad5d6cbdcf75140fe871b4f615 category: dev optional: true - name: readline @@ -7281,7 +7282,7 @@ package: category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: linux-64 dependencies: @@ -7291,14 +7292,14 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* typing-extensions: '>=4.6.0' - url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.38-py312h66e93f0_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.39-py312h66e93f0_1.conda hash: - md5: 91e345de80d0dc238b598683b69da123 - sha256: e70d630452e3b44f0c4c127a73df3c90bfae125fc53f9c698954058153b18aa1 + md5: 09253e9e1a2c2003b3c42ac11143e05a + sha256: 1ba23a1da71a5883c8fce94662e5468ceee6d784a899fb12315dfcfdd3adb7ba category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: win-64 dependencies: @@ -7309,10 +7310,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.38-py312h4389bb4_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.39-py312h4389bb4_1.conda hash: - md5: 42fb97584c9d1d6c5d423a1e38374d04 - sha256: 6d4d128c46c891224690a24d1453de720de5435f9d60ad136614d75a56652144 + md5: caddc19808c2f26047a23c9ef0d8ca30 + sha256: 9a118904819142a635db24908a80b44406e2269f768fc1c67b14f6a1348fdada category: dev optional: true - name: stack_data @@ -7454,27 +7455,27 @@ package: category: dev optional: true - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: linux-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: win-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: tinycss2 @@ -8409,11 +8410,10 @@ package: libgcc: '>=13' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - zstd: '>=1.5.6,<1.5.7.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.23.0-py312hef9b889_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.23.0-py312h66e93f0_1.conda hash: - md5: 8b7069e9792ee4e5b4919a7a306d2e67 - sha256: b97015e146437283f2213ff0e95abdc8e2480150634d81fbae6b96ee09f5e50b + md5: d28b82fcc8d1b462b595af4b15a6cdcf + sha256: b4fd6bd1cb87a183a8bbe85b4e87a1e7c51473309d0d82cd88d38fb021bcf41e category: main optional: false - name: zstandard @@ -8427,40 +8427,40 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - zstd: '>=1.5.6,<1.5.7.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.23.0-py312h7606c53_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.23.0-py312h4389bb4_1.conda hash: - md5: a92cc3435b2fd6f51463f5a4db5c50b1 - sha256: 3e0c718aa18dcac7f080844dbe0aea41a9cea75083019ce02e8a784926239826 + md5: 5028543ffb67666ca4fc3ebd620c97b8 + sha256: 17f2abbda821be146b549498fab3d0eb9cafb210e163b983524db91524b8dcb5 category: main optional: false - name: zstd - version: 1.5.6 + version: 1.5.7 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<2.0.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.6-ha6fb4c9_0.conda + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libstdcxx: '>=13' + libzlib: '>=1.3.1,<2.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.7-hb8e6e7a_1.conda hash: - md5: 4d056880988120e29d75bfff282e0f45 - sha256: c558b9cc01d9c1444031bd1ce4b9cff86f9085765f17627a6cd85fc623c8a02b + md5: 02e4e2fa41a6528afba2e54cbc4280ff + sha256: 532d3623961e34c53aba98db2ad0a33b7a52ff90d6960e505fb2d2efc06bb7da category: main optional: false - name: zstd - version: 1.5.6 + version: 1.5.7 manager: conda platform: win-64 dependencies: - libzlib: '>=1.2.13,<2.0.0a0' + libzlib: '>=1.3.1,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.6-h0ea2cb4_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-hbeecb71_1.conda hash: - md5: 9a17230f95733c04dc40a2b1e5491d74 - sha256: 768e30dc513568491818fb068ee867c57c514b553915536da09e5d10b4ebf3c3 + md5: bf190adcc22f146d8ec66da215c9d78b + sha256: a59b096b95f20910158c927797e9144ed9c7970f1b4aca58e6d6c8db9f653006 category: main optional: false - name: geoapps-utils @@ -8506,12 +8506,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 category: main optional: false - name: geoh5py @@ -8523,16 +8523,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: linux-64 dependencies: @@ -8544,16 +8544,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: win-64 dependencies: @@ -8565,12 +8565,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: octree-creation-app From b203547756b955ebf795da3cb093453d447cd236 Mon Sep 17 00:00:00 2001 From: benjamink Date: Wed, 19 Mar 2025 11:33:00 -0700 Subject: [PATCH 07/13] relock --- .../py-3.10-linux-64-dev.conda.lock.yml | 8 +-- environments/py-3.10-linux-64.conda.lock.yml | 6 +- .../py-3.10-win-64-dev.conda.lock.yml | 8 +-- environments/py-3.10-win-64.conda.lock.yml | 6 +- .../py-3.11-linux-64-dev.conda.lock.yml | 8 +-- environments/py-3.11-linux-64.conda.lock.yml | 6 +- .../py-3.11-win-64-dev.conda.lock.yml | 8 +-- environments/py-3.11-win-64.conda.lock.yml | 6 +- .../py-3.12-linux-64-dev.conda.lock.yml | 8 +-- environments/py-3.12-linux-64.conda.lock.yml | 6 +- .../py-3.12-win-64-dev.conda.lock.yml | 8 +-- environments/py-3.12-win-64.conda.lock.yml | 6 +- py-3.10.conda-lock.yml | 58 +++++++++---------- py-3.11.conda-lock.yml | 56 +++++++++--------- py-3.12.conda-lock.yml | 56 +++++++++--------- 15 files changed, 127 insertions(+), 127 deletions(-) diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index 734a7ae7..e0bc7568 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -158,7 +158,7 @@ dependencies: - mdit-py-plugins=0.4.2=pyhd8ed1ab_1 - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - - mistune=3.1.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py310h3788b33_0 - mumps-include=5.7.3=h82cca05_9 @@ -298,9 +298,9 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 46492f13..8fa1de60 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -151,9 +151,9 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index 76d45c96..8f26b001 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -145,7 +145,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.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py310hc19bc0b_0 - mumps-seq=5.7.3=hbaa6519_9 @@ -288,9 +288,9 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 9528a5db..54189990 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -139,9 +139,9 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index feed3cc0..1eb56f11 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -161,7 +161,7 @@ dependencies: - mdit-py-plugins=0.4.2=pyhd8ed1ab_1 - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - - mistune=3.1.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py311hd18a35c_0 - mumps-include=5.7.3=h82cca05_9 @@ -302,9 +302,9 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index ee5bba97..8d278931 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -154,9 +154,9 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index 413ddb01..b63b7975 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -148,7 +148,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.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py311h3257749_0 - mumps-seq=5.7.3=hbaa6519_9 @@ -292,9 +292,9 @@ dependencies: - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 4008b04c..a4361864 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -142,9 +142,9 @@ dependencies: - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index d066f23f..67e17f8e 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -161,7 +161,7 @@ dependencies: - mdit-py-plugins=0.4.2=pyhd8ed1ab_1 - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - - mistune=3.1.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=ha957f24_16 - msgpack-python=1.1.0=py312h68727a3_0 - mumps-include=5.7.3=h82cca05_9 @@ -302,9 +302,9 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index b8e5193f..767fee86 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -154,9 +154,9 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index f8dd8af5..9a7ba5d5 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -148,7 +148,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.2=pyhd8ed1ab_0 + - mistune=3.1.3=pyh29332c3_0 - mkl=2024.2.2=h66d3029_15 - msgpack-python=1.1.0=py312hd5eb7cc_0 - mumps-seq=5.7.3=hbaa6519_9 @@ -292,9 +292,9 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index ab427099..73b31112 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -142,9 +142,9 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_1 - zstd=1.5.7=hbeecb71_1 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 474c397f..5e6ef53f 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -4327,29 +4327,29 @@ package: category: main optional: false - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: linux-64 dependencies: - python: '>=3.9' + python: '' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: win-64 dependencies: python: '>=3.9' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mkl @@ -8358,12 +8358,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoapps-utils @@ -8375,12 +8375,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoh5py @@ -8392,12 +8392,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: geoh5py @@ -8409,16 +8409,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: linux-64 dependencies: @@ -8430,16 +8430,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: win-64 dependencies: @@ -8451,12 +8451,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: octree-creation-app diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index cdcee6f4..ce8f35f4 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -4406,29 +4406,29 @@ package: category: main optional: false - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: linux-64 dependencies: python: '>=3.9' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: win-64 dependencies: python: '>=3.9' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mkl @@ -8472,12 +8472,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoapps-utils @@ -8489,12 +8489,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoh5py @@ -8506,12 +8506,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: geoh5py @@ -8523,16 +8523,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: linux-64 dependencies: @@ -8544,16 +8544,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: win-64 dependencies: @@ -8565,12 +8565,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: octree-creation-app diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index a8cdb301..569cdb30 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -4406,29 +4406,29 @@ package: category: main optional: false - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: linux-64 dependencies: python: '>=3.9' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mistune - version: 3.1.2 + version: 3.1.3 manager: conda platform: win-64 dependencies: python: '>=3.9' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/mistune-3.1.3-pyh29332c3_0.conda hash: - md5: 0982b0f06168fe3421d09f70596ca1f0 - sha256: 63d5308ac732b2f8130702c83ee40ce31c5451ebcb6e70075b771cc8f7df0156 + md5: 7ec6576e328bc128f4982cd646eeba85 + sha256: a67484d7dd11e815a81786580f18b6e4aa2392f292f29183631a6eccc8dc37b3 category: dev optional: true - name: mkl @@ -8472,12 +8472,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoapps-utils @@ -8489,12 +8489,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 hash: - sha256: 1ed273892ca0494a3b612d075a66dd4a1de2283a + sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 category: main optional: false - name: geoh5py @@ -8506,12 +8506,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: geoh5py @@ -8523,16 +8523,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa hash: - sha256: 34154ed8cdf27714b745bd5eb597e1fdd6798b23 + sha256: 513d08201f3401e61bc07514a318ad581e8e83aa source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@34154ed8cdf27714b745bd5eb597e1fdd6798b23 + url: git+https://github.com/MiraGeoscience/geoh5py.git@513d08201f3401e61bc07514a318ad581e8e83aa category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: linux-64 dependencies: @@ -8544,16 +8544,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev21+g79ba55ab3 + version: 0.21.2.3a2.dev10+g04f222146 manager: pip platform: win-64 dependencies: @@ -8565,12 +8565,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 hash: - sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + sha256: 04f222146c082ba646b851f510056b4b2bce1b85 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 + url: git+https://github.com/MiraGeoscience/simpeg.git@04f222146c082ba646b851f510056b4b2bce1b85 category: main optional: false - name: octree-creation-app From e5a0060fbfbb2da038bd607a5b585b693c3d3d8b Mon Sep 17 00:00:00 2001 From: benjamink Date: Wed, 19 Mar 2025 14:16:39 -0700 Subject: [PATCH 08/13] Remove save_sensitivity ui element for forward ui.jsons and solver_type for potential fields. Remove n_cpu handling in options class and fix configure_dask --- .../uijson/direct_current_2d_forward.ui.json | 7 +--- .../uijson/direct_current_3d_forward.ui.json | 7 +--- .../direct_current_batch2d_forward.ui.json | 7 +--- .../uijson/fem_forward.ui.json | 7 +--- .../uijson/gravity_forward.ui.json | 18 ++-------- .../uijson/gravity_inversion.ui.json | 11 +----- .../induced_polarization_2d_forward.ui.json | 7 +--- .../induced_polarization_3d_forward.ui.json | 7 +--- .../induced_polarization_3d_inversion.ui.json | 17 --------- ...duced_polarization_batch2d_forward.ui.json | 24 +------------ ...ced_polarization_batch2d_inversion.ui.json | 17 --------- .../joint_cross_gradient_inversion.ui.json | 17 --------- .../uijson/joint_surveys_inversion.ui.json | 17 --------- .../uijson/magnetic_scalar_forward.ui.json | 35 ++----------------- .../uijson/magnetic_scalar_inversion.ui.json | 28 +-------------- .../uijson/magnetic_vector_forward.ui.json | 35 ++----------------- .../uijson/magnetic_vector_inversion.ui.json | 28 +-------------- .../uijson/magnetotellurics_forward.ui.json | 24 +------------ .../uijson/magnetotellurics_inversion.ui.json | 17 --------- .../uijson/tdem_forward.ui.json | 24 +------------ .../uijson/tdem_inversion.ui.json | 17 --------- .../uijson/tipper_forward.ui.json | 24 +------------ .../uijson/tipper_inversion.ui.json | 17 --------- simpeg_drivers/driver.py | 9 ++--- simpeg_drivers/params.py | 20 +---------- .../potential_fields/gravity/uijson.py | 7 ++-- 26 files changed, 26 insertions(+), 422 deletions(-) diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index 5f49bd0a..9981e8ce 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -176,12 +176,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, + "save_sensitivities": false, "parallelized": { "group": "Compute", "label": "Use parallelization", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index e4d425e9..b0bd6375 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -105,12 +105,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, + "save_sensitivities": false, "parallelized": { "group": "Compute", "label": "Use parallelization", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json index 4eaeaccf..a5c3df7d 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json @@ -159,12 +159,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, + "save_sensitivities": false, "parallelized": { "group": "Compute", "label": "Use parallelization", diff --git a/simpeg_drivers-assets/uijson/fem_forward.ui.json b/simpeg_drivers-assets/uijson/fem_forward.ui.json index 3fd697bb..cc227554 100644 --- a/simpeg_drivers-assets/uijson/fem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fem_forward.ui.json @@ -118,12 +118,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, + "save_sensitivities": false, "parallelized": { "group": "Compute", "label": "Use parallelization", diff --git a/simpeg_drivers-assets/uijson/gravity_forward.ui.json b/simpeg_drivers-assets/uijson/gravity_forward.ui.json index 587219b3..4f7932a0 100644 --- a/simpeg_drivers-assets/uijson/gravity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_forward.ui.json @@ -161,12 +161,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, + "save_sensitivities": false, "parallelized": { "group": "Compute", "label": "Use parallelization", @@ -184,16 +179,7 @@ "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" - }, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", diff --git a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json index 598e4568..89e09dfd 100644 --- a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json @@ -762,16 +762,7 @@ "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" - }, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index 62ffca02..b195729e 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -187,12 +187,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, + "save_sensitivities": false, "parallelized": { "group": "Compute", "label": "Use parallelization", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json index 32ac2fd7..c4e9e57a 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -121,12 +121,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, + "save_sensitivities": false, "parallelized": { "group": "Compute", "label": "Use parallelization", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index cd3c07e6..70b9a5f5 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -492,23 +492,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json index e42f30bc..591ef5aa 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json @@ -170,29 +170,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, + "save_sensitivities": false, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json index 5684a72e..8bf6a18a 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -499,23 +499,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index a00b4cb6..19891d0a 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -405,23 +405,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 89c8dd5f..d0f7da84 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -482,23 +482,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json index baddba98..026296c9 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json @@ -191,39 +191,8 @@ "property": "", "value": 0.0001 }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "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" - }, + "save_sensitivities": false, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index 0c8a5baf..912817a7 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -777,33 +777,7 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "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" - }, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json index 0289c35a..1af77932 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json @@ -223,39 +223,8 @@ "property": "", "value": 0.0 }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "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" - }, + "save_sensitivities": false, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index 80eb99de..0284d42c 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -841,33 +841,7 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "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" - }, + "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", "label": "Number of tiles", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index c7c5ab45..b029cdbf 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -159,29 +159,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, + "save_sensitivities": false, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index 771cc057..964330f0 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -698,23 +698,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index bf57f19d..e83abe84 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -137,29 +137,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, + "save_sensitivities": false, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index ceed6a75..e4cc8427 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -550,23 +550,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index 4dfdccf8..6cb1ab7e 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -135,29 +135,7 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": { - "group": "Update sensitivity weights directive", - "label": "Save sensitivities", - "tooltip": "Save the summed square row sensitivities to geoh5.", - "value": false - }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, + "save_sensitivities": false, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index 8dff8e04..2952aa3d 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -578,23 +578,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index bbe107fb..60d3891f 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -500,13 +500,8 @@ def configure_dask(self): if self.client: dconf.set(scheduler=self.client) else: - dconf.set(scheduler="threads") - n_cpu = self.params.n_cpu - if n_cpu is None: - n_cpu = int(multiprocessing.cpu_count()) - - if self.params.parallelized: - dconf.set(scheduler="threads", pool=ThreadPool(self.params.n_cpu)) + n_cpu = int(multiprocessing.cpu_count()) + dconf.set(scheduler="threads", pool=ThreadPool(n_cpu)) @classmethod def start(cls, filepath: str | Path, driver_class=None): diff --git a/simpeg_drivers/params.py b/simpeg_drivers/params.py index 67cc2c33..2ed68076 100644 --- a/simpeg_drivers/params.py +++ b/simpeg_drivers/params.py @@ -11,7 +11,6 @@ from __future__ import annotations -import multiprocessing from enum import Enum from logging import getLogger from pathlib import Path @@ -84,12 +83,11 @@ class CoreOptions(BaseData): data in the forward operation. :param active_cells: Active cell data as either a topography surface/data or a 3D model. :param tile_spatial: Number of tiles to split the data. - :param parallelized: Parallelize the inversion/forward operation. - :param n_cpu: Number of CPUs to use if parallelized. If None, all cpu will be used. :param max_chunk_size: Maximum chunk size used for parallel operations. :param save_sensitivities: Save sensitivities to file. :param out_group: Output group to save results. :param generate_sweep: Generate sweep file instead of running the app. + :param distributed_workers: Distributed workers. """ # TODO: Refactor to allow frozen True. Currently params.data_object is @@ -114,22 +112,13 @@ class CoreOptions(BaseData): starting_model: float | FloatData active_cells: ActiveCellsOptions tile_spatial: int = 1 - parallelized: bool = True solver_type: SolverType = SolverType.Pardiso save_sensitivities: bool = False - n_cpu: int | None = None max_chunk_size: int = 128 out_group: SimPEGGroup | UIJsonGroup | None = None generate_sweep: bool = False distributed_workers: str | None = None - @field_validator("n_cpu", mode="before") - @classmethod - def maximize_cpu_if_none(cls, value): - if value is None: - value = int(multiprocessing.cpu_count()) - return value - @field_validator("mesh", mode="before") @classmethod def mesh_cannot_be_rotated(cls, value: Octree): @@ -300,7 +289,6 @@ class BaseInversionOptions(CoreOptions): :param sens_wts_threshold: Sensitivity weights threshold. :param every_iteration_bool: Every iteration bool. - :param parallelized: Parallelized. :param solver_type: Direct solver provider. Either Mumps or Pardiso. :param tile_spatial: Tile the data spatially. :param store_sensitivities: Store sensitivities. @@ -311,14 +299,8 @@ class BaseInversionOptions(CoreOptions): :param generate_sweep: Generate sweep. - :param output_tile_files: Output tile files. - :param inversion_style: Inversion style. - :param max_ram: Maximum RAM. :param coolEps_q: Cool eps q. :param coolEpsFact: Cool eps fact. :param beta_search: Beta search. - :param ga_group: GA group. - :param distributed_workers: Distributed workers. - :param no_data_value: No data value. """ model_config = ConfigDict( diff --git a/simpeg_drivers/potential_fields/gravity/uijson.py b/simpeg_drivers/potential_fields/gravity/uijson.py index 93561b0b..fb5ebece 100644 --- a/simpeg_drivers/potential_fields/gravity/uijson.py +++ b/simpeg_drivers/potential_fields/gravity/uijson.py @@ -52,7 +52,6 @@ class GravityForwardUIJson(SimPEGDriversUIJson): active_model: DataForm save_sensitivities: BoolForm parallelized: BoolForm - n_cpu: IntegerForm tile_spatial: DataForm max_chunk_size: IntegerForm out_group: GroupForm @@ -64,6 +63,8 @@ class GravityForwardUIJson(SimPEGDriversUIJson): gps_receivers_offset: Deprecated | None = None output_tile_files: Deprecated | None = None chunk_by_rows: Deprecated | None = None + parallelized: Deprecated | None = None + n_cpu: Deprecated | None = None ga_group: Deprecated | None = None @@ -139,8 +140,6 @@ class GravityInversionUIJson(SimPEGDriversUIJson): sens_wts_threshold: FloatForm every_iteration_bool: BoolForm save_sensitivities: BoolForm - parallelized: BoolForm - n_cpu: IntegerForm tile_spatial: DataForm store_sensitivities: ChoiceForm max_chunk_size: IntegerForm @@ -152,4 +151,6 @@ class GravityInversionUIJson(SimPEGDriversUIJson): inversion_style: Deprecated | None = None max_ram: Deprecated | None = None chunk_by_rows: Deprecated | None = None + parallelized: Deprecated | None = None + n_cpu: Deprecated | None = None ga_group: Deprecated | None = None From 3251269bb3d9de41c54df2dae8ae9f73cac15fb7 Mon Sep 17 00:00:00 2001 From: benjamink Date: Wed, 19 Mar 2025 14:20:20 -0700 Subject: [PATCH 09/13] remove parallelized and n_cpu from ui.jsons --- .../uijson/direct_current_2d_forward.ui.json | 17 ----------------- .../uijson/direct_current_2d_inversion.ui.json | 17 ----------------- .../uijson/direct_current_3d_forward.ui.json | 18 ------------------ .../uijson/direct_current_3d_inversion.ui.json | 17 ----------------- .../direct_current_batch2d_forward.ui.json | 17 ----------------- .../direct_current_batch2d_inversion.ui.json | 17 ----------------- .../uijson/fem_forward.ui.json | 17 ----------------- .../uijson/fem_inversion.ui.json | 17 ----------------- .../uijson/gravity_forward.ui.json | 17 ----------------- .../uijson/gravity_inversion.ui.json | 17 ----------------- .../induced_polarization_2d_forward.ui.json | 17 ----------------- .../induced_polarization_2d_inversion.ui.json | 17 ----------------- .../induced_polarization_3d_forward.ui.json | 17 ----------------- 13 files changed, 222 deletions(-) diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index 9981e8ce..9bff5acf 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -177,23 +177,6 @@ "value": "" }, "save_sensitivities": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json index 00d930de..e4fc100e 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -507,23 +507,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index b0bd6375..1554d1be 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -105,24 +105,6 @@ "parent": "mesh", "value": "" }, - "save_sensitivities": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json index 6b9b1fc8..09df7c8c 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -477,23 +477,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json index a5c3df7d..55826326 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json @@ -160,23 +160,6 @@ "value": "" }, "save_sensitivities": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json index 5ad57ab3..3d868a0b 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json @@ -488,23 +488,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/fem_forward.ui.json b/simpeg_drivers-assets/uijson/fem_forward.ui.json index cc227554..dd5a14ec 100644 --- a/simpeg_drivers-assets/uijson/fem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fem_forward.ui.json @@ -119,23 +119,6 @@ "value": "" }, "save_sensitivities": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/fem_inversion.ui.json b/simpeg_drivers-assets/uijson/fem_inversion.ui.json index c11c6462..0ed97358 100644 --- a/simpeg_drivers-assets/uijson/fem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fem_inversion.ui.json @@ -513,23 +513,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/gravity_forward.ui.json b/simpeg_drivers-assets/uijson/gravity_forward.ui.json index 4f7932a0..e5799bd3 100644 --- a/simpeg_drivers-assets/uijson/gravity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_forward.ui.json @@ -162,23 +162,6 @@ "value": "" }, "save_sensitivities": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", diff --git a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json index 89e09dfd..5818e659 100644 --- a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json @@ -745,23 +745,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index b195729e..593a872b 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -188,23 +188,6 @@ "value": "" }, "save_sensitivities": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index a994a375..a0419fc8 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -515,23 +515,6 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json index c4e9e57a..d0ee39b1 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -122,23 +122,6 @@ "value": "" }, "save_sensitivities": false, - "parallelized": { - "group": "Compute", - "label": "Use parallelization", - "value": true, - "visible": false - }, - "n_cpu": { - "min": 1, - "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", - "optional": true, - "enabled": false, - "label": "Number of CPUs", - "value": 1, - "visible": false - }, "solver_type": { "choiceList": [ "Pardiso", From 1b2d6f81e49286afbb95e88889cf328c902d28a8 Mon Sep 17 00:00:00 2001 From: benjamink Date: Thu, 20 Mar 2025 09:29:48 -0700 Subject: [PATCH 10/13] restore n_cpu as an active parameter --- .../uijson/direct_current_2d_forward.ui.json | 11 +++++++++++ .../uijson/direct_current_2d_inversion.ui.json | 11 +++++++++++ .../uijson/direct_current_3d_forward.ui.json | 11 +++++++++++ .../uijson/direct_current_3d_inversion.ui.json | 11 +++++++++++ .../uijson/direct_current_batch2d_forward.ui.json | 11 +++++++++++ .../uijson/direct_current_batch2d_inversion.ui.json | 11 +++++++++++ simpeg_drivers-assets/uijson/fem_forward.ui.json | 11 +++++++++++ simpeg_drivers-assets/uijson/fem_inversion.ui.json | 11 +++++++++++ simpeg_drivers-assets/uijson/gravity_forward.ui.json | 11 +++++++++++ .../uijson/gravity_inversion.ui.json | 11 +++++++++++ .../uijson/induced_polarization_2d_forward.ui.json | 11 +++++++++++ .../uijson/induced_polarization_2d_inversion.ui.json | 11 +++++++++++ .../uijson/induced_polarization_3d_forward.ui.json | 11 +++++++++++ .../uijson/induced_polarization_3d_inversion.ui.json | 11 +++++++++++ .../induced_polarization_batch2d_forward.ui.json | 11 +++++++++++ .../induced_polarization_batch2d_inversion.ui.json | 11 +++++++++++ .../uijson/joint_cross_gradient_inversion.ui.json | 11 +++++++++++ .../uijson/joint_surveys_inversion.ui.json | 11 +++++++++++ .../uijson/magnetic_scalar_forward.ui.json | 11 +++++++++++ .../uijson/magnetic_scalar_inversion.ui.json | 11 +++++++++++ .../uijson/magnetic_vector_forward.ui.json | 11 +++++++++++ .../uijson/magnetic_vector_inversion.ui.json | 11 +++++++++++ .../uijson/magnetotellurics_forward.ui.json | 11 +++++++++++ .../uijson/magnetotellurics_inversion.ui.json | 11 +++++++++++ simpeg_drivers-assets/uijson/tdem_forward.ui.json | 11 +++++++++++ simpeg_drivers-assets/uijson/tdem_inversion.ui.json | 11 +++++++++++ simpeg_drivers-assets/uijson/tipper_forward.ui.json | 11 +++++++++++ simpeg_drivers-assets/uijson/tipper_inversion.ui.json | 11 +++++++++++ simpeg_drivers/driver.py | 5 ++++- simpeg_drivers/params.py | 1 + simpeg_drivers/potential_fields/gravity/uijson.py | 2 +- 31 files changed, 314 insertions(+), 2 deletions(-) diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index 9bff5acf..c4373412 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -177,6 +177,17 @@ "value": "" }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json index e4fc100e..5742ca64 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -507,6 +507,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index 1554d1be..52dfc707 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -105,6 +105,17 @@ "parent": "mesh", "value": "" }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json index 09df7c8c..bb9b4251 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -477,6 +477,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json index 55826326..7d32c268 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json @@ -160,6 +160,17 @@ "value": "" }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json index 3d868a0b..f10e0b03 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json @@ -488,6 +488,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/fem_forward.ui.json b/simpeg_drivers-assets/uijson/fem_forward.ui.json index dd5a14ec..a6b75ed8 100644 --- a/simpeg_drivers-assets/uijson/fem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fem_forward.ui.json @@ -119,6 +119,17 @@ "value": "" }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/fem_inversion.ui.json b/simpeg_drivers-assets/uijson/fem_inversion.ui.json index 0ed97358..4259f4ec 100644 --- a/simpeg_drivers-assets/uijson/fem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fem_inversion.ui.json @@ -513,6 +513,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/gravity_forward.ui.json b/simpeg_drivers-assets/uijson/gravity_forward.ui.json index e5799bd3..f94b5bf6 100644 --- a/simpeg_drivers-assets/uijson/gravity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_forward.ui.json @@ -162,6 +162,17 @@ "value": "" }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", diff --git a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json index 5818e659..04f85022 100644 --- a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json @@ -745,6 +745,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index 593a872b..6d15e35a 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -188,6 +188,17 @@ "value": "" }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index a0419fc8..993fb29a 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -515,6 +515,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json index d0ee39b1..fa8ad05f 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -122,6 +122,17 @@ "value": "" }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index 70b9a5f5..3c6423ec 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -492,6 +492,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json index 591ef5aa..70225c72 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json @@ -171,6 +171,17 @@ "value": "" }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json index 8bf6a18a..ea39cd4f 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -499,6 +499,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index 19891d0a..bbc05ccc 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -405,6 +405,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index d0f7da84..d58519bb 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -482,6 +482,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json index 026296c9..d1b2d900 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json @@ -192,6 +192,17 @@ "value": 0.0001 }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index 912817a7..ee6975a8 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -777,6 +777,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json index 1af77932..0a783cfd 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json @@ -224,6 +224,17 @@ "value": 0.0 }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index 0284d42c..e8741b84 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -841,6 +841,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": "Pardiso", "tile_spatial": { "group": "Compute", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index b029cdbf..b935135a 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -160,6 +160,17 @@ "value": "" }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index 964330f0..0261c50d 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -698,6 +698,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index e83abe84..0f834d29 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -138,6 +138,17 @@ "value": "" }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index e4cc8427..26dfcb44 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -550,6 +550,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index 6cb1ab7e..1080436b 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -136,6 +136,17 @@ "value": "" }, "save_sensitivities": false, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index 2952aa3d..1df5d02a 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -578,6 +578,17 @@ "tooltip": "Save the summed square row sensitivities to geoh5.", "value": false }, + "n_cpu": { + "min": 1, + "group": "Compute", + "dependency": "parallelized", + "dependencyType": "enabled", + "optional": true, + "enabled": false, + "label": "Number of CPUs", + "value": 1, + "visible": true + }, "solver_type": { "choiceList": [ "Pardiso", diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 60d3891f..aff86b94 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -500,7 +500,10 @@ def configure_dask(self): if self.client: dconf.set(scheduler=self.client) else: - n_cpu = int(multiprocessing.cpu_count()) + n_cpu = self.params.n_cpu + if n_cpu is None: + n_cpu = int(multiprocessing.cpu_count()) + dconf.set(scheduler="threads", pool=ThreadPool(n_cpu)) @classmethod diff --git a/simpeg_drivers/params.py b/simpeg_drivers/params.py index 2ed68076..2ce56ee3 100644 --- a/simpeg_drivers/params.py +++ b/simpeg_drivers/params.py @@ -112,6 +112,7 @@ class CoreOptions(BaseData): starting_model: float | FloatData active_cells: ActiveCellsOptions tile_spatial: int = 1 + n_cpu: int = 1 solver_type: SolverType = SolverType.Pardiso save_sensitivities: bool = False max_chunk_size: int = 128 diff --git a/simpeg_drivers/potential_fields/gravity/uijson.py b/simpeg_drivers/potential_fields/gravity/uijson.py index fb5ebece..9957f419 100644 --- a/simpeg_drivers/potential_fields/gravity/uijson.py +++ b/simpeg_drivers/potential_fields/gravity/uijson.py @@ -140,6 +140,7 @@ class GravityInversionUIJson(SimPEGDriversUIJson): sens_wts_threshold: FloatForm every_iteration_bool: BoolForm save_sensitivities: BoolForm + n_cpu: IntegerForm tile_spatial: DataForm store_sensitivities: ChoiceForm max_chunk_size: IntegerForm @@ -152,5 +153,4 @@ class GravityInversionUIJson(SimPEGDriversUIJson): max_ram: Deprecated | None = None chunk_by_rows: Deprecated | None = None parallelized: Deprecated | None = None - n_cpu: Deprecated | None = None ga_group: Deprecated | None = None From 42dd91de160bfe11b48f2d739bf96eada05fac4e Mon Sep 17 00:00:00 2001 From: benjamink Date: Thu, 20 Mar 2025 11:24:12 -0700 Subject: [PATCH 11/13] remove parallelized dependency --- simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json | 2 -- .../uijson/direct_current_2d_inversion.ui.json | 2 -- simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json | 2 -- .../uijson/direct_current_3d_inversion.ui.json | 2 -- .../uijson/direct_current_batch2d_forward.ui.json | 2 -- .../uijson/direct_current_batch2d_inversion.ui.json | 2 -- simpeg_drivers-assets/uijson/fem_forward.ui.json | 2 -- simpeg_drivers-assets/uijson/fem_inversion.ui.json | 2 -- simpeg_drivers-assets/uijson/gravity_forward.ui.json | 2 -- simpeg_drivers-assets/uijson/gravity_inversion.ui.json | 2 -- .../uijson/induced_polarization_2d_forward.ui.json | 2 -- .../uijson/induced_polarization_2d_inversion.ui.json | 2 -- .../uijson/induced_polarization_3d_forward.ui.json | 2 -- .../uijson/induced_polarization_3d_inversion.ui.json | 2 -- .../uijson/induced_polarization_batch2d_forward.ui.json | 2 -- .../uijson/induced_polarization_batch2d_inversion.ui.json | 2 -- .../uijson/joint_cross_gradient_inversion.ui.json | 2 -- simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json | 2 -- simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json | 2 -- simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json | 2 -- simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json | 2 -- simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json | 2 -- simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json | 2 -- simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json | 2 -- simpeg_drivers-assets/uijson/tdem_forward.ui.json | 2 -- simpeg_drivers-assets/uijson/tdem_inversion.ui.json | 2 -- simpeg_drivers-assets/uijson/tipper_forward.ui.json | 2 -- simpeg_drivers-assets/uijson/tipper_inversion.ui.json | 2 -- 28 files changed, 56 deletions(-) diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json index c4373412..0b5fadeb 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_forward.ui.json @@ -180,8 +180,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json index 5742ca64..6a1f5e6b 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -510,8 +510,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index 52dfc707..c81f46aa 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -108,8 +108,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json index bb9b4251..6498ea8f 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -480,8 +480,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json index 7d32c268..ef771680 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_forward.ui.json @@ -163,8 +163,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json index f10e0b03..a0d7a9f2 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json @@ -491,8 +491,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/fem_forward.ui.json b/simpeg_drivers-assets/uijson/fem_forward.ui.json index a6b75ed8..a956d91a 100644 --- a/simpeg_drivers-assets/uijson/fem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fem_forward.ui.json @@ -122,8 +122,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/fem_inversion.ui.json b/simpeg_drivers-assets/uijson/fem_inversion.ui.json index 4259f4ec..f85c9627 100644 --- a/simpeg_drivers-assets/uijson/fem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fem_inversion.ui.json @@ -516,8 +516,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/gravity_forward.ui.json b/simpeg_drivers-assets/uijson/gravity_forward.ui.json index f94b5bf6..531d38f7 100644 --- a/simpeg_drivers-assets/uijson/gravity_forward.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_forward.ui.json @@ -165,8 +165,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json index 04f85022..9f61329f 100644 --- a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json @@ -748,8 +748,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index 6d15e35a..a9341ec1 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -191,8 +191,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index 993fb29a..f7cdec99 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -518,8 +518,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json index fa8ad05f..6f2f9529 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_forward.ui.json @@ -125,8 +125,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index 3c6423ec..d32f6e30 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -495,8 +495,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json index 70225c72..0cc50ef4 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_forward.ui.json @@ -174,8 +174,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json index ea39cd4f..5b74c35c 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -502,8 +502,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index bbc05ccc..03185f01 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -408,8 +408,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index d58519bb..5b8b832c 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -485,8 +485,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json index d1b2d900..d2184368 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_forward.ui.json @@ -195,8 +195,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index ee6975a8..3e2630f6 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -780,8 +780,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json index 0a783cfd..c39c64a9 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_forward.ui.json @@ -227,8 +227,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index e8741b84..05c44729 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -844,8 +844,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json index b935135a..d3c969d1 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_forward.ui.json @@ -163,8 +163,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index 0261c50d..220c8152 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -701,8 +701,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/tdem_forward.ui.json b/simpeg_drivers-assets/uijson/tdem_forward.ui.json index 0f834d29..13a07113 100644 --- a/simpeg_drivers-assets/uijson/tdem_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_forward.ui.json @@ -141,8 +141,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index 26dfcb44..67a75b24 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -553,8 +553,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/tipper_forward.ui.json b/simpeg_drivers-assets/uijson/tipper_forward.ui.json index 1080436b..eed93181 100644 --- a/simpeg_drivers-assets/uijson/tipper_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_forward.ui.json @@ -139,8 +139,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index 1df5d02a..335f7528 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -581,8 +581,6 @@ "n_cpu": { "min": 1, "group": "Compute", - "dependency": "parallelized", - "dependencyType": "enabled", "optional": true, "enabled": false, "label": "Number of CPUs", From 84156768459468467a432b12d369aff4af23c981 Mon Sep 17 00:00:00 2001 From: benjamink Date: Thu, 20 Mar 2025 15:16:38 -0700 Subject: [PATCH 12/13] use .create to supress warnings on Workspace instantiation --- tests/data_test.py | 2 +- tests/meshes_test.py | 4 ++-- tests/uijson_test.py | 8 ++++---- tests/utils_meshes_test.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/data_test.py b/tests/data_test.py index ed439b44..084d44b2 100644 --- a/tests/data_test.py +++ b/tests/data_test.py @@ -70,7 +70,7 @@ def test_save_data(tmp_path: Path): def test_survey_data(tmp_path: Path): X, Y, Z = np.meshgrid(np.linspace(0, 100, 3), np.linspace(0, 100, 3), 0) verts = np.column_stack([X.ravel(), Y.ravel(), Z.ravel()]) - with Workspace(tmp_path / "test_workspace.geoh5") as workspace: + with Workspace.create(tmp_path / "test_workspace.geoh5") as workspace: test_data_object = Points.create( workspace, vertices=verts, name="test_data_object" ) diff --git a/tests/meshes_test.py b/tests/meshes_test.py index db1d3bf6..686c03d8 100644 --- a/tests/meshes_test.py +++ b/tests/meshes_test.py @@ -69,7 +69,7 @@ def test_initialize(tmp_path: Path): def test_to_treemesh(tmp_path): - with Workspace(tmp_path / "test_octree.geoh5") as workspace: + with Workspace.create(tmp_path / "test_octree.geoh5") as workspace: # Positive cells sizes and Z ordering cells = np.array( [ @@ -153,7 +153,7 @@ def test_to_treemesh(tmp_path): def test_ensure_cell_convention(tmp_path): - with Workspace(tmp_path / "test_octree.geoh5") as workspace: + with Workspace.create(tmp_path / "test_octree.geoh5") as workspace: octree_cells = np.array( [ (0, 0, 0, 1), diff --git a/tests/uijson_test.py b/tests/uijson_test.py index c879be16..cb6133b2 100644 --- a/tests/uijson_test.py +++ b/tests/uijson_test.py @@ -29,7 +29,7 @@ def test_version_warning(tmp_path, caplog): - workspace = Workspace(tmp_path / "test.geoh5") + workspace = Workspace.create(tmp_path / "test.geoh5") with caplog.at_level(logging.WARNING): _ = SimPEGDriversUIJson( @@ -72,7 +72,7 @@ class MyUIJson(SimPEGDriversUIJson): def test_deprecations(tmp_path, caplog): - workspace = Workspace(tmp_path / "test.geoh5") + workspace = Workspace.create(tmp_path / "test.geoh5") class MyUIJson(SimPEGDriversUIJson): my_param: Deprecated @@ -94,7 +94,7 @@ class MyUIJson(SimPEGDriversUIJson): def test_pydantic_deprecation(tmp_path): - workspace = Workspace(tmp_path / "test.geoh5") + workspace = Workspace.create(tmp_path / "test.geoh5") class MyUIJson(SimPEGDriversUIJson): my_param: str = Field(deprecated="Use my_param2 instead.", exclude=True) @@ -115,7 +115,7 @@ class MyUIJson(SimPEGDriversUIJson): def test_alias(tmp_path): - workspace = Workspace(tmp_path / "test.geoh5") + workspace = Workspace.create(tmp_path / "test.geoh5") class MyUIJson(SimPEGDriversUIJson): my_param: str = Field(validation_alias=AliasChoices("my_param", "myParam")) diff --git a/tests/utils_meshes_test.py b/tests/utils_meshes_test.py index 226fafbd..cd308164 100644 --- a/tests/utils_meshes_test.py +++ b/tests/utils_meshes_test.py @@ -83,7 +83,7 @@ def test_auto_pad(): def test_auto_mesh_parameters(tmp_path): - with Workspace(tmp_path / "test.geoh5") as ws: + with Workspace.create(tmp_path / "test.geoh5") as ws: locs = create_test_survey() locs, topo = generate_random_topography(locs, drape_survey=0) From 74a47c5c9758eee4d016930e6642fb50161711f8 Mon Sep 17 00:00:00 2001 From: benjamink Date: Fri, 21 Mar 2025 09:47:12 -0700 Subject: [PATCH 13/13] n_cpu should be none --- simpeg_drivers/params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpeg_drivers/params.py b/simpeg_drivers/params.py index 2ce56ee3..2060c9aa 100644 --- a/simpeg_drivers/params.py +++ b/simpeg_drivers/params.py @@ -112,7 +112,7 @@ class CoreOptions(BaseData): starting_model: float | FloatData active_cells: ActiveCellsOptions tile_spatial: int = 1 - n_cpu: int = 1 + n_cpu: int | None = None solver_type: SolverType = SolverType.Pardiso save_sensitivities: bool = False max_chunk_size: int = 128