Skip to content

GEOPY-2029: Update Simpeg 0.21.2 to 0.23#156

Merged
domfournier merged 17 commits intodevelopfrom
GEOPY-2029
Mar 3, 2025
Merged

GEOPY-2029: Update Simpeg 0.21.2 to 0.23#156
domfournier merged 17 commits intodevelopfrom
GEOPY-2029

Conversation

@domfournier
Copy link
Collaborator

@domfournier domfournier commented Feb 28, 2025

GEOPY-2029 - Update Simpeg 0.21.2 to 0.23

@github-actions github-actions bot changed the title GEOPY-2029 GEOPY-2029: Update Simpeg 0.21.2 to 0.23 Feb 28, 2025
benk-mira
benk-mira previously approved these changes Feb 28, 2025
Copy link
Contributor

@benk-mira benk-mira left a comment

Choose a reason for hiding this comment

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

Weren't there a couple API updates on the simpeg PR? I was expecting some updates to factories..

sebhmg added 5 commits March 1, 2025 00:29
- scikit-learn is a direct dependency
- newer version of geoana
- no indirect dependency on pandas
- no indirect dependency on empymod
…EOPY-2029-seb

# Conflicts:
#	environments/py-3.10-linux-64-dev.conda.lock.yml
#	environments/py-3.10-linux-64.conda.lock.yml
#	environments/py-3.10-win-64-dev.conda.lock.yml
#	environments/py-3.10-win-64.conda.lock.yml
#	environments/py-3.11-linux-64-dev.conda.lock.yml
#	environments/py-3.11-linux-64.conda.lock.yml
#	environments/py-3.11-win-64-dev.conda.lock.yml
#	environments/py-3.11-win-64.conda.lock.yml
#	py-3.10.conda-lock.yml
#	py-3.11.conda-lock.yml
#	pyproject.toml
@sebhmg
Copy link
Contributor

sebhmg commented Mar 3, 2025

I cannot make a global environment with pytorch >= 2.5 and mkl 2023
and I cannot install pytorch-cpu < 2.5 from conda-forge

Is there an issue to try and fix expected results with mkl 2024 ?

See my comments on test results with mkl 2024 here: #157 (comment)

@domfournier
Copy link
Collaborator Author

domfournier commented Mar 3, 2025

I cannot make a global environment with pytorch >= 2.5 and mkl 2023 and I cannot install pytorch-cpu < 2.5 from conda-forge

Is there an issue to try and fix expected results with mkl 2024 ?

See my comments on test results with mkl 2024 here: #157 (comment)

The results are nonsensical and not reproducible locally with what gitactions is returning. So definitely don't want to pin our target on this. The target changes by just moving the version of mkl is exactly why we put those tests in place. The versions should not affect the results from the direct solver.

I don't know what to tell you.

@sebhmg
Copy link
Contributor

sebhmg commented Mar 3, 2025

I don't know what to tell you.

we cannot just keep mkl 2023. It needs to update to 2024 because of pytorch...

Suggestions:

  • skip the test only for Windows and be happy as long as they pass on Linux?
  • use different test input that would not have a similar issue?

…-drivers into GEOPY-2029

# Conflicts:
#	environments/py-3.10-linux-64-dev.conda.lock.yml
#	environments/py-3.10-linux-64.conda.lock.yml
#	environments/py-3.10-win-64-dev.conda.lock.yml
#	environments/py-3.10-win-64.conda.lock.yml
#	environments/py-3.11-linux-64-dev.conda.lock.yml
#	environments/py-3.11-linux-64.conda.lock.yml
#	environments/py-3.11-win-64-dev.conda.lock.yml
#	environments/py-3.11-win-64.conda.lock.yml
#	py-3.10.conda-lock.yml
#	py-3.11.conda-lock.yml
#	pyproject.toml
@codecov
Copy link

codecov bot commented Mar 3, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.22%. Comparing base (a2da710) to head (d8c299a).
Report is 18 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #156      +/-   ##
===========================================
+ Coverage    88.95%   89.22%   +0.26%     
===========================================
  Files           77       80       +3     
  Lines         3940     4482     +542     
  Branches       547      607      +60     
===========================================
+ Hits          3505     3999     +494     
- Misses         302      329      +27     
- Partials       133      154      +21     

see 3 files with indirect coverage changes

@domfournier domfournier requested a review from sebhmg March 3, 2025 19:26
@domfournier domfournier merged commit 0f84bdb into develop Mar 3, 2025
12 checks passed
@domfournier domfournier deleted the GEOPY-2029 branch March 3, 2025 19:36

[tool.poetry.dependencies]
python = "^3.10"
python = "^3.10, <3.12" # geoana does not support 3.12 yet
Copy link
Contributor

Choose a reason for hiding this comment

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

not true anymore with geoana >0.7.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants