Merge pull request #144 from MiraGeoscience/GEOPY-2009

GEOPY-2009: use newer MKL for compatibility with PyTorch 2.5

Author: sebhmg

.github/workflows/python_deploy_dev.yml

@@ -12,11 +12,12 @@ concurrency:
 jobs:
   call-workflow-conda-publish:
     name: Publish development conda package on JFrog Artifactory
-    uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_conda_package.yml@main
+    uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_rattler_package.yml@main
     with:
       package-name: 'simpeg-drivers'
       python-version: '3.10'
-      virtual-repo-names: '["public-conda-dev"]'
+      source-repo-names: '["public-conda-dev-local", "conda-forge-dev-remote"]'
+      publish-repo-names: '["public-conda-dev"]'
     secrets:
       JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
       JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}

.pre-commit-config.yaml

@@ -76,7 +76,7 @@ repos:
         exclude_types: [jupyter]
     -   id: check-toml
     -   id: check-yaml
-        exclude: ^meta.yaml$
+        exclude: ^recipe.yaml$
     -   id: check-added-large-files
     -   id: check-case-conflict
     -   id: check-merge-conflict

environments/py-3.10-linux-64-dev.conda.lock.yml

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: dc38e6c2bc010e4f5f4a6d873c48f5299990b0dfde18a7539d3660d3062156b8
+# input_hash: 08fe4e90f858953137548bcc1be1154c415a029d282273bece0a14c36c671784
 
 channels:
   - conda-forge
@@ -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.10=py310h89163eb_0
+  - coverage=7.6.12=py310h89163eb_0
   - cycler=0.12.1=pyhd8ed1ab_1
   - cytoolz=1.0.1=py310ha75aee5_0
   - dask-core=2024.6.2=pyhd8ed1ab_0
@@ -102,39 +102,40 @@ dependencies:
   - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2
   - jupyterlab_server=2.27.3=pyhd8ed1ab_1
   - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0
-  - jupytext=1.16.6=pyh80e38bb_0
+  - jupytext=1.16.7=pyhbbac1ac_0
   - keyutils=1.6.1=h166bdaf_0
   - kiwisolver=1.4.7=py310h3788b33_0
   - krb5=1.21.3=h659f571_0
   - latexcodec=2.0.1=pyh9f0ad1d_0
-  - lcms2=2.16=hb7c19ff_0
+  - lcms2=2.17=h717163a_0
   - ld_impl_linux-64=2.43=h712a8e2_2
   - lerc=4.0.0=h27087fc_0
   - libaec=1.1.3=h59595ed_0
-  - libblas=3.9.0=20_linux64_mkl
+  - libblas=3.9.0=28_h2556b6b_mkl
   - libbrotlicommon=1.1.0=hb9d3cd8_2
   - libbrotlidec=1.1.0=hb9d3cd8_2
   - libbrotlienc=1.1.0=hb9d3cd8_2
-  - libcblas=3.9.0=20_linux64_mkl
+  - libcblas=3.9.0=28_h372d94f_mkl
   - libcurl=8.11.1=h332b0f4_0
   - libdeflate=1.23=h4ddbbb0_0
   - libdlf=0.3.0=pyhd8ed1ab_1
   - libedit=3.1.20250104=pl5321h7949ede_0
   - libev=4.33=hd590300_2
-  - libffi=3.4.2=h7f98852_5
+  - libffi=3.4.6=h2dba641_0
   - libgcc=14.2.0=h77fa898_1
   - libgcc-ng=14.2.0=h69a702a_1
   - libgfortran=14.2.0=h69a702a_1
   - libgfortran5=14.2.0=hd5240d6_1
   - libhwloc=2.11.1=default_hecaa2ac_1000
   - libiconv=1.17=hd590300_2
   - libjpeg-turbo=3.0.0=hd590300_1
-  - liblapack=3.9.0=20_linux64_mkl
+  - liblapack=3.9.0=28_hc41d3b0_mkl
   - libllvm15=15.0.7=hb3ce162_4
   - liblzma=5.6.4=hb9d3cd8_0
   - libnghttp2=1.64.0=h161d5f1_0
   - libnsl=2.0.1=hd590300_0
   - libpng=1.6.46=h943b412_0
+  - libscotch=7.0.6=hea33c07_1
   - libsodium=1.0.20=h4ab18f5_0
   - libsqlite=3.48.0=hee588c1_1
   - libssh2=1.11.1=hf672d98_0
@@ -158,11 +159,14 @@ dependencies:
   - mccabe=0.7.0=pyhd8ed1ab_1
   - mdit-py-plugins=0.4.2=pyhd8ed1ab_1
   - mdurl=0.1.2=pyhd8ed1ab_1
+  - metis=5.1.0=hd0bcaf9_1007
   - mistune=3.1.1=pyhd8ed1ab_0
-  - mkl=2023.2.0=h84fe81f_50496
+  - mkl=2024.2.2=ha957f24_16
   - msgpack-python=1.1.0=py310h3788b33_0
+  - mumps-include=5.7.3=ha770c72_7
+  - mumps-seq=5.7.3=h2064c95_7
   - munkres=1.1.4=pyh9f0ad1d_0
-  - myst-nb=1.1.2=pyhd8ed1ab_1
+  - myst-nb=1.2.0=pyh29332c3_0
   - myst-parser=1.0.0=pyhd8ed1ab_0
   - nbclient=0.10.2=pyhd8ed1ab_0
   - nbconvert=7.16.6=hb482800_0
@@ -173,22 +177,22 @@ dependencies:
   - nest-asyncio=1.6.0=pyhd8ed1ab_1
   - notebook=7.3.2=pyhd8ed1ab_0
   - notebook-shim=0.2.4=pyhd8ed1ab_1
-  - numba=0.61.0=py310h699fe88_0
+  - numba=0.61.0=py310h699fe88_1
   - numcodecs=0.13.1=py310h5eaa309_0
   - numpy=1.26.4=py310hb13e2d6_0
   - openjpeg=2.5.3=h5fbd93e_0
-  - openssl=3.4.0=h7b32b05_1
+  - openssl=3.4.1=h7b32b05_0
   - overrides=7.7.0=pyhd8ed1ab_1
   - packaging=24.2=pyhd8ed1ab_2
   - pandas=2.2.3=py310h5eaa309_1
-  - pandoc=3.6.2=ha770c72_0
+  - pandoc=3.6.3=ha770c72_0
   - pandocfilters=1.5.0=pyhd8ed1ab_0
   - parso=0.8.4=pyhd8ed1ab_1
   - partd=1.4.2=pyhd8ed1ab_0
   - pexpect=4.9.0=pyhd8ed1ab_1
   - pickleshare=0.7.5=pyhd8ed1ab_1004
   - pillow=10.3.0=py310hebfe307_1
-  - pip=25.0=pyh8b19718_0
+  - pip=25.0.1=pyh8b19718_0
   - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2
   - platformdirs=4.3.6=pyhd8ed1ab_1
   - pluggy=1.5.0=pyhd8ed1ab_1
@@ -204,11 +208,10 @@ dependencies:
   - pydantic=2.10.6=pyh3cfb1c2_0
   - pydantic-core=2.27.2=py310h505e2c1_0
   - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0
-  - pydiso=0.1.2=py310h7b68af5_0
+  - pydiso=0.1.2=py310h69a6472_0
   - pygments=2.19.1=pyhd8ed1ab_0
   - pylint=3.3.4=pyh29332c3_0
-  - pymatsolver=0.2.0=ha770c72_3
-  - pymatsolver-base=0.2.0=pyh44b312d_3
+  - pymatsolver=0.3.1=pyh48887ae_201
   - pyparsing=3.2.1=pyhd8ed1ab_0
   - pysocks=1.7.1=pyha55dd90_7
   - pytest=8.3.4=pyhd8ed1ab_1
@@ -217,6 +220,7 @@ dependencies:
   - python-dateutil=2.9.0.post0=pyhff2d567_1
   - python-fastjsonschema=2.21.1=pyhd8ed1ab_0
   - python-json-logger=2.0.7=pyhd8ed1ab_0
+  - python-mumps=0.0.3=py310h6410a28_0
   - python-tzdata=2023.4=pyhd8ed1ab_0
   - python_abi=3.10=5_cp310
   - pytz=2024.1=pyhd8ed1ab_0
@@ -297,8 +301,8 @@ dependencies:
   - zstd=1.5.6=ha6fb4c9_0
   - pip:
       - geoapps-utils == 0.4.0 --hash=sha256:22baa6f49c09e02ab65efd07fbab1421982f17aefc98749febf858da2b47d6ef
-      - geoh5py == 0.10.1rc1 --hash=sha256:17a94dabab81e686d3f8638c9f56573ae6d86dc699cf137a9b4b9d89f873ee25
-      - mira-simpeg == 0.21.2.1 --hash=sha256:82451148ed720078308f5c3273fd78ce83167a214a0164c9956af2865315ab37
+      - geoh5py == 0.10.1 --hash=sha256:6ad70a64f5d5ae25c84c1d75f8142a0b34204027041a3edaf1b036fa9e571cf2
+      - mira-simpeg == 0.21.2.2a1 --hash=sha256:03bfc83b5bbedc8f9e6423f005d4741f44c52b937d5181614d264a79e5623501
       - octree-creation-app == 0.2.0 --hash=sha256:6e1ccce3cbbbb1eb7923c6c92dbc000feca2ffc6b163025f0f33e8245fcabbac
       - param-sweeps == 0.2.0 --hash=sha256:f168eabf4f665ec84abd22ae6f02d631692103f86a7769847533b47a1e42b074
 

environments/py-3.10-linux-64.conda.lock.yml

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: dc38e6c2bc010e4f5f4a6d873c48f5299990b0dfde18a7539d3660d3062156b8
+# input_hash: 08fe4e90f858953137548bcc1be1154c415a029d282273bece0a14c36c671784
 
 channels:
   - conda-forge
@@ -47,34 +47,35 @@ dependencies:
   - keyutils=1.6.1=h166bdaf_0
   - kiwisolver=1.4.7=py310h3788b33_0
   - krb5=1.21.3=h659f571_0
-  - lcms2=2.16=hb7c19ff_0
+  - lcms2=2.17=h717163a_0
   - ld_impl_linux-64=2.43=h712a8e2_2
   - lerc=4.0.0=h27087fc_0
   - libaec=1.1.3=h59595ed_0
-  - libblas=3.9.0=20_linux64_mkl
+  - libblas=3.9.0=28_h2556b6b_mkl
   - libbrotlicommon=1.1.0=hb9d3cd8_2
   - libbrotlidec=1.1.0=hb9d3cd8_2
   - libbrotlienc=1.1.0=hb9d3cd8_2
-  - libcblas=3.9.0=20_linux64_mkl
+  - libcblas=3.9.0=28_h372d94f_mkl
   - libcurl=8.11.1=h332b0f4_0
   - libdeflate=1.23=h4ddbbb0_0
   - libdlf=0.3.0=pyhd8ed1ab_1
   - libedit=3.1.20250104=pl5321h7949ede_0
   - libev=4.33=hd590300_2
-  - libffi=3.4.2=h7f98852_5
+  - libffi=3.4.6=h2dba641_0
   - libgcc=14.2.0=h77fa898_1
   - libgcc-ng=14.2.0=h69a702a_1
   - libgfortran=14.2.0=h69a702a_1
   - libgfortran5=14.2.0=hd5240d6_1
   - libhwloc=2.11.1=default_hecaa2ac_1000
   - libiconv=1.17=hd590300_2
   - libjpeg-turbo=3.0.0=hd590300_1
-  - liblapack=3.9.0=20_linux64_mkl
+  - liblapack=3.9.0=28_hc41d3b0_mkl
   - libllvm15=15.0.7=hb3ce162_4
   - liblzma=5.6.4=hb9d3cd8_0
   - libnghttp2=1.64.0=h161d5f1_0
   - libnsl=2.0.1=hd590300_0
   - libpng=1.6.46=h943b412_0
+  - libscotch=7.0.6=hea33c07_1
   - libsqlite=3.48.0=hee588c1_1
   - libssh2=1.11.1=hf672d98_0
   - libstdcxx=14.2.0=hc0a3c3a_1
@@ -91,32 +92,35 @@ dependencies:
   - locket=1.0.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py310h89163eb_1
   - matplotlib-base=3.8.4=py310hef631a5_2
-  - mkl=2023.2.0=h84fe81f_50496
+  - 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_7
+  - mumps-seq=5.7.3=h2064c95_7
   - munkres=1.1.4=pyh9f0ad1d_0
   - ncurses=6.5=h2d0b736_3
-  - numba=0.61.0=py310h699fe88_0
+  - numba=0.61.0=py310h699fe88_1
   - numcodecs=0.13.1=py310h5eaa309_0
   - numpy=1.26.4=py310hb13e2d6_0
   - openjpeg=2.5.3=h5fbd93e_0
-  - openssl=3.4.0=h7b32b05_1
+  - openssl=3.4.1=h7b32b05_0
   - packaging=24.2=pyhd8ed1ab_2
   - pandas=2.2.3=py310h5eaa309_1
   - partd=1.4.2=pyhd8ed1ab_0
   - pillow=10.3.0=py310hebfe307_1
-  - pip=25.0=pyh8b19718_0
+  - pip=25.0.1=pyh8b19718_0
   - psutil=6.1.1=py310ha75aee5_0
   - pthread-stubs=0.4=hb9d3cd8_1002
   - pycparser=2.22=pyh29332c3_1
   - pydantic=2.10.6=pyh3cfb1c2_0
   - pydantic-core=2.27.2=py310h505e2c1_0
-  - pydiso=0.1.2=py310h7b68af5_0
-  - pymatsolver=0.2.0=ha770c72_3
-  - pymatsolver-base=0.2.0=pyh44b312d_3
+  - pydiso=0.1.2=py310h69a6472_0
+  - pymatsolver=0.3.1=pyh48887ae_201
   - pyparsing=3.2.1=pyhd8ed1ab_0
   - pysocks=1.7.1=pyha55dd90_7
   - python=3.10.16=he725a3c_1_cpython
   - python-dateutil=2.9.0.post0=pyhff2d567_1
+  - python-mumps=0.0.3=py310h6410a28_0
   - python-tzdata=2023.4=pyhd8ed1ab_0
   - python_abi=3.10=5_cp310
   - pytz=2024.1=pyhd8ed1ab_0
@@ -150,8 +154,8 @@ dependencies:
   - zstd=1.5.6=ha6fb4c9_0
   - pip:
       - geoapps-utils == 0.4.0 --hash=sha256:22baa6f49c09e02ab65efd07fbab1421982f17aefc98749febf858da2b47d6ef
-      - geoh5py == 0.10.1rc1 --hash=sha256:17a94dabab81e686d3f8638c9f56573ae6d86dc699cf137a9b4b9d89f873ee25
-      - mira-simpeg == 0.21.2.1 --hash=sha256:82451148ed720078308f5c3273fd78ce83167a214a0164c9956af2865315ab37
+      - geoh5py == 0.10.1 --hash=sha256:6ad70a64f5d5ae25c84c1d75f8142a0b34204027041a3edaf1b036fa9e571cf2
+      - mira-simpeg == 0.21.2.2a1 --hash=sha256:03bfc83b5bbedc8f9e6423f005d4741f44c52b937d5181614d264a79e5623501
       - octree-creation-app == 0.2.0 --hash=sha256:6e1ccce3cbbbb1eb7923c6c92dbc000feca2ffc6b163025f0f33e8245fcabbac
       - param-sweeps == 0.2.0 --hash=sha256:f168eabf4f665ec84abd22ae6f02d631692103f86a7769847533b47a1e42b074