fftw: Re-enable OpenMP with non-GCC and musl #79815
Merged
Conversation
This file contains 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
|
I've tested by:
|
|
This needs a test on Darwin, can somebody please ofborg-build it for me? |
nh2
referenced
this pull request
Feb 11, 2020
For now anyway, since we build w/o support for it IIRC.
ofborg
bot
added
10.rebuild-darwin: 0
Clang now supports OpenMP, and musl has no problem with it either. Related to NixOS#7023 and NixOS#34645. See also NixOS#79818.
nh2
force-pushed
the
fftw-remove-openmp-disables
branch
from
66cddb8
to
a72367a
Compare
nh2
commented
Feb 11, 2020
| @@ -32,7 +38,7 @@ stdenv.mkDerivation { | |||
| # all x86_64 have sse2 | |||
| # however, not all float sizes fit | |||
| ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" | |||
| ++ optional (stdenv.cc.isGNU && !stdenv.hostPlatform.isMusl) "--enable-openmp" | |||
| ++ [ "--enable-openmp" ] | |||
There was a problem hiding this comment.
Keeping this here instead of moving it up to avoid mass-rebuilds on normal Linux.
ofborg
bot
added
10.rebuild-darwin: 501+
10.rebuild-darwin: 501-1000
10.rebuild-linux: 0
acowley
approved these changes
Feb 11, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
Clang now supports OpenMP, and musl has no problem with it either.
Following 3413562.
Related to #7023 (cc @acowley) and #34645.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)CC @spwhitt