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

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

Merged
merged 1 commit into from Feb 14, 2020

Conversation

@nh2
Copy link
Contributor

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 Feb 11, 2020
@nh2

This comment has been minimized.

Copy link
Contributor Author

nh2 commented Feb 11, 2020

I've tested by:

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

This comment has been minimized.

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
For now anyway, since we build w/o support for it IIRC.
@ofborg ofborg bot requested a review from spwhitt Feb 11, 2020
Clang now supports OpenMP, and musl has no problem with it either.

Related to #7023 and #34645.

See also #79818.
@nh2 nh2 force-pushed the nh2:fftw-remove-openmp-disables branch from 66cddb8 to a72367a 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" ]

This comment has been minimized.

Copy link
@nh2

nh2 Feb 11, 2020

Author Contributor

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

Copy link
Contributor

acowley left a comment

  • 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
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
fftw on aarch64-linux Success
Details
fftw on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.