Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
1c8ade1
[GEOPY-2009] use newer MKL for compatibility with PyTorch 2.5
sebhmg Feb 11, 2025
dab6040
Bump pymatsolver
domfournier Feb 11, 2025
38c2513
Add python mumps
domfournier Feb 11, 2025
873cedb
TRy running failing tests with Mumps
domfournier Feb 11, 2025
e61b6cd
Update values in test
domfournier Feb 11, 2025
a23fa42
Update target value for gtem
domfournier Feb 11, 2025
a623905
Swap for Mumps in run
domfournier Feb 11, 2025
cee901e
[GEOPY-2009] consistently set pymatsolver version to >=0.3
sebhmg Feb 13, 2025
b79c3f1
[GEOPY-2009] fix version constraints upper bound with .dev
sebhmg Feb 13, 2025
8e9f8c7
[GEOPY-2009] no more pymatsolver conflict with pypi
sebhmg Feb 13, 2025
bd01281
[GEOPY-2009] do not force mkl version: just get the latest compatible…
sebhmg Feb 13, 2025
11ed1f7
[GEOPY-2009] relock conda env
sebhmg Feb 13, 2025
a69c849
[GEOPY-2009] bump version to alpha.2
sebhmg Feb 13, 2025
f52a7ba
[GEOPY-2009] move pydiso and mumps as direct dependencies
sebhmg Feb 13, 2025
83a3728
[GEOPY-2009] add python-mumps to conda recipe
sebhmg Feb 13, 2025
3e0ef85
[GEOPY-2009] sort dependency list
sebhmg Feb 13, 2025
65c83f0
[GEOPY-2009] organize dependencies in groups
sebhmg Feb 13, 2025
a9c5298
[GEOPY-2009] convert Conda recipe to rattler
sebhmg Feb 13, 2025
e2afb0e
[GEOPY-2009] use non-prerelease versions of Mira packages
sebhmg Feb 13, 2025
c976522
[GEOPY-2009] use non-rc geoh5py
sebhmg Feb 13, 2025
67e6b04
[GEOPY-2009] remove geoh5py dependencies from conda recipe
sebhmg Feb 13, 2025
d704670
[GEOPY-2009] Merge pull request #134 from MiraGeoscience/DEVOPS-635
Swendart Jan 31, 2025
69823d1
[GEOPY-2009] relock on non-rc geoh5py
sebhmg Feb 13, 2025
c16cbb3
[GEOPY-2009] relock on mira-simpeg using too pymatsolver 0.3
sebhmg Feb 13, 2025
9ac6cc4
Merge pull request #144 from MiraGeoscience/GEOPY-2009
sebhmg Feb 13, 2025
56fcc54
set version ot release 0.2.1
sebhmg Feb 20, 2025
7cb6a1b
Merge branch 'hotfix/0.2.1'
sebhmg Feb 20, 2025
5eb2166
Merge branch 'main' into develop
sebhmg Feb 20, 2025
c1af38b
Merge remote-tracking branch 'upstream/develop' into merge_main_to_de…
sebhmg Feb 20, 2025
2655e32
Re-adjust tests
domfournier Feb 21, 2025
ca49f71
Refresh locks
domfournier Feb 21, 2025
dafaf6c
Merge branch 'develop' into merge_main_to_develop
domfournier Feb 21, 2025
ad08d5e
Re-try with pardiso
domfournier Feb 21, 2025
e5c6898
One more mumps
domfournier Feb 21, 2025
1129c99
TRying pinning down mkl
domfournier Feb 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
22 changes: 13 additions & 9 deletions environments/py-3.10-linux-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: d73ecef65ed7b0f752cc2f320c00b21f7170a26ac3e84514a882fcfe83a9605f
# input_hash: 17857417d27d428057789120a0f069eb7b327a7011fd37401afcd9e52eb22c4b

channels:
- conda-forge
Expand Down Expand Up @@ -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
Expand All @@ -129,14 +129,15 @@ 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
- liblzma=5.6.4=hb9d3cd8_0
- 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
Expand All @@ -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
Copy link
Contributor Author

@sebhmg sebhmg Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@domfournier, no, it cannot be back to 2023, as it is not compatible with the version of pytorch we use in other packages

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows tests don't pass otherwise

- 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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
20 changes: 12 additions & 8 deletions environments/py-3.10-linux-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: d73ecef65ed7b0f752cc2f320c00b21f7170a26ac3e84514a882fcfe83a9605f
# input_hash: 17857417d27d428057789120a0f069eb7b327a7011fd37401afcd9e52eb22c4b

channels:
- conda-forge
Expand Down Expand Up @@ -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
Expand All @@ -69,14 +69,15 @@ 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
- liblzma=5.6.4=hb9d3cd8_0
- 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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
20 changes: 11 additions & 9 deletions environments/py-3.10-win-64-dev.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 545961761a6fd7c3db8ccd2c6af47188a38d76093c7c2ecafb61582fdd424d2d
# input_hash: 0d852099be807f95bca241635e52da6569ebdf2d04351127e00b6b7aa7eb7c7b

channels:
- conda-forge
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
18 changes: 10 additions & 8 deletions environments/py-3.10-win-64.conda.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
# input_hash: 545961761a6fd7c3db8ccd2c6af47188a38d76093c7c2ecafb61582fdd424d2d
# input_hash: 0d852099be807f95bca241635e52da6569ebdf2d04351127e00b6b7aa7eb7c7b

channels:
- conda-forge
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Loading
Loading