Skip to content

Cherry-pick Elbrus2000-related fixes from upstream - #26

Merged
rgommers merged 2 commits into
numpy:main-numpymeson-1.11from
arrowd:e2k-numpy
Jul 16, 2026
Merged

rgommers merged 2 commits into
numpy:main-numpymeson-1.11from
arrowd:e2k-numpy

Conversation

@arrowd

@arrowd arrowd commented Jun 3, 2026

Copy link
Copy Markdown

No description provided.

return ['-fopenmp']

@classmethod
def use_linker_args(cls, linker: str, version: str) -> T.List[str]:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the PR. I assume this is the change you actually need? The version_compare changes don't look relevant to building numpy.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I just grabbed all changes related to e2k from git log. Would you like me te remove version_compare ones from the PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

No worries, I just wanted to make sure - you can leave the PR as is. I'm on holiday now, but will try to integrte this when I'm back.

@arrowd

arrowd commented Jun 10, 2026

Copy link
Copy Markdown
Author

Converting to draft while waiting for upstream PR mesonbuild#15917
Once it lands, I will cherry-pick it into this one and then it'd be good to go.

@arrowd
arrowd marked this pull request as ready for review June 11, 2026 07:09
@arrowd

arrowd commented Jun 16, 2026

Copy link
Copy Markdown
Author

This is now ready to land.

arrowd added 2 commits July 14, 2026 12:38
e2k's gfortran mimics the GNU one in this regard. Fixes numpy's f2py tests.

(cherry picked from commit 3eaf128)
@arrowd
arrowd changed the base branch from main-numpymeson to main-numpymeson-1.11 July 14, 2026 09:41
@arrowd

arrowd commented Jul 14, 2026

Copy link
Copy Markdown
Author

Retargeted to main-numpymeson-1.11

@rgommers rgommers left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, and tested in NumPy CI for completeness at numpy/numpy#32020, all green.

For future readers: These patches are integrated upstream, so no longer needed when we bump to Meson main or 1.12.0

@rgommers
rgommers merged commit 12f932e into numpy:main-numpymeson-1.11 Jul 16, 2026
@rgommers

Copy link
Copy Markdown
Member

I'll merge this in the main repo in numpy/numpy#32020

rgommers added a commit to rgommers/numpy that referenced this pull request Jul 16, 2026
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.

2 participants