diff --git a/docs/conf.py b/docs/conf.py index 564e64f4..2f18464f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -14,6 +14,11 @@ # The full version, including alpha/beta/rc tags. release = version("simpeg-drivers") +# drop the post segment if any for release +pep_version = Version(release) +if pep_version.is_postrelease: + release = pep_version.base_version + # The short X.Y.Z version. version = Version(release).base_version 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 40c3339e..f83ba467 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: d73ecef65ed7b0f752cc2f320c00b21f7170a26ac3e84514a882fcfe83a9605f +# input_hash: 17857417d27d428057789120a0f069eb7b327a7011fd37401afcd9e52eb22c4b channels: - conda-forge @@ -110,7 +110,7 @@ dependencies: - krb5=1.21.3=h659f571_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - - ld_impl_linux-64=2.43=h712a8e2_2 + - ld_impl_linux-64=2.43=h712a8e2_4 - lerc=4.0.0=h27087fc_0 - libaec=1.1.3=h59595ed_0 - libblas=3.9.0=20_linux64_mkl @@ -129,7 +129,7 @@ dependencies: - libgfortran=14.2.0=h69a702a_1 - libgfortran5=14.2.0=hd5240d6_1 - libhwloc=2.11.1=default_hecaa2ac_1000 - - libiconv=1.18=h4ce23a2_0 + - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=20_linux64_mkl - libllvm15=15.0.7=ha7bfdaf_5 @@ -137,6 +137,7 @@ dependencies: - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 + - libscotch=7.0.6=hea33c07_1 - libsodium=1.0.20=h4ab18f5_0 - libsqlite=3.49.1=hee588c1_1 - libssh2=1.11.1=hf672d98_0 @@ -160,9 +161,12 @@ 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.2=pyhd8ed1ab_0 - mkl=2023.2.0=h84fe81f_50496 - 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.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 @@ -209,8 +213,7 @@ dependencies: - pydiso=0.1.2=py310h7b68af5_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 @@ -219,6 +222,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 @@ -230,7 +234,7 @@ dependencies: - requests=2.32.3=pyhd8ed1ab_1 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - - rpds-py=0.22.3=py310h505e2c1_0 + - rpds-py=0.23.1=py310hc1293b2_0 - scikit-learn=1.4.2=py310h981052a_1 - scipy=1.14.1=py310hfcf56fc_2 - send2trash=1.8.3=pyh0d859eb_1 @@ -299,10 +303,10 @@ dependencies: - zstandard=0.19.0=py310h5764c6d_0 - zstd=1.5.7=hb8e6e7a_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 6645fb2d..5cefec30 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: d73ecef65ed7b0f752cc2f320c00b21f7170a26ac3e84514a882fcfe83a9605f +# input_hash: 17857417d27d428057789120a0f069eb7b327a7011fd37401afcd9e52eb22c4b channels: - conda-forge @@ -50,7 +50,7 @@ dependencies: - kiwisolver=1.4.7=py310h3788b33_0 - krb5=1.21.3=h659f571_0 - lcms2=2.17=h717163a_0 - - ld_impl_linux-64=2.43=h712a8e2_2 + - ld_impl_linux-64=2.43=h712a8e2_4 - lerc=4.0.0=h27087fc_0 - libaec=1.1.3=h59595ed_0 - libblas=3.9.0=20_linux64_mkl @@ -69,7 +69,7 @@ dependencies: - libgfortran=14.2.0=h69a702a_1 - libgfortran5=14.2.0=hd5240d6_1 - libhwloc=2.11.1=default_hecaa2ac_1000 - - libiconv=1.18=h4ce23a2_0 + - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=20_linux64_mkl - libllvm15=15.0.7=ha7bfdaf_5 @@ -77,6 +77,7 @@ dependencies: - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 + - libscotch=7.0.6=hea33c07_1 - libsqlite=3.49.1=hee588c1_1 - libssh2=1.11.1=hf672d98_0 - libstdcxx=14.2.0=hc0a3c3a_1 @@ -93,8 +94,11 @@ dependencies: - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h89163eb_1 - matplotlib-base=3.8.4=py310hef631a5_2 + - metis=5.1.0=hd0bcaf9_1007 - mkl=2023.2.0=h84fe81f_50496 - 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_1 @@ -113,12 +117,12 @@ dependencies: - 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 + - 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 @@ -152,10 +156,10 @@ dependencies: - zstandard=0.19.0=py310h5764c6d_0 - zstd=1.5.7=hb8e6e7a_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 76034f7d..d568624a 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 545961761a6fd7c3db8ccd2c6af47188a38d76093c7c2ecafb61582fdd424d2d +# input_hash: 0d852099be807f95bca241635e52da6569ebdf2d04351127e00b6b7aa7eb7c7b channels: - conda-forge @@ -119,7 +119,7 @@ dependencies: - libdlf=0.3.0=pyhd8ed1ab_1 - libffi=3.4.6=h537db12_0 - libhwloc=2.11.1=default_h8125262_1000 - - libiconv=1.17=hcfcfb64_2 + - libiconv=1.18=h135ad9c_1 - libjpeg-turbo=3.0.0=hcfcfb64_1 - liblapack=3.9.0=20_win64_mkl - liblzma=5.6.4=h2466b09_0 @@ -130,9 +130,10 @@ dependencies: - libtiff=4.7.0=h797046b_3 - libwebp-base=1.5.0=h3b0e114_0 - libxcb=1.16=h013a479_1 - - libxml2=2.13.5=he286e8c_1 + - libxml2=2.13.6=he286e8c_0 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 + - llvm-openmp=19.1.7=h30eaf37_0 - llvmlite=0.44.0=py310h0288bfe_0 - locket=1.0.0=pyhd8ed1ab_0 - m2w64-gcc-libgfortran=5.3.0=6 @@ -151,6 +152,7 @@ dependencies: - mkl=2023.2.0=h6a75c08_50497 - msgpack-python=1.1.0=py310hc19bc0b_0 - msys2-conda-epoch=20160418=1 + - mumps-seq=5.7.3=h9576071_7 - munkres=1.1.4=pyh9f0ad1d_0 - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 @@ -195,8 +197,7 @@ dependencies: - pydiso=0.1.2=py310h5da8fee_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=pyh09c184e_7 - pytest=8.3.4=pyhd8ed1ab_1 @@ -205,6 +206,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=py310hb64895d_0 - python-tzdata=2023.4=pyhd8ed1ab_0 - python_abi=3.10=5_cp310 - pytz=2024.1=pyhd8ed1ab_0 @@ -217,7 +219,7 @@ dependencies: - requests=2.32.3=pyhd8ed1ab_1 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - - rpds-py=0.22.3=py310hc226416_0 + - rpds-py=0.23.1=py310h7c79e54_0 - scikit-learn=1.4.2=py310hf2a6c47_1 - scipy=1.14.1=py310hbd0dde3_2 - send2trash=1.8.3=pyh5737063_1 @@ -292,10 +294,10 @@ dependencies: - zstandard=0.19.0=py310h8d17308_0 - zstd=1.5.7=hbeecb71_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 0500c309..1f520a58 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 545961761a6fd7c3db8ccd2c6af47188a38d76093c7c2ecafb61582fdd424d2d +# input_hash: 0d852099be807f95bca241635e52da6569ebdf2d04351127e00b6b7aa7eb7c7b channels: - conda-forge @@ -58,7 +58,7 @@ dependencies: - libdlf=0.3.0=pyhd8ed1ab_1 - libffi=3.4.6=h537db12_0 - libhwloc=2.11.1=default_h8125262_1000 - - libiconv=1.17=hcfcfb64_2 + - libiconv=1.18=h135ad9c_1 - libjpeg-turbo=3.0.0=hcfcfb64_1 - liblapack=3.9.0=20_win64_mkl - liblzma=5.6.4=h2466b09_0 @@ -68,8 +68,9 @@ dependencies: - libtiff=4.7.0=h797046b_3 - libwebp-base=1.5.0=h3b0e114_0 - libxcb=1.16=h013a479_1 - - libxml2=2.13.5=he286e8c_1 + - libxml2=2.13.6=he286e8c_0 - libzlib=1.3.1=h2466b09_2 + - llvm-openmp=19.1.7=h30eaf37_0 - llvmlite=0.44.0=py310h0288bfe_0 - locket=1.0.0=pyhd8ed1ab_0 - m2w64-gcc-libgfortran=5.3.0=6 @@ -82,6 +83,7 @@ dependencies: - mkl=2023.2.0=h6a75c08_50497 - msgpack-python=1.1.0=py310hc19bc0b_0 - msys2-conda-epoch=20160418=1 + - mumps-seq=5.7.3=h9576071_7 - munkres=1.1.4=pyh9f0ad1d_0 - numba=0.61.0=py310h7793332_1 - numcodecs=0.13.1=py310hb4db72f_0 @@ -100,12 +102,12 @@ dependencies: - pydantic=2.10.6=pyh3cfb1c2_0 - pydantic-core=2.27.2=py310hc226416_0 - pydiso=0.1.2=py310h5da8fee_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=pyh09c184e_7 - python=3.10.16=h37870fc_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 + - python-mumps=0.0.3=py310hb64895d_0 - python-tzdata=2023.4=pyhd8ed1ab_0 - python_abi=3.10=5_cp310 - pytz=2024.1=pyhd8ed1ab_0 @@ -143,10 +145,10 @@ dependencies: - zstandard=0.19.0=py310h8d17308_0 - zstd=1.5.7=hbeecb71_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 9e9df613..b4dcb72f 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 9763c24f54e81c96312618557d653c8994647978613de9b38a3a921c677567e2 +# input_hash: ccffba8d0ae8e720a8b58ff10c500924e5464136654551f2d25b30d05d85c2a2 channels: - conda-forge @@ -111,7 +111,7 @@ dependencies: - krb5=1.21.3=h659f571_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - lcms2=2.17=h717163a_0 - - ld_impl_linux-64=2.43=h712a8e2_2 + - ld_impl_linux-64=2.43=h712a8e2_4 - lerc=4.0.0=h27087fc_0 - libaec=1.1.3=h59595ed_0 - libblas=3.9.0=20_linux64_mkl @@ -131,7 +131,7 @@ dependencies: - libgfortran=14.2.0=h69a702a_1 - libgfortran5=14.2.0=hd5240d6_1 - libhwloc=2.11.1=default_hecaa2ac_1000 - - libiconv=1.18=h4ce23a2_0 + - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=20_linux64_mkl - libllvm15=15.0.7=ha7bfdaf_5 @@ -139,6 +139,7 @@ dependencies: - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 + - libscotch=7.0.6=hea33c07_1 - libsodium=1.0.20=h4ab18f5_0 - libsqlite=3.49.1=hee588c1_1 - libssh2=1.11.1=hf672d98_0 @@ -162,9 +163,12 @@ 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.2=pyhd8ed1ab_0 - mkl=2023.2.0=h84fe81f_50496 - msgpack-python=1.1.0=py311hd18a35c_0 + - mumps-include=5.7.3=ha770c72_7 + - mumps-seq=5.7.3=h2064c95_7 - munkres=1.1.4=pyh9f0ad1d_0 - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 @@ -211,8 +215,7 @@ dependencies: - pydiso=0.1.2=py311h979a38d_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 @@ -221,6 +224,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=py311h4b558b0_0 - python-tzdata=2023.4=pyhd8ed1ab_0 - python_abi=3.11=5_cp311 - pytz=2024.1=pyhd8ed1ab_0 @@ -232,7 +236,7 @@ dependencies: - requests=2.32.3=pyhd8ed1ab_1 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - - rpds-py=0.22.3=py311h9e33e62_0 + - rpds-py=0.23.1=py311h687327b_0 - scikit-learn=1.4.2=py311he08f58d_1 - scipy=1.14.1=py311he9a78e4_2 - send2trash=1.8.3=pyh0d859eb_1 @@ -302,10 +306,10 @@ dependencies: - zstandard=0.19.0=py311hd4cff14_0 - zstd=1.5.7=hb8e6e7a_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 5f24590f..336410a8 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 9763c24f54e81c96312618557d653c8994647978613de9b38a3a921c677567e2 +# input_hash: ccffba8d0ae8e720a8b58ff10c500924e5464136654551f2d25b30d05d85c2a2 channels: - conda-forge @@ -51,7 +51,7 @@ dependencies: - kiwisolver=1.4.7=py311hd18a35c_0 - krb5=1.21.3=h659f571_0 - lcms2=2.17=h717163a_0 - - ld_impl_linux-64=2.43=h712a8e2_2 + - ld_impl_linux-64=2.43=h712a8e2_4 - lerc=4.0.0=h27087fc_0 - libaec=1.1.3=h59595ed_0 - libblas=3.9.0=20_linux64_mkl @@ -71,7 +71,7 @@ dependencies: - libgfortran=14.2.0=h69a702a_1 - libgfortran5=14.2.0=hd5240d6_1 - libhwloc=2.11.1=default_hecaa2ac_1000 - - libiconv=1.18=h4ce23a2_0 + - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=20_linux64_mkl - libllvm15=15.0.7=ha7bfdaf_5 @@ -79,6 +79,7 @@ dependencies: - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 + - libscotch=7.0.6=hea33c07_1 - libsqlite=3.49.1=hee588c1_1 - libssh2=1.11.1=hf672d98_0 - libstdcxx=14.2.0=hc0a3c3a_1 @@ -95,8 +96,11 @@ dependencies: - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h2dc5d0c_1 - matplotlib-base=3.8.4=py311ha4ca890_2 + - metis=5.1.0=hd0bcaf9_1007 - mkl=2023.2.0=h84fe81f_50496 - msgpack-python=1.1.0=py311hd18a35c_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=py311h4e1c48f_1 @@ -115,12 +119,12 @@ dependencies: - pydantic=2.10.6=pyh3cfb1c2_0 - pydantic-core=2.27.2=py311h9e33e62_0 - pydiso=0.1.2=py311h979a38d_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 - python=3.11.11=h9e4cc4f_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 + - python-mumps=0.0.3=py311h4b558b0_0 - python-tzdata=2023.4=pyhd8ed1ab_0 - python_abi=3.11=5_cp311 - pytz=2024.1=pyhd8ed1ab_0 @@ -155,10 +159,10 @@ dependencies: - zstandard=0.19.0=py311hd4cff14_0 - zstd=1.5.7=hb8e6e7a_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 fd239977..6f0c1aa8 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 4ae98973526361a18247a24da2c9fbe4b2d23567d24479936aa67a1cda88db94 +# input_hash: c6d99c4080206a6985500566195081cbee7ef83f67dcba0b13ab0757aa9bfb77 channels: - conda-forge @@ -121,7 +121,7 @@ dependencies: - libexpat=2.6.4=he0c23c2_0 - libffi=3.4.6=h537db12_0 - libhwloc=2.11.1=default_h8125262_1000 - - libiconv=1.17=hcfcfb64_2 + - libiconv=1.18=h135ad9c_1 - libjpeg-turbo=3.0.0=hcfcfb64_1 - liblapack=3.9.0=20_win64_mkl - liblzma=5.6.4=h2466b09_0 @@ -132,9 +132,10 @@ dependencies: - libtiff=4.7.0=h797046b_3 - libwebp-base=1.5.0=h3b0e114_0 - libxcb=1.16=h013a479_1 - - libxml2=2.13.5=he286e8c_1 + - libxml2=2.13.6=he286e8c_0 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 + - llvm-openmp=19.1.7=h30eaf37_0 - llvmlite=0.44.0=py311h7deaa30_0 - locket=1.0.0=pyhd8ed1ab_0 - m2w64-gcc-libgfortran=5.3.0=6 @@ -153,6 +154,7 @@ dependencies: - mkl=2023.2.0=h6a75c08_50497 - msgpack-python=1.1.0=py311h3257749_0 - msys2-conda-epoch=20160418=1 + - mumps-seq=5.7.3=h9576071_7 - munkres=1.1.4=pyh9f0ad1d_0 - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 @@ -197,8 +199,7 @@ dependencies: - pydiso=0.1.2=py311h6340b4d_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=pyh09c184e_7 - pytest=8.3.4=pyhd8ed1ab_1 @@ -207,6 +208,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=py311h5bfbc98_0 - python-tzdata=2023.4=pyhd8ed1ab_0 - python_abi=3.11=5_cp311 - pytz=2024.1=pyhd8ed1ab_0 @@ -219,7 +221,7 @@ dependencies: - requests=2.32.3=pyhd8ed1ab_1 - rfc3339-validator=0.1.4=pyhd8ed1ab_1 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - - rpds-py=0.22.3=py311h533ab2d_0 + - rpds-py=0.23.1=py311ha250665_0 - scikit-learn=1.4.2=py311hdcb8d17_1 - scipy=1.14.1=py311hf16d85f_2 - send2trash=1.8.3=pyh5737063_1 @@ -295,10 +297,10 @@ dependencies: - zstandard=0.19.0=py311ha68e1ae_0 - zstd=1.5.7=hbeecb71_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 7827c341..47d5453b 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 4ae98973526361a18247a24da2c9fbe4b2d23567d24479936aa67a1cda88db94 +# input_hash: c6d99c4080206a6985500566195081cbee7ef83f67dcba0b13ab0757aa9bfb77 channels: - conda-forge @@ -60,7 +60,7 @@ dependencies: - libexpat=2.6.4=he0c23c2_0 - libffi=3.4.6=h537db12_0 - libhwloc=2.11.1=default_h8125262_1000 - - libiconv=1.17=hcfcfb64_2 + - libiconv=1.18=h135ad9c_1 - libjpeg-turbo=3.0.0=hcfcfb64_1 - liblapack=3.9.0=20_win64_mkl - liblzma=5.6.4=h2466b09_0 @@ -70,8 +70,9 @@ dependencies: - libtiff=4.7.0=h797046b_3 - libwebp-base=1.5.0=h3b0e114_0 - libxcb=1.16=h013a479_1 - - libxml2=2.13.5=he286e8c_1 + - libxml2=2.13.6=he286e8c_0 - libzlib=1.3.1=h2466b09_2 + - llvm-openmp=19.1.7=h30eaf37_0 - llvmlite=0.44.0=py311h7deaa30_0 - locket=1.0.0=pyhd8ed1ab_0 - m2w64-gcc-libgfortran=5.3.0=6 @@ -84,6 +85,7 @@ dependencies: - mkl=2023.2.0=h6a75c08_50497 - msgpack-python=1.1.0=py311h3257749_0 - msys2-conda-epoch=20160418=1 + - mumps-seq=5.7.3=h9576071_7 - munkres=1.1.4=pyh9f0ad1d_0 - numba=0.61.0=py311h0673bce_1 - numcodecs=0.15.1=py311hcf9f919_0 @@ -102,12 +104,12 @@ dependencies: - pydantic=2.10.6=pyh3cfb1c2_0 - pydantic-core=2.27.2=py311h533ab2d_0 - pydiso=0.1.2=py311h6340b4d_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=pyh09c184e_7 - python=3.11.11=h3f84c4b_1_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 + - python-mumps=0.0.3=py311h5bfbc98_0 - python-tzdata=2023.4=pyhd8ed1ab_0 - python_abi=3.11=5_cp311 - pytz=2024.1=pyhd8ed1ab_0 @@ -146,10 +148,10 @@ dependencies: - zstandard=0.19.0=py311ha68e1ae_0 - zstd=1.5.7=hbeecb71_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 7a851d52..3f101ab6 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 545961761a6fd7c3db8ccd2c6af47188a38d76093c7c2ecafb61582fdd424d2d - linux-64: d73ecef65ed7b0f752cc2f320c00b21f7170a26ac3e84514a882fcfe83a9605f + win-64: 0d852099be807f95bca241635e52da6569ebdf2d04351127e00b6b7aa7eb7c7b + linux-64: 17857417d27d428057789120a0f069eb7b327a7011fd37401afcd9e52eb22c4b channels: - url: conda-forge used_env_vars: [] @@ -3119,10 +3119,10 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.43-h712a8e2_2.conda + url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.43-h712a8e2_4.conda hash: - md5: 048b02e3962f066da18efe3a21b77672 - sha256: 7c91cea91b13f4314d125d1bedb9d03a29ebbd5080ccdea70260363424646dbe + md5: 01f8d123c96816249efd255a31ad7712 + sha256: db73f38155d901a610b2320525b9dd3b31e4949215c870685fd92ea61b5ce472 category: main optional: false - name: lerc @@ -3540,24 +3540,24 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=13' - url: https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.18-h4ce23a2_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.18-h4ce23a2_1.conda hash: - md5: 0743bcd51fc4e6e0367e0aaf41e9bebc - sha256: 659a83c0c184a30336ca512d670a7db56bfb5e289caa9ee641e6f78fd2326463 + md5: e796ff8ddc598affdf7c173d6145f087 + sha256: 18a4afe14f731bfb9cf388659994263904d20111e42f841e9eea1bb6f91f4ab4 category: main optional: false - name: libiconv - version: '1.17' + version: '1.18' manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libiconv-1.17-hcfcfb64_2.conda + url: https://conda.anaconda.org/conda-forge/win-64/libiconv-1.18-h135ad9c_1.conda hash: - md5: e1eb10b1cca179f2baa3601e4efc8712 - sha256: 5f844dd19b046d43174ad80c6ea75b5d504020e3b63cfbc4ace97b8730d35c7b + md5: 21fc5dba2cbcd8e5e26ff976a312122c + sha256: ea5ed2b362b6dbc4ba7188eb4eaf576146e3dfc6f4395e9f0db76ad77465f786 category: main optional: false - name: libjpeg-turbo @@ -3713,6 +3713,24 @@ package: sha256: cf8a594b697de103025dcae2c917ec9c100609caf7c917a94c64a683cb1db1ac category: main optional: false +- name: libscotch + version: 7.0.6 + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + bzip2: '>=1.0.8,<2.0a0' + libgcc: '>=13' + libgfortran: '' + libgfortran5: '>=13.3.0' + liblzma: '>=5.6.3,<6.0a0' + libzlib: '>=1.3.1,<2.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/libscotch-7.0.6-hea33c07_1.conda + hash: + md5: 1b600d55dcd98c958192a69a79e6acd2 + sha256: 8330bba8b7b3a37da6eca04bace985fb9f8d487d3249b8f690e8f4a3d8d3c7dc + category: main + optional: false - name: libsodium version: 1.0.20 manager: conda @@ -3964,19 +3982,19 @@ package: category: main optional: false - name: libxml2 - version: 2.13.5 + version: 2.13.6 manager: conda platform: win-64 dependencies: - libiconv: '>=1.17,<2.0a0' + libiconv: '>=1.18,<2.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/libxml2-2.13.5-he286e8c_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.13.6-he286e8c_0.conda hash: - md5: 77eaa84f90fc90643c5a0be0aa9bdd1b - sha256: 084dd4dde342f13c43ee418d153ac5b2610f95be029073a15fa9dda22b130d06 + md5: c66d5bece33033a9c028bbdf1e627ec5 + sha256: 2919f4e9fffefbf3ff6ecd8ebe81584d573c069b2b82eaeed797b1f56ac8d97b category: main optional: false - name: libzlib @@ -4044,6 +4062,20 @@ package: sha256: 5383e32604e03814b6011fa01a5332057934181a7ea0e90abba7890c17cabce6 category: main optional: false +- name: llvm-openmp + version: 19.1.7 + manager: conda + platform: win-64 + dependencies: + ucrt: '>=10.0.20348.0' + vc: '>=14.2,<15' + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/llvm-openmp-19.1.7-h30eaf37_0.conda + hash: + md5: f6076c844b630037f4a40fae12dc6e41 + sha256: 0dca936d558f986c9100e731483f6c3dbab6a0d9648ec4d8fa6c6f97e18e0325 + category: main + optional: false - name: llvmlite version: 0.44.0 manager: conda @@ -4384,6 +4416,20 @@ package: sha256: 78c1bbe1723449c52b7a9df1af2ee5f005209f67e40b6e1d3c7619127c43b1c7 category: dev optional: true +- name: metis + version: 5.1.0 + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libstdcxx: '>=13' + url: https://conda.anaconda.org/conda-forge/linux-64/metis-5.1.0-hd0bcaf9_1007.conda + hash: + md5: 28eb714416de4eb83e2cbc47e99a1b45 + sha256: e8a00971e6d00bd49f375c5d8d005b37a9abba0b1768533aed0f90a422bf5cc7 + category: main + optional: false - name: mistune version: 3.1.2 manager: conda @@ -4480,6 +4526,55 @@ package: sha256: 99358d58d778abee4dca82ad29fb58058571f19b0f86138363c260049d4ac7f1 category: main optional: false +- name: mumps-include + version: 5.7.3 + manager: conda + platform: linux-64 + dependencies: {} + url: https://conda.anaconda.org/conda-forge/linux-64/mumps-include-5.7.3-ha770c72_7.conda + hash: + md5: dc10f13639b574503ededf0bb180d357 + sha256: 714110d4704cd585fe0434fd99ae2e43132174a6609918c5939aa6aae947612a + category: main + optional: false +- name: mumps-seq + version: 5.7.3 + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + _openmp_mutex: '>=4.5' + libblas: '>=3.9.0,<4.0a0' + libgcc: '>=13' + libgfortran: '' + libgfortran5: '>=13.3.0' + 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_7.conda + hash: + md5: 46523370432ffd9ed12a2aba5dda8db8 + sha256: 4d8c076a3b7821dec3a753b4260737aed81c447a91baf50c38c095557e59bd90 + category: main + optional: false +- name: mumps-seq + version: 5.7.3 + manager: conda + platform: win-64 + dependencies: + libblas: '>=3.9.0,<4.0a0' + liblapack: '>=3.9.0,<4.0a0' + llvm-openmp: '>=19.1.7' + 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_7.conda + hash: + md5: 9483f654b63889300902eb57227c1faf + sha256: d8451cc9a924ae671cd4aab78fcdf16ab1fd0c8e2463b5f4bc78acd400e66b3b + category: main + optional: false - name: munkres version: 1.1.4 manager: conda @@ -5854,57 +5949,35 @@ package: category: dev optional: true - name: pymatsolver - version: 0.2.0 + version: 0.3.1 manager: conda platform: linux-64 dependencies: - pydiso: '' - pymatsolver-base: 0.2.0 - url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-0.2.0-ha770c72_3.conda + numpy: '>=1.21' + packaging: '' + pydiso: '>=0.1' + python: '>=3.10' + scipy: '>=1.8' + url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-0.3.1-pyh48887ae_201.conda hash: - md5: 71c5698e2f1f19b16164bae528b143ca - sha256: 8d16b3c276ffd5f35890bba6539f3f526cc93061b0320eee2c8d488e7d5089de + md5: b6805e522702eabf2ebbd236490d5eed + sha256: d49ad9b58b9eeae204a3677cafc389c00c7f0f830ef76f481ab9aaf3e0260bad category: main optional: false - name: pymatsolver - version: 0.2.0 - manager: conda - platform: win-64 - dependencies: - pydiso: '' - pymatsolver-base: 0.2.0 - url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-0.2.0-ha770c72_3.conda - hash: - md5: 71c5698e2f1f19b16164bae528b143ca - sha256: 8d16b3c276ffd5f35890bba6539f3f526cc93061b0320eee2c8d488e7d5089de - category: main - optional: false -- name: pymatsolver-base - version: 0.2.0 - manager: conda - platform: linux-64 - dependencies: - numpy: '' - python: '' - scipy: '' - url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-base-0.2.0-pyh44b312d_3.conda - hash: - md5: d3843c2374465a0d1a0eb15cc87669c4 - sha256: d03fd3f24f87d7c07675b15129b6e481485500304e03aae35eb93224e2f757b1 - category: main - optional: false -- name: pymatsolver-base - version: 0.2.0 + version: 0.3.1 manager: conda platform: win-64 dependencies: - numpy: '' - python: '' - scipy: '' - url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-base-0.2.0-pyh44b312d_3.conda + numpy: '>=1.21' + packaging: '' + pydiso: '>=0.1' + python: '>=3.10' + scipy: '>=1.8' + url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-0.3.1-pyh48887ae_201.conda hash: - md5: d3843c2374465a0d1a0eb15cc87669c4 - sha256: d03fd3f24f87d7c07675b15129b6e481485500304e03aae35eb93224e2f757b1 + md5: b6805e522702eabf2ebbd236490d5eed + sha256: d49ad9b58b9eeae204a3677cafc389c00c7f0f830ef76f481ab9aaf3e0260bad category: main optional: false - name: pyparsing @@ -6149,6 +6222,43 @@ package: sha256: 4790787fe1f4e8da616edca4acf6a4f8ed4e7c6967aa31b920208fc8f95efcca category: dev optional: true +- name: python-mumps + version: 0.0.3 + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + mumps-seq: '>=5.7.3,<5.7.4.0a0' + numpy: '>=1.19,<3' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* + scipy: '>=1.8' + url: https://conda.anaconda.org/conda-forge/linux-64/python-mumps-0.0.3-py310h6410a28_0.conda + hash: + md5: f7e3766b109232dadef0cc072e1e3cc6 + sha256: bf869230e332833c9f9f1908731a859c3b39a612e74ae8f65b5338d67795c613 + category: main + optional: false +- name: python-mumps + version: 0.0.3 + manager: conda + platform: win-64 + dependencies: + mumps-seq: '>=5.7.3,<5.7.4.0a0' + numpy: '>=1.19,<3' + python: '>=3.10,<3.11.0a0' + python_abi: 3.10.* + scipy: '>=1.8' + ucrt: '>=10.0.20348.0' + vc: '>=14.2,<15' + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/python-mumps-0.0.3-py310hb64895d_0.conda + hash: + md5: 477083091731501c8bef2fd4733ec23f + sha256: 1461a60b36aa7b2189ad3bd0ca9bb356d42ea2e54c8aaf122826e9f8bd33735c + category: main + optional: false - name: python-tzdata version: '2023.4' manager: conda @@ -6477,34 +6587,34 @@ package: category: dev optional: true - name: rpds-py - version: 0.22.3 + version: 0.23.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=13' - python: '>=3.10,<3.11.0a0' + python: '' python_abi: 3.10.* - url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.22.3-py310h505e2c1_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.23.1-py310hc1293b2_0.conda hash: - md5: 3c12053527c50b3f825dd6dd0861832d - sha256: e13019600e75707126118cf3f02187e7dd96f475a82e8fa06e59091f76159274 + md5: 55afda712d4c48108d993ded1bd4de9b + sha256: 775f9fe47c18f8c6c4cb706c7837cc04cdc18e6a748fd8964e132d8329975eea category: dev optional: true - name: rpds-py - version: 0.22.3 + version: 0.23.1 manager: conda platform: win-64 dependencies: - python: '>=3.10,<3.11.0a0' + python: '' python_abi: 3.10.* ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/rpds-py-0.22.3-py310hc226416_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/rpds-py-0.23.1-py310h7c79e54_0.conda hash: - md5: 9830bfdf323849d4575a0036f184a3ad - sha256: 30ceeaf10fa48ac63ca5ef72e7ed611241c852f7f980fff1ac37571fde635b31 + md5: c449ac14d17f9139895fb1bc98294627 + sha256: b5d0e848c69dfcefaee5193298ce21aec0b76282eb8333bb20c2c5acb0e09fc8 category: dev optional: true - name: scikit-learn @@ -8410,12 +8520,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@56ab95c81266b9fd1df2cd820d0b8e8775309146 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 hash: - sha256: 56ab95c81266b9fd1df2cd820d0b8e8775309146 + sha256: 4d829b7b8759d7537a8184aa506548ddccf72041 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 category: main optional: false - name: geoapps-utils @@ -8427,12 +8537,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@56ab95c81266b9fd1df2cd820d0b8e8775309146 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 hash: - sha256: 56ab95c81266b9fd1df2cd820d0b8e8775309146 + sha256: 4d829b7b8759d7537a8184aa506548ddccf72041 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 category: main optional: false - name: geoh5py @@ -8470,49 +8580,49 @@ package: category: main optional: false - name: mira-simpeg - version: 0.21.2.2.dev104+g7efee14ab + version: 0.21.2.3a1.dev0 manager: pip platform: linux-64 dependencies: discretize: '>=0.10.0' empymod: '>=2.0.0' geoana: '>=0.5.0' - geoh5py: '>=0.11.0a1,<0.12' + geoh5py: '>=0.11.0a1,<0.12.dev' matplotlib: '*' numpy: '>=1.20' pandas: '*' - pymatsolver: '>=0.2,<0.3.0' + pymatsolver: '>=0.3,<0.4.dev' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 hash: - sha256: 7efee14ab487d289dc91da4fbf8358067078128e + sha256: 77e2a29a990686274b1901c4d2aacb258a5689a0 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 category: main optional: false - name: mira-simpeg - version: 0.21.2.2.dev104+g7efee14ab + version: 0.21.2.3a1.dev0 manager: pip platform: win-64 dependencies: discretize: '>=0.10.0' empymod: '>=2.0.0' geoana: '>=0.5.0' - geoh5py: '>=0.11.0a1,<0.12' + geoh5py: '>=0.11.0a1,<0.12.dev' matplotlib: '*' numpy: '>=1.20' pandas: '*' - pymatsolver: '>=0.2,<0.3.0' + pymatsolver: '>=0.3,<0.4.dev' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 hash: - sha256: 7efee14ab487d289dc91da4fbf8358067078128e + sha256: 77e2a29a990686274b1901c4d2aacb258a5689a0 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 category: main optional: false - name: octree-creation-app @@ -8525,12 +8635,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 hash: - sha256: 9d8f676abaef4ad28613fc37d8a9081ece6ae43a + sha256: 171c86d5648d4d8636692b97b3a72296b9d3b262 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 category: main optional: false - name: octree-creation-app @@ -8543,12 +8653,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 hash: - sha256: 9d8f676abaef4ad28613fc37d8a9081ece6ae43a + sha256: 171c86d5648d4d8636692b97b3a72296b9d3b262 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 category: main optional: false - name: param-sweeps diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 8b4b5212..1607aef5 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 4ae98973526361a18247a24da2c9fbe4b2d23567d24479936aa67a1cda88db94 - linux-64: 9763c24f54e81c96312618557d653c8994647978613de9b38a3a921c677567e2 + win-64: c6d99c4080206a6985500566195081cbee7ef83f67dcba0b13ab0757aa9bfb77 + linux-64: ccffba8d0ae8e720a8b58ff10c500924e5464136654551f2d25b30d05d85c2a2 channels: - url: conda-forge used_env_vars: [] @@ -3143,10 +3143,10 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.43-h712a8e2_2.conda + url: https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.43-h712a8e2_4.conda hash: - md5: 048b02e3962f066da18efe3a21b77672 - sha256: 7c91cea91b13f4314d125d1bedb9d03a29ebbd5080ccdea70260363424646dbe + md5: 01f8d123c96816249efd255a31ad7712 + sha256: db73f38155d901a610b2320525b9dd3b31e4949215c870685fd92ea61b5ce472 category: main optional: false - name: lerc @@ -3591,24 +3591,24 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=13' - url: https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.18-h4ce23a2_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.18-h4ce23a2_1.conda hash: - md5: 0743bcd51fc4e6e0367e0aaf41e9bebc - sha256: 659a83c0c184a30336ca512d670a7db56bfb5e289caa9ee641e6f78fd2326463 + md5: e796ff8ddc598affdf7c173d6145f087 + sha256: 18a4afe14f731bfb9cf388659994263904d20111e42f841e9eea1bb6f91f4ab4 category: main optional: false - name: libiconv - version: '1.17' + version: '1.18' manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libiconv-1.17-hcfcfb64_2.conda + url: https://conda.anaconda.org/conda-forge/win-64/libiconv-1.18-h135ad9c_1.conda hash: - md5: e1eb10b1cca179f2baa3601e4efc8712 - sha256: 5f844dd19b046d43174ad80c6ea75b5d504020e3b63cfbc4ace97b8730d35c7b + md5: 21fc5dba2cbcd8e5e26ff976a312122c + sha256: ea5ed2b362b6dbc4ba7188eb4eaf576146e3dfc6f4395e9f0db76ad77465f786 category: main optional: false - name: libjpeg-turbo @@ -3764,6 +3764,24 @@ package: sha256: cf8a594b697de103025dcae2c917ec9c100609caf7c917a94c64a683cb1db1ac category: main optional: false +- name: libscotch + version: 7.0.6 + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + bzip2: '>=1.0.8,<2.0a0' + libgcc: '>=13' + libgfortran: '' + libgfortran5: '>=13.3.0' + liblzma: '>=5.6.3,<6.0a0' + libzlib: '>=1.3.1,<2.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/libscotch-7.0.6-hea33c07_1.conda + hash: + md5: 1b600d55dcd98c958192a69a79e6acd2 + sha256: 8330bba8b7b3a37da6eca04bace985fb9f8d487d3249b8f690e8f4a3d8d3c7dc + category: main + optional: false - name: libsodium version: 1.0.20 manager: conda @@ -4015,19 +4033,19 @@ package: category: main optional: false - name: libxml2 - version: 2.13.5 + version: 2.13.6 manager: conda platform: win-64 dependencies: - libiconv: '>=1.17,<2.0a0' + libiconv: '>=1.18,<2.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/libxml2-2.13.5-he286e8c_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.13.6-he286e8c_0.conda hash: - md5: 77eaa84f90fc90643c5a0be0aa9bdd1b - sha256: 084dd4dde342f13c43ee418d153ac5b2610f95be029073a15fa9dda22b130d06 + md5: c66d5bece33033a9c028bbdf1e627ec5 + sha256: 2919f4e9fffefbf3ff6ecd8ebe81584d573c069b2b82eaeed797b1f56ac8d97b category: main optional: false - name: libzlib @@ -4095,6 +4113,20 @@ package: sha256: 5383e32604e03814b6011fa01a5332057934181a7ea0e90abba7890c17cabce6 category: main optional: false +- name: llvm-openmp + version: 19.1.7 + manager: conda + platform: win-64 + dependencies: + ucrt: '>=10.0.20348.0' + vc: '>=14.2,<15' + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/llvm-openmp-19.1.7-h30eaf37_0.conda + hash: + md5: f6076c844b630037f4a40fae12dc6e41 + sha256: 0dca936d558f986c9100e731483f6c3dbab6a0d9648ec4d8fa6c6f97e18e0325 + category: main + optional: false - name: llvmlite version: 0.44.0 manager: conda @@ -4435,6 +4467,20 @@ package: sha256: 78c1bbe1723449c52b7a9df1af2ee5f005209f67e40b6e1d3c7619127c43b1c7 category: dev optional: true +- name: metis + version: 5.1.0 + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libstdcxx: '>=13' + url: https://conda.anaconda.org/conda-forge/linux-64/metis-5.1.0-hd0bcaf9_1007.conda + hash: + md5: 28eb714416de4eb83e2cbc47e99a1b45 + sha256: e8a00971e6d00bd49f375c5d8d005b37a9abba0b1768533aed0f90a422bf5cc7 + category: main + optional: false - name: mistune version: 3.1.2 manager: conda @@ -4531,6 +4577,55 @@ package: sha256: 99358d58d778abee4dca82ad29fb58058571f19b0f86138363c260049d4ac7f1 category: main optional: false +- name: mumps-include + version: 5.7.3 + manager: conda + platform: linux-64 + dependencies: {} + url: https://conda.anaconda.org/conda-forge/linux-64/mumps-include-5.7.3-ha770c72_7.conda + hash: + md5: dc10f13639b574503ededf0bb180d357 + sha256: 714110d4704cd585fe0434fd99ae2e43132174a6609918c5939aa6aae947612a + category: main + optional: false +- name: mumps-seq + version: 5.7.3 + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + _openmp_mutex: '>=4.5' + libblas: '>=3.9.0,<4.0a0' + libgcc: '>=13' + libgfortran: '' + libgfortran5: '>=13.3.0' + 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_7.conda + hash: + md5: 46523370432ffd9ed12a2aba5dda8db8 + sha256: 4d8c076a3b7821dec3a753b4260737aed81c447a91baf50c38c095557e59bd90 + category: main + optional: false +- name: mumps-seq + version: 5.7.3 + manager: conda + platform: win-64 + dependencies: + libblas: '>=3.9.0,<4.0a0' + liblapack: '>=3.9.0,<4.0a0' + llvm-openmp: '>=19.1.7' + 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_7.conda + hash: + md5: 9483f654b63889300902eb57227c1faf + sha256: d8451cc9a924ae671cd4aab78fcdf16ab1fd0c8e2463b5f4bc78acd400e66b3b + category: main + optional: false - name: munkres version: 1.1.4 manager: conda @@ -5907,57 +6002,35 @@ package: category: dev optional: true - name: pymatsolver - version: 0.2.0 + version: 0.3.1 manager: conda platform: linux-64 dependencies: - pydiso: '' - pymatsolver-base: 0.2.0 - url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-0.2.0-ha770c72_3.conda + numpy: '>=1.21' + packaging: '' + pydiso: '>=0.1' + python: '>=3.10' + scipy: '>=1.8' + url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-0.3.1-pyh48887ae_201.conda hash: - md5: 71c5698e2f1f19b16164bae528b143ca - sha256: 8d16b3c276ffd5f35890bba6539f3f526cc93061b0320eee2c8d488e7d5089de + md5: b6805e522702eabf2ebbd236490d5eed + sha256: d49ad9b58b9eeae204a3677cafc389c00c7f0f830ef76f481ab9aaf3e0260bad category: main optional: false - name: pymatsolver - version: 0.2.0 - manager: conda - platform: win-64 - dependencies: - pydiso: '' - pymatsolver-base: 0.2.0 - url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-0.2.0-ha770c72_3.conda - hash: - md5: 71c5698e2f1f19b16164bae528b143ca - sha256: 8d16b3c276ffd5f35890bba6539f3f526cc93061b0320eee2c8d488e7d5089de - category: main - optional: false -- name: pymatsolver-base - version: 0.2.0 - manager: conda - platform: linux-64 - dependencies: - numpy: '' - python: '' - scipy: '' - url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-base-0.2.0-pyh44b312d_3.conda - hash: - md5: d3843c2374465a0d1a0eb15cc87669c4 - sha256: d03fd3f24f87d7c07675b15129b6e481485500304e03aae35eb93224e2f757b1 - category: main - optional: false -- name: pymatsolver-base - version: 0.2.0 + version: 0.3.1 manager: conda platform: win-64 dependencies: - numpy: '' - python: '' - scipy: '' - url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-base-0.2.0-pyh44b312d_3.conda + numpy: '>=1.21' + packaging: '' + pydiso: '>=0.1' + python: '>=3.10' + scipy: '>=1.8' + url: https://conda.anaconda.org/conda-forge/noarch/pymatsolver-0.3.1-pyh48887ae_201.conda hash: - md5: d3843c2374465a0d1a0eb15cc87669c4 - sha256: d03fd3f24f87d7c07675b15129b6e481485500304e03aae35eb93224e2f757b1 + md5: b6805e522702eabf2ebbd236490d5eed + sha256: d49ad9b58b9eeae204a3677cafc389c00c7f0f830ef76f481ab9aaf3e0260bad category: main optional: false - name: pyparsing @@ -6204,6 +6277,43 @@ package: sha256: 4790787fe1f4e8da616edca4acf6a4f8ed4e7c6967aa31b920208fc8f95efcca category: dev optional: true +- name: python-mumps + version: 0.0.3 + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + mumps-seq: '>=5.7.3,<5.7.4.0a0' + numpy: '>=1.19,<3' + python: '>=3.11,<3.12.0a0' + python_abi: 3.11.* + scipy: '>=1.8' + url: https://conda.anaconda.org/conda-forge/linux-64/python-mumps-0.0.3-py311h4b558b0_0.conda + hash: + md5: 5c50e4db02aa7d89b5200773605175e1 + sha256: a46217f37ead2d17a59626d8f23517ba0f3026b9dd281ec251e880b3afe4cb13 + category: main + optional: false +- name: python-mumps + version: 0.0.3 + manager: conda + platform: win-64 + dependencies: + mumps-seq: '>=5.7.3,<5.7.4.0a0' + numpy: '>=1.19,<3' + python: '>=3.11,<3.12.0a0' + python_abi: 3.11.* + scipy: '>=1.8' + ucrt: '>=10.0.20348.0' + vc: '>=14.2,<15' + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/python-mumps-0.0.3-py311h5bfbc98_0.conda + hash: + md5: 5e8a15c6501520752ca264fa7a1a762d + sha256: 330afd54afd2087de0aa320be05dbbee64893359fe395067209e8c8fd9650b05 + category: main + optional: false - name: python-tzdata version: '2023.4' manager: conda @@ -6532,34 +6642,34 @@ package: category: dev optional: true - name: rpds-py - version: 0.22.3 + version: 0.23.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=13' - python: '>=3.11,<3.12.0a0' + python: '' python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.22.3-py311h9e33e62_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.23.1-py311h687327b_0.conda hash: - md5: b1f5799ae0cc22198928f09879da01f5 - sha256: 0908ac4acb1a10fe63046e947a96c77cea0d392619ef965944da86c3574b68ec + md5: d35b446856b4d6644a469fd01838baff + sha256: 754d8eff118a6a01f4eb0e8bc6be7be8872f54826d6ff0402eac08d308b01099 category: dev optional: true - name: rpds-py - version: 0.22.3 + version: 0.23.1 manager: conda platform: win-64 dependencies: - python: '>=3.11,<3.12.0a0' + python: '' python_abi: 3.11.* ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/rpds-py-0.22.3-py311h533ab2d_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/rpds-py-0.23.1-py311ha250665_0.conda hash: - md5: 40c964a32833f3ad13ba4183cd180577 - sha256: c74b3a4430706dfb63176429cc31410dcb86a15e1d35463aae04733c4700b8d8 + md5: 8fd1344d7369c84eb7cf4c316ab86518 + sha256: 72ca8e7d54f79e6a99827576e53a277796ab8f4d912eba33e3b949cd757a77f7 category: dev optional: true - name: scikit-learn @@ -8496,12 +8606,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@56ab95c81266b9fd1df2cd820d0b8e8775309146 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 hash: - sha256: 56ab95c81266b9fd1df2cd820d0b8e8775309146 + sha256: 4d829b7b8759d7537a8184aa506548ddccf72041 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 category: main optional: false - name: geoapps-utils @@ -8513,12 +8623,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@56ab95c81266b9fd1df2cd820d0b8e8775309146 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 hash: - sha256: 56ab95c81266b9fd1df2cd820d0b8e8775309146 + sha256: 4d829b7b8759d7537a8184aa506548ddccf72041 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@56ab95c81266b9fd1df2cd820d0b8e8775309146 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 category: main optional: false - name: geoh5py @@ -8556,49 +8666,49 @@ package: category: main optional: false - name: mira-simpeg - version: 0.21.2.2.dev104+g7efee14ab + version: 0.21.2.3a1.dev0 manager: pip platform: linux-64 dependencies: discretize: '>=0.10.0' empymod: '>=2.0.0' geoana: '>=0.5.0' - geoh5py: '>=0.11.0a1,<0.12' + geoh5py: '>=0.11.0a1,<0.12.dev' matplotlib: '*' numpy: '>=1.20' pandas: '*' - pymatsolver: '>=0.2,<0.3.0' + pymatsolver: '>=0.3,<0.4.dev' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 hash: - sha256: 7efee14ab487d289dc91da4fbf8358067078128e + sha256: 77e2a29a990686274b1901c4d2aacb258a5689a0 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 category: main optional: false - name: mira-simpeg - version: 0.21.2.2.dev104+g7efee14ab + version: 0.21.2.3a1.dev0 manager: pip platform: win-64 dependencies: discretize: '>=0.10.0' empymod: '>=2.0.0' geoana: '>=0.5.0' - geoh5py: '>=0.11.0a1,<0.12' + geoh5py: '>=0.11.0a1,<0.12.dev' matplotlib: '*' numpy: '>=1.20' pandas: '*' - pymatsolver: '>=0.2,<0.3.0' + pymatsolver: '>=0.3,<0.4.dev' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 hash: - sha256: 7efee14ab487d289dc91da4fbf8358067078128e + sha256: 77e2a29a990686274b1901c4d2aacb258a5689a0 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 category: main optional: false - name: octree-creation-app @@ -8611,12 +8721,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 hash: - sha256: 9d8f676abaef4ad28613fc37d8a9081ece6ae43a + sha256: 171c86d5648d4d8636692b97b3a72296b9d3b262 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 category: main optional: false - name: octree-creation-app @@ -8629,12 +8739,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 hash: - sha256: 9d8f676abaef4ad28613fc37d8a9081ece6ae43a + sha256: 171c86d5648d4d8636692b97b3a72296b9d3b262 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 category: main optional: false - name: param-sweeps diff --git a/pyproject.toml b/pyproject.toml index d24dfd6c..05897dfd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,31 +34,30 @@ dask = {version = "2024.6.*", extras = ["distributed"]} # also in simpeg[dask] discretize = "0.10.*" # also in simpeg, octree-creation-app distributed = "2024.6.*" # because conda-lock doesn't take dask extras into account numpy = "~1.26.0" # also in geoh5py, simpeg -pydiso = "0.1.*" # not imported, but required at runtime for simpeg scipy = "~1.14.0" +# solvers for simpeg: not imported, but at least one required at runtime +pydiso = ">=0.1.0, <0.2.dev" +python-mumps = ">=0.0.3, <0.0.4.dev" + ## Pip dependencies from Git repositories #---------------------------------------- -#geoh5py = {version = ">=0.10.1rc1, <0.11.0a.dev", source = "pypi", allow-prereleases = true} +#geoh5py = {version = ">=0.10.1, <0.11.dev", source = "pypi", allow-prereleases = true} geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"} -#octree-creation-app = {version = ">=0.2.0rc1, <0.3.0a.dev", source = "pypi", allow-prereleases = true} +#octree-creation-app = {version = ">=0.2.0, <0.3.dev", source = "pypi", allow-prereleases = true} octree-creation-app = {git = "https://github.com/MiraGeoscience/octree-creation-app.git", rev = "develop"} -#geoapps-utils = {version = ">=0.4.0rc1, <0.5.0a.dev", source = "pypi", allow-prereleases = true} +#geoapps-utils = {version = ">=0.4.0, <0.5.dev", source = "pypi", allow-prereleases = true} geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"} -#mira-simpeg = {version = ">=0.21.2.1rc1, <0.21.2.2a.dev", source="pypi", allow-prereleases = true, extras = ["dask"]} +#mira-simpeg = {version = ">=0.21.2.2a1, <0.21.3.dev", source="pypi", allow-prereleases = true, extras = ["dask"]} mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "develop", extras = ["dask"]} -#param-sweeps = {version = ">=0.2.0rc1, <0.3.0a.dev", source = "pypi", allow-prereleases = true} +#param-sweeps = {version = ">=0.2.0, <0.3.dev", source = "pypi", allow-prereleases = true} param-sweeps = {git = "https://github.com/MiraGeoscience/param-sweeps.git", rev = "develop"} -## force some versions to resolve incompatible resolution between PyPI and Conda -#------------------------------------------------------------------------------- -pymatsolver = {version = "0.2.*", source = "pypi"} - ## about pip dependencies # to be specified to work with conda-lock # - from PyPI: my_package = { version = "1.2.3", source = "pypi" } @@ -94,21 +93,20 @@ libblas = "*=*mkl" # because simpeg already brings in the MKL ## indirect dependencies, forcing them here for installation through Conda not pip #--------------------------------------------------------------------------------- -Pillow = ">=10.3.0, <10.4.0" # from geoh5py +empymod = ">=2.2.1, <2.3.dev" # from simpeg and geoana bokeh = ">=3.6.0, <3.7.0" # from simpeg -empymod = ">=2.2.1, <2.3.0" # from simpeg and geoana fsspec = "2022.*" # from simpeg[dask] -geoana = ">=0.5.0, <0.6.0" # from simpeg -h5py = ">=3.2.1, <4.0.0" # from geoh5py -matplotlib-base = ">=3.8.4, <3.9.0" # from simpeg -mkl = "2023.2, <2024.1" # from simpeg -pandas = ">=2.2.1, <2.3.0" # from SimPEG, also used by targeting-workflow, petro-lingo -pydantic = ">=2.5.2, <3.0.0" # from geoh5py, geoapps-utils -pydiso = ">=0.1.0, <0.2.0" # from simpeg -pymatsolver = ">=0.2.0, <0.3.0" # from simpeg -scikit-learn = ">=1.4.0, <1.5.0" # from SimPEG, also used by geo-unsup-mapper, petro-lingo -tqdm = ">=4.66.1, <5.0.0" # from simpeg -zarr = ">=2.14.2, <2.15.0" # from simpeg[dask] +geoana = ">=0.5.0, <0.6.dev" # from simpeg +h5py = ">=3.2.1, <4.0.dev" # from geoh5py +matplotlib-base = ">=3.8.4, <3.9.dev" # from simpeg +mkl = "2023.2, <2024.1" +pandas = ">=2.2.1, <2.3.dev" # from SimPEG, also used by targeting-workflow, petro-lingo +Pillow = ">=10.3.0, <10.4.dev" # from geoh5py +pydantic = ">=2.5.2, <3.0.dev" # from geoh5py, geoapps-utils +pymatsolver = ">=0.3.0, <0.4.dev" # from simpeg +scikit-learn = ">=1.4.0, <1.5.dev" # from SimPEG, also used by geo-unsup-mapper, petro-lingo +tqdm = ">=4.66.1, <5.0.dev" # from simpeg +zarr = ">=2.14.2, <2.15.dev" # from simpeg[dask] # force some versions to resolve incompatible resolution between PyPI and Conda #------------------------------------------------------------------------------ diff --git a/recipe.yaml b/recipe.yaml index 561afc6d..a81980fa 100644 --- a/recipe.yaml +++ b/recipe.yaml @@ -1,8 +1,9 @@ schema_version: 1 context: - name: simpeg-drivers - version: 0.3.0a1 + name: "simpeg-drivers" + version: "0.3.0a1" + python_min: "3.10" package: name: ${{ name|lower }} @@ -18,39 +19,40 @@ build: requirements: host: - - python >=3.10, <3.11 + - python 3.10.* - poetry-core >=1.0.0 - setuptools - pip run: - - python >=3.10,<3.11 - - dask-core 2024.06.* - - discretize >=0.10.0,<0.11.0 - - distributed >=2024.06.* - - numpy >=1.26.0,<1.27.0 - - scipy >=1.14.0,<1.15.0 - - geoh5py >=0.11.0a1,<0.12.0a.dev - - octree-creation-app >=0.3.0a1,<0.4.0a.dev - - geoapps-utils >=0.5.0a1,<0.6.0a.dev - - mira-simpeg >=0.22.0.1a1,<0.22.1a.dev - - param-sweeps >=0.3.0a1,<0.4.0a.dev - - pillow >=10.3.0 - - empymod >=2.2.1,<2.3.0 - - geoana >=0.5.0,<0.6.0 - - h5py >=3.2.1,<4.0.0 - - matplotlib-base >=3.8.4,<3.9.0 - - mkl >=2023.2, <2023.3 - - pandas >=2.2.1,<2.3.0 - - pydantic >=2.5.2,<3.0.0 - - pydiso >=0.1.0, <0.2.0 - - pymatsolver >=0.2.0,<0.3.0 - - scikit-learn >=1.4.0,<1.5.0 - - tqdm >=4.66.1,<5.0.0 - - zarr >=2.14.2,<2.15.0 + - python >=${{ python_min }} + # Mira packages + - geoapps-utils >=0.5.0a1, <0.6.dev + - geoh5py >=0.11.0a1, <0.12.dev + - octree-creation-app >=0.3.0a1, <0.4.dev + - mira-simpeg >=0.21.2.3a1, <0.21.4.dev + - param-sweeps >=0.3.0a1, <0.4.dev + # direct dependencies + - dask-core >=2024.06, <2024.07.dev + - discretize >=0.10.0, <0.11.dev + - distributed >=2024.06, <2024.07.dev + - numpy >=1.26.0, <1.27.dev + - scipy >=1.14.0, <1.15.dev + - pydiso >=0.1.0, <0.2.dev + - python-mumps >=0.0.3, <0.0.4.dev + # indirect dependencies + - empymod >=2.2.1, <2.3.dev + - fsspec >=2022.0, <2023.0.dev + - geoana >=0.5.0, <0.6.dev + - matplotlib-base >=3.8.4, <3.9.dev + - pandas >=2.2.1, <2.3.dev + - pymatsolver >=0.3.0, <0.4.dev + - scikit-learn >=1.4.0, <1.5.dev + - tqdm >=4.66.1, <5.0.dev + - zarr >=2.14.2, <2.15.dev run_constraints: - - tbb 2021.12.* - - python-tzdata 2023.4.* - __glibc >=2.17 + - python-tzdata >=2023.4.0, <2023.5.dev + - tbb >=2021.12.0, <2021.13.dev about: license: MIT @@ -59,5 +61,5 @@ about: extra: recipe-maintainers: - - SophieCurinier + - andrewg-mira - sebhmg diff --git a/tests/run_tests/driver_airborne_tem_test.py b/tests/run_tests/driver_airborne_tem_test.py index 8c5d79d9..8dbf413d 100644 --- a/tests/run_tests/driver_airborne_tem_test.py +++ b/tests/run_tests/driver_airborne_tem_test.py @@ -15,6 +15,7 @@ import numpy as np from geoh5py.groups import SimPEGGroup from geoh5py.workspace import Workspace +from pymatsolver.direct import Mumps from pytest import raises from simpeg_drivers.electromagnetics.time_domain import ( @@ -102,6 +103,8 @@ def test_airborne_tem_fwr_run( ) fwr_driver = TDEMForwardDriver(params) + + fwr_driver.data_misfit.objfcts[0].simulation.solver = Mumps fwr_driver.run() @@ -188,7 +191,9 @@ def test_airborne_tem_run(tmp_path: Path, max_iterations=1, pytest=True): ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") - driver = TDEMInversionDriver.start(str(tmp_path / "Inv_run.ui.json")) + driver = TDEMInversionDriver(params) + driver.data_misfit.objfcts[0].simulation.solver = Mumps + driver.run() with geoh5.open() as run_ws: output = get_inversion_output( diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py index f5cd2600..2b6259f9 100644 --- a/tests/run_tests/driver_ground_tem_test.py +++ b/tests/run_tests/driver_ground_tem_test.py @@ -15,6 +15,7 @@ import numpy as np from geoh5py.workspace import Workspace +from pymatsolver.direct import Mumps from simpeg_drivers.electromagnetics.time_domain import ( TDEMForwardOptions, @@ -131,6 +132,7 @@ def test_ground_tem_fwr_run( assert "closed" in caplog.records[0].message + fwr_driver.data_misfit.objfcts[0].simulation.solver = Mumps fwr_driver.run() @@ -215,7 +217,9 @@ def test_ground_tem_run(tmp_path: Path, max_iterations=1, pytest=True): ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") - driver = TDEMInversionDriver.start(str(tmp_path / "Inv_run.ui.json")) + driver = TDEMInversionDriver(params) + driver.data_misfit.objfcts[0].simulation.solver = Mumps + driver.run() with geoh5.open() as run_ws: output = get_inversion_output(