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 NEST 2.20.x CMake configuration to support OpenMP fully on OSX #1912

Merged
merged 1 commit into from
Feb 4, 2021
Merged

Update NEST 2.20.x CMake configuration to support OpenMP fully on OSX #1912

merged 1 commit into from
Feb 4, 2021

Conversation

heplesser
Copy link
Contributor

This is a backport from NEST3 to make sure threaded NEST compiles fine with Clang on macOS.

@heplesser heplesser requested a review from jougs February 3, 2021 23:04
@heplesser heplesser added this to the NEST 2.20.2 milestone Feb 3, 2021
jougs
jougs approved these changes Feb 4, 2021
View reviewed changes
Copy link
Contributor

@jougs jougs left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM. Waiving second review as this is only a backport.

@stinebuu stinebuu added I: No breaking change Previously written code will work as before, no one should note anything changing (aside the fix) S: Normal Handle this with default priority T: Maintenance Work to keep up the quality of the code and documentation. labels Feb 4, 2021
@jougs
Copy link
Contributor

jougs commented Feb 4, 2021

@heplesser: Is the failure on MacOS expected (e.g. because of backporting), or is this related to this change? Thanks!

@heplesser
Copy link
Contributor Author

@jougs The macOS failure occurs while installing NumPy, definitely not relate to this backport. We may need to backport some more changes to our Travis setup. I will check.

@jougs
Copy link
Contributor

jougs commented Feb 4, 2021

We had very similar issues when doing the 2.20.1 release and decided it's not worth backporting the whole CI fixes when everything is in fact fine on any normal user's machine. I would thus be happy to merge without any further actions applied. @abigailm: what do you think?

@abigailm
Copy link
Contributor

abigailm commented Feb 4, 2021

Then I will go ahead and merge it and we worry about MacOS and NumPy at a suitable juncture.

@abigailm abigailm merged commit 2dc4195 into nest:2.20.2-develop Feb 4, 2021
@heplesser heplesser deleted the update-2-20-cmake branch February 25, 2021 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jougs jougs jougs approved these changes

Assignees
No one assigned
Labels
I: No breaking change Previously written code will work as before, no one should note anything changing (aside the fix) S: Normal Handle this with default priority T: Maintenance Work to keep up the quality of the code and documentation.
Projects
Installation
Status: Done
Milestone
NEST 2.20.2
Development

Successfully merging this pull request may close these issues.
4 participants
@heplesser @jougs @abigailm @stinebuu