-
Notifications
You must be signed in to change notification settings - Fork 2
Merge main branch to develop #151
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
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 dab6040
Bump pymatsolver
domfournier 38c2513
Add python mumps
domfournier 873cedb
TRy running failing tests with Mumps
domfournier e61b6cd
Update values in test
domfournier a23fa42
Update target value for gtem
domfournier a623905
Swap for Mumps in run
domfournier cee901e
[GEOPY-2009] consistently set pymatsolver version to >=0.3
sebhmg b79c3f1
[GEOPY-2009] fix version constraints upper bound with .dev
sebhmg 8e9f8c7
[GEOPY-2009] no more pymatsolver conflict with pypi
sebhmg bd01281
[GEOPY-2009] do not force mkl version: just get the latest compatible…
sebhmg 11ed1f7
[GEOPY-2009] relock conda env
sebhmg a69c849
[GEOPY-2009] bump version to alpha.2
sebhmg f52a7ba
[GEOPY-2009] move pydiso and mumps as direct dependencies
sebhmg 83a3728
[GEOPY-2009] add python-mumps to conda recipe
sebhmg 3e0ef85
[GEOPY-2009] sort dependency list
sebhmg 65c83f0
[GEOPY-2009] organize dependencies in groups
sebhmg a9c5298
[GEOPY-2009] convert Conda recipe to rattler
sebhmg e2afb0e
[GEOPY-2009] use non-prerelease versions of Mira packages
sebhmg c976522
[GEOPY-2009] use non-rc geoh5py
sebhmg 67e6b04
[GEOPY-2009] remove geoh5py dependencies from conda recipe
sebhmg d704670
[GEOPY-2009] Merge pull request #134 from MiraGeoscience/DEVOPS-635
Swendart 69823d1
[GEOPY-2009] relock on non-rc geoh5py
sebhmg c16cbb3
[GEOPY-2009] relock on mira-simpeg using too pymatsolver 0.3
sebhmg 9ac6cc4
Merge pull request #144 from MiraGeoscience/GEOPY-2009
sebhmg 56fcc54
set version ot release 0.2.1
sebhmg 7cb6a1b
Merge branch 'hotfix/0.2.1'
sebhmg 5eb2166
Merge branch 'main' into develop
sebhmg c1af38b
Merge remote-tracking branch 'upstream/develop' into merge_main_to_de…
sebhmg 2655e32
Re-adjust tests
domfournier ca49f71
Refresh locks
domfournier dafaf6c
Merge branch 'develop' into merge_main_to_develop
domfournier ad08d5e
Re-try with pardiso
domfournier e5c6898
One more mumps
domfournier 1129c99
TRying pinning down mkl
domfournier File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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