Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update lockfiles and fix for new esmpy #342

Merged
merged 15 commits into from
Apr 25, 2024
Merged

Update lockfiles and fix for new esmpy #342

merged 15 commits into from
Apr 25, 2024

Conversation

stephenworsley
Copy link
Contributor

Replaces #335 and adds a fix.

@stephenworsley stephenworsley mentioned this pull request Apr 23, 2024
Merged
@stephenworsley
Merge branch 'main' into fix_for_esmpy_8.6
12b28be 
* main:
  Fix for esmpy (SciTools#353)
  Fix usage of map_blocks (SciTools#338)

# Conflicts:
#	.github/workflows/ci-tests.yml
#	.github/workflows/ci-wheels.yml
#	esmf_regrid/experimental/unstructured_regrid.py
#	noxfile.py
#	pyproject.toml
#	requirements/py312.yml
@codecov Codecov
Copy link

codecov bot commented Apr 24, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.85%. Comparing base (94f3e05) to head (7696d49).

Additional details and impacted files 
@@           Coverage Diff           @@
##             main     #342   +/-   ##
=======================================
  Coverage   98.85%   98.85%           
=======================================
  Files          36       36           
  Lines        3855     3855           
=======================================
  Hits         3811     3811           
  Misses         44       44

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

bjlittle
bjlittle reviewed Apr 25, 2024
View reviewed changes
noxfile.py Show resolved Hide resolved
@bjlittle bjlittle self-requested a review April 25, 2024 13:05
bjlittle
bjlittle approved these changes Apr 25, 2024
View reviewed changes
Copy link
Member

@bjlittle bjlittle left a comment

Choose a reason for hiding this comment

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

@stephenworsley Great work! 💯

Thanks for sticking with it and seeing this over the line.

Happy with the benchmark regression after discussing implications 👍

@bjlittle bjlittle merged commit 01369d1 into SciTools:main Apr 25, 2024
15 of 16 checks passed
stephenworsley added a commit to stephenworsley/iris-esmf-regrid that referenced this pull request Apr 25, 2024
@stephenworsley
Merge branch 'main' into dtype_fix
909a5c0 
* main: (42 commits)
  Update lockfiles and fix for new esmpy (SciTools#342)
  Fix for esmpy (SciTools#353)
  Fix usage of map_blocks (SciTools#338)
  Revert "Updated environment lockfiles (SciTools#335)" (SciTools#341)
  Updated environment lockfiles (SciTools#335)
  Bump actions/cache from 3 to 4 (SciTools#333)
  Bump actions/upload-artifact from 3 to 4 (SciTools#324)
  Bump actions/stale from 8.0.0 to 9.0.0 (SciTools#322)
  fix asv (SciTools#339)
  [pre-commit.ci] pre-commit autoupdate (SciTools#330)
  Bump scitools/workflows from 2023.09.0 to 2024.01.0 (SciTools#334)
  Updated environment lockfiles (SciTools#327)
  [pre-commit.ci] pre-commit autoupdate (SciTools#328)
  Updated environment lockfiles (SciTools#304)
  Add CITATION.cff (SciTools#319)
  updated for enums (SciTools#293)
  Flake8 compliant type checking. (SciTools#316)
  update to v0.10.dev0 (SciTools#314)
  Update to v0.9 (SciTools#313)
  First pass at mesh to mesh (SciTools#311)
  ...

# Conflicts:
#	CHANGELOG.md
#	esmf_regrid/esmf_regridder.py
#	esmf_regrid/schemes.py
stephenworsley added a commit to stephenworsley/iris-esmf-regrid that referenced this pull request May 2, 2024
@stephenworsley
Merge branch 'main' into boundless_coords
dd2a8da 
* main: (29 commits)
  Bump scitools/workflows from 2024.01.0 to 2024.04.3 (SciTools#356)
  Bump peter-evans/create-pull-request from 5.0.2 to 6.0.5 (SciTools#355)
  [pre-commit.ci] pre-commit autoupdate (SciTools#336)
  Updated environment lockfiles (SciTools#344)
  Update lockfiles and fix for new esmpy (SciTools#342)
  Fix for esmpy (SciTools#353)
  Fix usage of map_blocks (SciTools#338)
  Revert "Updated environment lockfiles (SciTools#335)" (SciTools#341)
  Updated environment lockfiles (SciTools#335)
  Bump actions/cache from 3 to 4 (SciTools#333)
  Bump actions/upload-artifact from 3 to 4 (SciTools#324)
  Bump actions/stale from 8.0.0 to 9.0.0 (SciTools#322)
  fix asv (SciTools#339)
  [pre-commit.ci] pre-commit autoupdate (SciTools#330)
  Bump scitools/workflows from 2023.09.0 to 2024.01.0 (SciTools#334)
  Updated environment lockfiles (SciTools#327)
  [pre-commit.ci] pre-commit autoupdate (SciTools#328)
  Updated environment lockfiles (SciTools#304)
  Add CITATION.cff (SciTools#319)
  updated for enums (SciTools#293)
  ...

# Conflicts:
#	esmf_regrid/schemes.py
@schlunma
Copy link

schlunma commented May 3, 2024

Hey @stephenworsley, I just did some updates to my environment and started to see issues like

ValueError: ESMC_MeshAddElement() failed with rc = 509.    Please check the log files (named "*ESMF_LogFile")

when using iris-esmf-regrid. This only appears with esmpy=8.6.1; with esmpy=8.4.2 I don't get this error. Does this PR here fix that? Any chance there will be a new release of iris-esmf-regrid soon? Thanks!!

@stephenworsley
Copy link
Contributor Author

@schlunma Yes, I believe this should fix this error, I'm thinking of doing a release at some point at the end this month.

@valeriupredoi
Copy link

Hey @stephenworsley, I just did some updates to my environment and started to see issues like

ValueError: ESMC_MeshAddElement() failed with rc = 509.    Please check the log files (named "*ESMF_LogFile")

when using iris-esmf-regrid. This only appears with esmpy=8.6.1; with esmpy=8.4.2 I don't get this error. Does this PR here fix that? Any chance there will be a new release of iris-esmf-regrid soon? Thanks!!

saw exactly the same behaviour elsewhere (ANTS) two days ago 👍

This was referenced May 3, 2024
Merged
Merged
@bouweandela
Copy link
Member

I see no changes to the iris-esmf-regrid code in this pull request, only to test infrastructure. How can this fix the issue described by @schlunma and why would a new release help if the released code is identical?

@stephenworsley
Copy link
Contributor Author

@bouweandela this PR ended up getting split in two. The actual fix went into #353 in order for the benchmarks to be able to run before and after the lockfile update.

@bouweandela
Copy link
Member

Thanks, that makes sense. Does the new code work with all versions of ESMPy? Or just 8.6 and up?

@trexfeathers trexfeathers mentioned this pull request May 31, 2024
Closed
This was referenced Jun 3, 2024
Merged
Merged
@schlunma
Copy link

Thanks, that makes sense. Does the new code work with all versions of ESMPy? Or just 8.6 and up?

@stephenworsley sorry to bother you again, but would you know if if this new version is also compatible with ESMPy < 8.6.0?

@valeriupredoi
Copy link

Thanks, that makes sense. Does the new code work with all versions of ESMPy? Or just 8.6 and up?

@stephenworsley sorry to bother you again, but would you know if if this new version is also compatible with ESMPy < 8.6.0?

same q from me too, please, folks 🍺

@schlunma schlunma mentioned this pull request Sep 27, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjlittle bjlittle bjlittle approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@stephenworsley @schlunma @valeriupredoi @bouweandela @bjlittle