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.

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

fftw: Re-enable OpenMP with non-GCC and musl #79815

Merged
merged 1 commit into from Feb 14, 2020
Merged

fftw: Re-enable OpenMP with non-GCC and musl #79815

merged 1 commit into from Feb 14, 2020

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Feb 11, 2020

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

CC @spwhitt

@nh2 nh2 requested review from acowley and dtzWill February 11, 2020 10:57
@nh2
Copy link
Contributor Author

nh2 commented Feb 11, 2020 •
edited

I've tested by:

  • building pkgsMusl.fftw
  • building pkgs.fftw with stdenv replaced by clangStdenv
  • building pkgsMusl.fftw with stdenv replaced by clangStdenv

@nh2
Copy link
Contributor Author

nh2 commented Feb 11, 2020

This needs a test on Darwin, can somebody please ofborg-build it for me?

nh2 referenced this pull request Feb 11, 2020
@dtzWill
fftw: disable using openmp w/musl
3413562 
For now anyway, since we build w/o support for it IIRC.
@ofborg ofborg bot requested a review from spwhitt February 11, 2020 11:28
@nh2
fftw: Re-enable OpenMP with non-GCC and musl.
a72367a 
Clang now supports OpenMP, and musl has no problem with it either.

Related to NixOS#7023 and NixOS#34645.

See also NixOS#79818.
@nh2 nh2 force-pushed the fftw-remove-openmp-disables branch from 66cddb8 to a72367a Compare February 11, 2020 12:38
nh2
nh2 commented Feb 11, 2020
View reviewed changes
pkgs/development/libraries/fftw/default.nix
@@ -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" ]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Keeping this here instead of moving it up to avoid mass-rebuilds on normal Linux.

acowley
acowley approved these changes Feb 11, 2020
View reviewed changes
Copy link
Contributor

@acowley acowley left a comment

Choose a reason for hiding this comment

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

  • The change looks good to me
  • It builds on darwin for me
  • The build finds the -fopenmp flag

@nh2 nh2 merged commit 92176bc into NixOS:master Feb 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@acowley acowley acowley approved these changes

@dtzWill dtzWill Awaiting requested review from dtzWill

@spwhitt spwhitt Awaiting requested review from spwhitt

Assignees
No one assigned
Labels
10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@nh2 @acowley