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 bfcfef4f..7cb6ee37 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -81,7 +81,7 @@ dependencies: - httpx=0.28.1=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he02047a_0 - - idna=3.11=pyhd8ed1ab_0 + - idna=3.13=pyhcf101f3_0 - imagesize=2.0.0=pyhd8ed1ab_0 - importlib-metadata=8.8.0=pyhcf101f3_0 - importlib_resources=7.1.0=pyhd8ed1ab_0 @@ -174,7 +174,7 @@ dependencies: - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - mistune=3.2.0=pyhcf101f3_0 - - mkl=2025.3.1=h0e700b2_10 + - mkl=2025.3.1=h0e700b2_11 - msgpack-python=1.1.2=py312hd9148b4_1 - mumps-include=5.8.2=h5a610fb_2 - mumps-seq=5.8.2=hc1b3267_2 @@ -191,6 +191,7 @@ dependencies: - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312hf79963d_1 - numpy=2.4.3=py312h33ff503_0 + - onemkl-license=2025.3.1=hf2ce2f3_11 - openjpeg=2.5.4=h55fea9a_0 - openpyxl=3.1.5=py312h7f6eeab_3 - openssl=3.6.2=h35e630c_0 @@ -302,10 +303,10 @@ dependencies: - zlib-ng=2.3.3=hceb46e0_1 - zstd=1.5.7=hb78ec9c_6 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 011ca9d1..efc53f75 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -104,7 +104,7 @@ dependencies: - markupsafe=3.0.3=py312h8a5da7c_1 - matplotlib-base=3.10.8=py312he3d6523_0 - metis=5.1.0=hd0bcaf9_1007 - - mkl=2025.3.1=h0e700b2_10 + - mkl=2025.3.1=h0e700b2_11 - msgpack-python=1.1.2=py312hd9148b4_1 - mumps-include=5.8.2=h5a610fb_2 - mumps-seq=5.8.2=hc1b3267_2 @@ -112,6 +112,7 @@ dependencies: - ncurses=6.5=h2d0b736_3 - numcodecs=0.15.1=py312hf79963d_1 - numpy=2.4.3=py312h33ff503_0 + - onemkl-license=2025.3.1=hf2ce2f3_11 - openjpeg=2.5.4=h55fea9a_0 - openpyxl=3.1.5=py312h7f6eeab_3 - openssl=3.6.2=h35e630c_0 @@ -170,10 +171,10 @@ dependencies: - zlib-ng=2.3.3=hceb46e0_1 - zstd=1.5.7=hb78ec9c_6 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 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 f1845706..ced9e735 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -79,7 +79,7 @@ dependencies: - httpcore=1.0.9=pyh29332c3_0 - httpx=0.28.1=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - - idna=3.11=pyhd8ed1ab_0 + - idna=3.13=pyhcf101f3_0 - imagesize=2.0.0=pyhd8ed1ab_0 - importlib-metadata=8.8.0=pyhcf101f3_0 - importlib_resources=7.1.0=pyhd8ed1ab_0 @@ -158,7 +158,7 @@ dependencies: - mdit-py-plugins=0.5.0=pyhd8ed1ab_0 - mdurl=0.1.2=pyhd8ed1ab_1 - mistune=3.2.0=pyhcf101f3_0 - - mkl=2025.3.1=hac47afa_11 + - mkl=2025.3.1=hac47afa_12 - msgpack-python=1.1.2=py312hf90b1b7_1 - mumps-seq=5.8.2=h607cc0b_2 - munkres=1.1.4=pyhd8ed1ab_1 @@ -173,6 +173,7 @@ dependencies: - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312hc128f0a_1 - numpy=2.4.3=py312ha3f287d_0 + - onemkl-license=2025.3.1=h57928b3_12 - openjpeg=2.5.4=h0e57b4f_0 - openpyxl=3.1.5=py312h83acffa_3 - openssl=3.6.2=hf411b9b_0 @@ -287,10 +288,10 @@ dependencies: - zlib-ng=2.3.3=h0261ad2_1 - zstd=1.5.7=h534d264_6 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 6ad32d71..1ef3bafa 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -90,12 +90,13 @@ dependencies: - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py312h05f76fc_1 - matplotlib-base=3.10.8=py312h0ebf65c_0 - - mkl=2025.3.1=hac47afa_11 + - mkl=2025.3.1=hac47afa_12 - msgpack-python=1.1.2=py312hf90b1b7_1 - mumps-seq=5.8.2=h607cc0b_2 - munkres=1.1.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312hc128f0a_1 - numpy=2.4.3=py312ha3f287d_0 + - onemkl-license=2025.3.1=h57928b3_12 - openjpeg=2.5.4=h0e57b4f_0 - openpyxl=3.1.5=py312h83acffa_3 - openssl=3.6.2=hf411b9b_0 @@ -157,10 +158,10 @@ dependencies: - zlib-ng=2.3.3=h0261ad2_1 - zstd=1.5.7=h534d264_6 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64-dev.conda.lock.yml b/environments/py-3.13-linux-64-dev.conda.lock.yml index 97f41a6e..0e2f077b 100644 --- a/environments/py-3.13-linux-64-dev.conda.lock.yml +++ b/environments/py-3.13-linux-64-dev.conda.lock.yml @@ -81,7 +81,7 @@ dependencies: - httpx=0.28.1=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - icu=75.1=he02047a_0 - - idna=3.11=pyhd8ed1ab_0 + - idna=3.13=pyhcf101f3_0 - imagesize=2.0.0=pyhd8ed1ab_0 - importlib-metadata=8.8.0=pyhcf101f3_0 - importlib_resources=7.1.0=pyhd8ed1ab_0 @@ -173,7 +173,7 @@ dependencies: - mdurl=0.1.2=pyhd8ed1ab_1 - metis=5.1.0=hd0bcaf9_1007 - mistune=3.2.0=pyhcf101f3_0 - - mkl=2025.3.1=h0e700b2_10 + - mkl=2025.3.1=h0e700b2_11 - msgpack-python=1.1.2=py313h7037e92_1 - mumps-include=5.8.2=h5a610fb_2 - mumps-seq=5.8.2=hc1b3267_2 @@ -190,6 +190,7 @@ dependencies: - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py313h08cd8bf_1 - numpy=2.4.3=py313hf6604e3_0 + - onemkl-license=2025.3.1=hf2ce2f3_11 - openjpeg=2.5.4=h55fea9a_0 - openpyxl=3.1.5=py313ha4be090_3 - openssl=3.6.2=h35e630c_0 @@ -299,10 +300,10 @@ dependencies: - zlib-ng=2.3.3=hceb46e0_1 - zstd=1.5.7=hb78ec9c_6 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-linux-64.conda.lock.yml b/environments/py-3.13-linux-64.conda.lock.yml index 10fe50cf..b015acab 100644 --- a/environments/py-3.13-linux-64.conda.lock.yml +++ b/environments/py-3.13-linux-64.conda.lock.yml @@ -103,7 +103,7 @@ dependencies: - markupsafe=3.0.3=py313h3dea7bd_1 - matplotlib-base=3.10.8=py313h683a580_0 - metis=5.1.0=hd0bcaf9_1007 - - mkl=2025.3.1=h0e700b2_10 + - mkl=2025.3.1=h0e700b2_11 - msgpack-python=1.1.2=py313h7037e92_1 - mumps-include=5.8.2=h5a610fb_2 - mumps-seq=5.8.2=hc1b3267_2 @@ -111,6 +111,7 @@ dependencies: - ncurses=6.5=h2d0b736_3 - numcodecs=0.15.1=py313h08cd8bf_1 - numpy=2.4.3=py313hf6604e3_0 + - onemkl-license=2025.3.1=hf2ce2f3_11 - openjpeg=2.5.4=h55fea9a_0 - openpyxl=3.1.5=py313ha4be090_3 - openssl=3.6.2=h35e630c_0 @@ -167,10 +168,10 @@ dependencies: - zlib-ng=2.3.3=hceb46e0_1 - zstd=1.5.7=hb78ec9c_6 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64-dev.conda.lock.yml b/environments/py-3.13-win-64-dev.conda.lock.yml index a103777e..f9e80f48 100644 --- a/environments/py-3.13-win-64-dev.conda.lock.yml +++ b/environments/py-3.13-win-64-dev.conda.lock.yml @@ -79,7 +79,7 @@ dependencies: - httpcore=1.0.9=pyh29332c3_0 - httpx=0.28.1=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 - - idna=3.11=pyhd8ed1ab_0 + - idna=3.13=pyhcf101f3_0 - imagesize=2.0.0=pyhd8ed1ab_0 - importlib-metadata=8.8.0=pyhcf101f3_0 - importlib_resources=7.1.0=pyhd8ed1ab_0 @@ -159,7 +159,7 @@ dependencies: - mdit-py-plugins=0.5.0=pyhd8ed1ab_0 - mdurl=0.1.2=pyhd8ed1ab_1 - mistune=3.2.0=pyhcf101f3_0 - - mkl=2025.3.1=hac47afa_11 + - mkl=2025.3.1=hac47afa_12 - msgpack-python=1.1.2=py313hf069bd2_1 - mumps-seq=5.8.2=h607cc0b_2 - munkres=1.1.4=pyhd8ed1ab_1 @@ -174,6 +174,7 @@ dependencies: - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py313hc90dcd4_1 - numpy=2.4.3=py313ha8dc839_0 + - onemkl-license=2025.3.1=h57928b3_12 - openjpeg=2.5.4=h0e57b4f_0 - openpyxl=3.1.5=py313hc624790_3 - openssl=3.6.2=hf411b9b_0 @@ -286,10 +287,10 @@ dependencies: - zlib-ng=2.3.3=h0261ad2_1 - zstd=1.5.7=h534d264_6 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.13-win-64.conda.lock.yml b/environments/py-3.13-win-64.conda.lock.yml index d9df5630..a591a3d9 100644 --- a/environments/py-3.13-win-64.conda.lock.yml +++ b/environments/py-3.13-win-64.conda.lock.yml @@ -91,12 +91,13 @@ dependencies: - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.3=py313hd650c13_1 - matplotlib-base=3.10.8=py313he1ded55_0 - - mkl=2025.3.1=hac47afa_11 + - mkl=2025.3.1=hac47afa_12 - msgpack-python=1.1.2=py313hf069bd2_1 - mumps-seq=5.8.2=h607cc0b_2 - munkres=1.1.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py313hc90dcd4_1 - numpy=2.4.3=py313ha8dc839_0 + - onemkl-license=2025.3.1=h57928b3_12 - openjpeg=2.5.4=h0e57b4f_0 - openpyxl=3.1.5=py313hc624790_3 - openssl=3.6.2=hf411b9b_0 @@ -156,10 +157,10 @@ dependencies: - zlib-ng=2.3.3=h0261ad2_1 - zstd=1.5.7=h534d264_6 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@e2dc749f851024de3d6d425803229943b674c4e4 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 variables: KMP_WARNINGS: 0 diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 1068e203..3dc29b61 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -2186,27 +2186,27 @@ package: category: main optional: false - name: idna - version: '3.11' + version: '3.13' manager: conda platform: linux-64 dependencies: - python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/idna-3.11-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/idna-3.13-pyhcf101f3_0.conda hash: - md5: 53abe63df7e10a6ba605dc5f9f961d36 - sha256: ae89d0299ada2a3162c2614a9d26557a92aa6a77120ce142f8e0109bbf0342b0 + md5: fb7130c190f9b4ec91219840a05ba3ac + sha256: 9ab620e6f64bb67737bd7bc1ad6f480770124e304c6710617aba7fe60b089f48 category: dev optional: true - name: idna - version: '3.11' + version: '3.13' manager: conda platform: win-64 dependencies: - python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/idna-3.11-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/idna-3.13-pyhcf101f3_0.conda hash: - md5: 53abe63df7e10a6ba605dc5f9f961d36 - sha256: ae89d0299ada2a3162c2614a9d26557a92aa6a77120ce142f8e0109bbf0342b0 + md5: fb7130c190f9b4ec91219840a05ba3ac + sha256: 9ab620e6f64bb67737bd7bc1ad6f480770124e304c6710617aba7fe60b089f48 category: dev optional: true - name: imagesize @@ -4746,12 +4746,13 @@ package: _openmp_mutex: '>=4.5' libgcc: '>=14' libstdcxx: '>=14' - llvm-openmp: '>=22.1.1' + llvm-openmp: '>=22.1.4' + onemkl-license: 2025.3.1 tbb: '>=2022.3.0' - url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2025.3.1-h0e700b2_10.conda + url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2025.3.1-h0e700b2_11.conda hash: - md5: f010e1db3ddc8db985cfd4e04ed24b7b - sha256: da9cd578883d3f71b2023777fb6afbc26b183b261bcc8743d0d6084c4cae84b4 + md5: 1065cab1a38320768d811d740b18b213 + sha256: e03877a111b613dff7b599fd7146def11eb3517f3813e80aedddeb00843f0bf2 category: main optional: false - name: mkl @@ -4759,15 +4760,16 @@ package: manager: conda platform: win-64 dependencies: - llvm-openmp: '>=22.1.1' + llvm-openmp: '>=22.1.4' + onemkl-license: 2025.3.1 tbb: '>=2022.3.0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/mkl-2025.3.1-hac47afa_11.conda + url: https://repo.prefix.dev/conda-forge/win-64/mkl-2025.3.1-hac47afa_12.conda hash: - md5: 3fd3009cef89c36e9898a6feeb0f5530 - sha256: f2c2b2a3c2e7d08d78c10bef7c135a4262c80d1d48c85fb5902ca30d61d645f4 + md5: a3b1ee571898432da7e13ecb7bfd76ae + sha256: d7b8343e10053c8527e2e20fd96787d368c97129ffa799e863069a36bd299457 category: main optional: false - name: msgpack-python @@ -5252,6 +5254,28 @@ package: sha256: f0b92b9f58406ce21c7d0f037e58cb62380daffb9232c7cb31ab5edc217527e6 category: main optional: false +- name: onemkl-license + version: 2025.3.1 + manager: conda + platform: linux-64 + dependencies: {} + url: https://repo.prefix.dev/conda-forge/linux-64/onemkl-license-2025.3.1-hf2ce2f3_11.conda + hash: + md5: 4a1793b78e4309bbdb99bd033226f0d2 + sha256: 857bfc5bfbb3956e56a1db3f73f8850c95ef2d962d78471bfdc5de2319149fdb + category: main + optional: false +- name: onemkl-license + version: 2025.3.1 + manager: conda + platform: win-64 + dependencies: {} + url: https://repo.prefix.dev/conda-forge/win-64/onemkl-license-2025.3.1-h57928b3_12.conda + hash: + md5: 29ad104e60faa7ed1dc549ec029764bb + sha256: 03eac4174077397a5bc480021e62412e73e80f34072d81053899f65dfe1045c7 + category: main + optional: false - name: openjpeg version: 2.5.4 manager: conda @@ -8388,43 +8412,43 @@ package: category: main optional: false - name: geoapps-utils - version: 0.7.0a4.dev21+9baaece + version: 0.7.0a4.dev22+ed8ce15 manager: pip platform: linux-64 dependencies: - geoh5py: 0.13.0a4.dev7+6ad559b0 + geoh5py: 0.13.0a4.dev12+a3a1ab3f matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 hash: - sha256: 9baaece0133496c23519ff2708f89e679e900fd0 + sha256: ed8ce15bd6288c78908cf31bf9327dbb06b02267 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 category: main optional: false - name: geoapps-utils - version: 0.7.0a4.dev21+9baaece + version: 0.7.0a4.dev22+ed8ce15 manager: pip platform: win-64 dependencies: - geoh5py: 0.13.0a4.dev7+6ad559b0 + geoh5py: 0.13.0a4.dev12+a3a1ab3f matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 hash: - sha256: 9baaece0133496c23519ff2708f89e679e900fd0 + sha256: ed8ce15bd6288c78908cf31bf9327dbb06b02267 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 category: main optional: false - name: geoh5py - version: 0.13.0a4.dev7+6ad559b0 + version: 0.13.0a4.dev12+a3a1ab3f manager: pip platform: linux-64 dependencies: @@ -8432,16 +8456,16 @@ package: numpy: '>=2.4.0,<2.5.0' pillow: '>=12.1.0,<12.2.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b hash: - sha256: 6ad559b09341b80c22aac363cbd0087089bd1a8a + sha256: a3a1ab3f86a87139cf46159a4a7f55804428055b source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b category: main optional: false - name: geoh5py - version: 0.13.0a4.dev7+6ad559b0 + version: 0.13.0a4.dev12+a3a1ab3f manager: pip platform: win-64 dependencies: @@ -8449,12 +8473,12 @@ package: numpy: '>=2.4.0,<2.5.0' pillow: '>=12.1.0,<12.2.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b hash: - sha256: 6ad559b09341b80c22aac363cbd0087089bd1a8a + sha256: a3a1ab3f86a87139cf46159a4a7f55804428055b source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b category: main optional: false - name: grid-apps @@ -8463,8 +8487,8 @@ package: platform: linux-64 dependencies: discretize: '>=0.12.0,<0.13.0' - geoapps-utils: 0.7.0a4.dev21+9baaece - geoh5py: 0.13.0a4.dev7+6ad559b0 + geoapps-utils: 0.7.0a4.dev22+ed8ce15 + geoh5py: 0.13.0a4.dev12+a3a1ab3f numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' @@ -8482,8 +8506,8 @@ package: platform: win-64 dependencies: discretize: '>=0.12.0,<0.13.0' - geoapps-utils: 0.7.0a4.dev21+9baaece - geoh5py: 0.13.0a4.dev7+6ad559b0 + geoapps-utils: 0.7.0a4.dev22+ed8ce15 + geoh5py: 0.13.0a4.dev12+a3a1ab3f numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' @@ -8496,7 +8520,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev16+gfa25746b5 + version: 0.25.0.1a3.dev20+gea70aa21a manager: pip platform: linux-64 dependencies: @@ -8509,16 +8533,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 hash: - sha256: fa25746b50102620bd8bcaf91aff8a3f745d8c4b + sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev16+gfa25746b5 + version: 0.25.0.1a3.dev20+gea70aa21a manager: pip platform: win-64 dependencies: @@ -8531,11 +8555,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 hash: - sha256: fa25746b50102620bd8bcaf91aff8a3f745d8c4b + sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 category: main optional: false diff --git a/py-3.13.conda-lock.yml b/py-3.13.conda-lock.yml index ad3a715f..fbfc9fa1 100644 --- a/py-3.13.conda-lock.yml +++ b/py-3.13.conda-lock.yml @@ -2184,27 +2184,27 @@ package: category: main optional: false - name: idna - version: '3.11' + version: '3.13' manager: conda platform: linux-64 dependencies: - python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/idna-3.11-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/idna-3.13-pyhcf101f3_0.conda hash: - md5: 53abe63df7e10a6ba605dc5f9f961d36 - sha256: ae89d0299ada2a3162c2614a9d26557a92aa6a77120ce142f8e0109bbf0342b0 + md5: fb7130c190f9b4ec91219840a05ba3ac + sha256: 9ab620e6f64bb67737bd7bc1ad6f480770124e304c6710617aba7fe60b089f48 category: dev optional: true - name: idna - version: '3.11' + version: '3.13' manager: conda platform: win-64 dependencies: - python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/idna-3.11-pyhd8ed1ab_0.conda + python: '' + url: https://repo.prefix.dev/conda-forge/noarch/idna-3.13-pyhcf101f3_0.conda hash: - md5: 53abe63df7e10a6ba605dc5f9f961d36 - sha256: ae89d0299ada2a3162c2614a9d26557a92aa6a77120ce142f8e0109bbf0342b0 + md5: fb7130c190f9b4ec91219840a05ba3ac + sha256: 9ab620e6f64bb67737bd7bc1ad6f480770124e304c6710617aba7fe60b089f48 category: dev optional: true - name: imagesize @@ -4746,12 +4746,13 @@ package: _openmp_mutex: '>=4.5' libgcc: '>=14' libstdcxx: '>=14' - llvm-openmp: '>=22.1.1' + llvm-openmp: '>=22.1.4' + onemkl-license: 2025.3.1 tbb: '>=2022.3.0' - url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2025.3.1-h0e700b2_10.conda + url: https://repo.prefix.dev/conda-forge/linux-64/mkl-2025.3.1-h0e700b2_11.conda hash: - md5: f010e1db3ddc8db985cfd4e04ed24b7b - sha256: da9cd578883d3f71b2023777fb6afbc26b183b261bcc8743d0d6084c4cae84b4 + md5: 1065cab1a38320768d811d740b18b213 + sha256: e03877a111b613dff7b599fd7146def11eb3517f3813e80aedddeb00843f0bf2 category: main optional: false - name: mkl @@ -4759,15 +4760,16 @@ package: manager: conda platform: win-64 dependencies: - llvm-openmp: '>=22.1.1' + llvm-openmp: '>=22.1.4' + onemkl-license: 2025.3.1 tbb: '>=2022.3.0' ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/mkl-2025.3.1-hac47afa_11.conda + url: https://repo.prefix.dev/conda-forge/win-64/mkl-2025.3.1-hac47afa_12.conda hash: - md5: 3fd3009cef89c36e9898a6feeb0f5530 - sha256: f2c2b2a3c2e7d08d78c10bef7c135a4262c80d1d48c85fb5902ca30d61d645f4 + md5: a3b1ee571898432da7e13ecb7bfd76ae + sha256: d7b8343e10053c8527e2e20fd96787d368c97129ffa799e863069a36bd299457 category: main optional: false - name: msgpack-python @@ -5252,6 +5254,28 @@ package: sha256: b01143d91ac22a37595c96023616dab0509ca22ee7791747dd52cc5c651f9b11 category: main optional: false +- name: onemkl-license + version: 2025.3.1 + manager: conda + platform: linux-64 + dependencies: {} + url: https://repo.prefix.dev/conda-forge/linux-64/onemkl-license-2025.3.1-hf2ce2f3_11.conda + hash: + md5: 4a1793b78e4309bbdb99bd033226f0d2 + sha256: 857bfc5bfbb3956e56a1db3f73f8850c95ef2d962d78471bfdc5de2319149fdb + category: main + optional: false +- name: onemkl-license + version: 2025.3.1 + manager: conda + platform: win-64 + dependencies: {} + url: https://repo.prefix.dev/conda-forge/win-64/onemkl-license-2025.3.1-h57928b3_12.conda + hash: + md5: 29ad104e60faa7ed1dc549ec029764bb + sha256: 03eac4174077397a5bc480021e62412e73e80f34072d81053899f65dfe1045c7 + category: main + optional: false - name: openjpeg version: 2.5.4 manager: conda @@ -8329,43 +8353,43 @@ package: category: main optional: false - name: geoapps-utils - version: 0.7.0a4.dev21+9baaece + version: 0.7.0a4.dev22+ed8ce15 manager: pip platform: linux-64 dependencies: - geoh5py: 0.13.0a4.dev7+6ad559b0 + geoh5py: 0.13.0a4.dev12+a3a1ab3f matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 hash: - sha256: 9baaece0133496c23519ff2708f89e679e900fd0 + sha256: ed8ce15bd6288c78908cf31bf9327dbb06b02267 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 category: main optional: false - name: geoapps-utils - version: 0.7.0a4.dev21+9baaece + version: 0.7.0a4.dev22+ed8ce15 manager: pip platform: win-64 dependencies: - geoh5py: 0.13.0a4.dev7+6ad559b0 + geoh5py: 0.13.0a4.dev12+a3a1ab3f matplotlib: '>=3.10.0,<3.11.0' numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 hash: - sha256: 9baaece0133496c23519ff2708f89e679e900fd0 + sha256: ed8ce15bd6288c78908cf31bf9327dbb06b02267 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@9baaece0133496c23519ff2708f89e679e900fd0 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@ed8ce15bd6288c78908cf31bf9327dbb06b02267 category: main optional: false - name: geoh5py - version: 0.13.0a4.dev7+6ad559b0 + version: 0.13.0a4.dev12+a3a1ab3f manager: pip platform: linux-64 dependencies: @@ -8373,16 +8397,16 @@ package: numpy: '>=2.4.0,<2.5.0' pillow: '>=12.1.0,<12.2.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b hash: - sha256: 6ad559b09341b80c22aac363cbd0087089bd1a8a + sha256: a3a1ab3f86a87139cf46159a4a7f55804428055b source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b category: main optional: false - name: geoh5py - version: 0.13.0a4.dev7+6ad559b0 + version: 0.13.0a4.dev12+a3a1ab3f manager: pip platform: win-64 dependencies: @@ -8390,12 +8414,12 @@ package: numpy: '>=2.4.0,<2.5.0' pillow: '>=12.1.0,<12.2.0' pydantic: '>=2.12.0,<2.13.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b hash: - sha256: 6ad559b09341b80c22aac363cbd0087089bd1a8a + sha256: a3a1ab3f86a87139cf46159a4a7f55804428055b source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@6ad559b09341b80c22aac363cbd0087089bd1a8a + url: git+https://github.com/MiraGeoscience/geoh5py.git@a3a1ab3f86a87139cf46159a4a7f55804428055b category: main optional: false - name: grid-apps @@ -8404,8 +8428,8 @@ package: platform: linux-64 dependencies: discretize: '>=0.12.0,<0.13.0' - geoapps-utils: 0.7.0a4.dev21+9baaece - geoh5py: 0.13.0a4.dev7+6ad559b0 + geoapps-utils: 0.7.0a4.dev22+ed8ce15 + geoh5py: 0.13.0a4.dev12+a3a1ab3f numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' @@ -8423,8 +8447,8 @@ package: platform: win-64 dependencies: discretize: '>=0.12.0,<0.13.0' - geoapps-utils: 0.7.0a4.dev21+9baaece - geoh5py: 0.13.0a4.dev7+6ad559b0 + geoapps-utils: 0.7.0a4.dev22+ed8ce15 + geoh5py: 0.13.0a4.dev12+a3a1ab3f numpy: '>=2.4.2,<2.5.0' pydantic: '>=2.12.0,<2.13.0' scipy: '>=1.17.0,<1.18.0' @@ -8437,7 +8461,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev16+gfa25746b5 + version: 0.25.0.1a3.dev20+gea70aa21a manager: pip platform: linux-64 dependencies: @@ -8449,16 +8473,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 hash: - sha256: fa25746b50102620bd8bcaf91aff8a3f745d8c4b + sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 category: main optional: false - name: mira-simpeg - version: 0.25.0.1a3.dev16+gfa25746b5 + version: 0.25.0.1a3.dev20+gea70aa21a manager: pip platform: win-64 dependencies: @@ -8470,11 +8494,11 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 hash: - sha256: fa25746b50102620bd8bcaf91aff8a3f745d8c4b + sha256: ea70aa21a36c6a0bcbccf8be74450c4956bd3472 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@fa25746b50102620bd8bcaf91aff8a3f745d8c4b + url: git+https://github.com/MiraGeoscience/simpeg.git@ea70aa21a36c6a0bcbccf8be74450c4956bd3472 category: main optional: false diff --git a/simpeg_drivers/components/factories/directives_factory.py b/simpeg_drivers/components/factories/directives_factory.py index bb74815d..b4c23439 100644 --- a/simpeg_drivers/components/factories/directives_factory.py +++ b/simpeg_drivers/components/factories/directives_factory.py @@ -246,7 +246,8 @@ def save_iteration_log_files(self): """""" if self._save_iteration_log_files is None and self.driver.logger: self._save_iteration_log_files = directives.SaveLogFilesGeoH5( - self.driver.out_group + self.driver.out_group, + f"{self.params.geoh5.h5file.stem}", ) return self._save_iteration_log_files @@ -286,7 +287,8 @@ def scale_misfits(self): ): nested_tiles = self.driver.get_nested_tiles() self._scale_misfits = directives.ScaleMisfitMultipliers( - self.params.geoh5.h5file.parent / "ChiFactors.log", + self.params.geoh5.h5file.parent + / f"{self.params.geoh5.h5file.stem}.chi", nested_tiles, target_chi=self.params.cooling_schedule.chi_factor, ) diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index ae9c9f3d..91e3df00 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -786,14 +786,13 @@ def __init__(self, driver): self.terminal = sys.stdout self.initial_time = time() - self.start_date_time = datetime.now().strftime("%Y%m%d_%Hh%Mm%Ss") - self.logfile = self.get_path("SimPEG.log") + self.start_date_time = datetime.now().strftime("%Y/%m/%d %Hh:%Mm:%Ss") + self.logfile = ( + Path(self.driver.workspace.h5file).parent + / f"{self.driver.workspace.h5file.stem}.log" + ) def start(self): - if self.logfile.is_file(): - self.write("SimPEG.log file already exists and will be overwritten.") - self.logfile.unlink() - self.write( f"Running simpeg-drivers {__version__}\n" f"Started {self.start_date_time}\n" @@ -816,10 +815,6 @@ def close(self): def flush(self): pass - def get_path(self, filepath: str | Path) -> Path: - root_directory = Path(self.driver.workspace.h5file).parent - return root_directory / filepath - def validate_client(client: Client | bool | None) -> Client | bool: """ diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py index 091bb6af..41e5400b 100644 --- a/tests/run_tests/driver_grav_test.py +++ b/tests/run_tests/driver_grav_test.py @@ -83,35 +83,6 @@ def test_gravity_fwr_run( fwr_driver.run() -def test_array_too_large_run( - tmp_path: Path, -): - workpath = tmp_path.parent / "test_gravity_fwr_run0" / "inversion_test.ui.geoh5" - - with Workspace(workpath) as geoh5: - components = SyntheticsComponents(geoh5) - gz = geoh5.get_entity("Iteration_0_gz")[0] - - # Run the inverse - params = GravityInversionOptions.build( - geoh5=geoh5, - mesh=components.mesh, - topography_object=components.topography, - data_object=gz.parent, - gz_channel=gz, - gz_uncertainty=1e-4, - starting_model=1e-4, - ) - - with patch( - "simpeg.inversion.BaseInversion.run", - side_effect=np.core._exceptions._ArrayMemoryError((0,), np.dtype("float64")), # pylint: disable=protected-access - ): - with raises(GeoAppsError, match="Memory Error"): - driver = GravityInversionDriver(params) - driver.run() - - def test_gravity_run( tmp_path: Path, max_iterations=1, @@ -170,7 +141,7 @@ def test_gravity_run( assert driver.directives.directive_list[0].chifact_start == 0.75 assert driver.directives.directive_list[0].chifact_target == 0.75 - with open(workpath.parent / "SimPEG.log", encoding="utf8") as file: + with open(workpath.parent / "inversion_test.ui.log", encoding="utf8") as file: content = file.read() assert "Target Misfit: 3.00e+00 (3 data with chifact = 1.0)" in content assert "IRLS Start Misfit: 3.00e+00 (3 data with chifact = 1.0)" in content @@ -196,8 +167,8 @@ def test_gravity_run( ) output["data"] = orig_gz - assert len(run_ws.get_entity("SimPEG.log")) == 2 - assert len(run_ws.get_entity("SimPEG.out")) == 1 + assert len(run_ws.get_entity("inversion_test.ui.log")) == 2 + assert len(run_ws.get_entity("inversion_test.ui.out")) == 1 if pytest: check_target(output, target_run) @@ -206,6 +177,35 @@ def test_gravity_run( assert np.all(nan_ind == inactive_ind) +def test_array_too_large_run( + tmp_path: Path, +): + workpath = tmp_path.parent / "test_gravity_fwr_run0" / "inversion_test.ui.geoh5" + + with Workspace(workpath) as geoh5: + components = SyntheticsComponents(geoh5) + gz = geoh5.get_entity("Iteration_0_gz")[0] + + # Run the inverse + params = GravityInversionOptions.build( + geoh5=geoh5, + mesh=components.mesh, + topography_object=components.topography, + data_object=gz.parent, + gz_channel=gz, + gz_uncertainty=1e-4, + starting_model=1e-4, + ) + + with patch( + "simpeg.inversion.BaseInversion.run", + side_effect=np.core._exceptions._ArrayMemoryError((0,), np.dtype("float64")), # pylint: disable=protected-access + ): + with raises(GeoAppsError, match="Memory Error"): + driver = GravityInversionDriver(params) + driver.run() + + if __name__ == "__main__": # Full run test_gravity_fwr_run(