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

[20.03] mkl: fix expectation of MKLROOT being set in pkg-config files #87836

Merged
merged 1 commit into from May 14, 2020

Conversation

@danieldk
Copy link
Member

danieldk commented May 14, 2020

Motivation for this change

The Intel MKL pkg-config files did not work, because they expect that
the MKLROOT environment variable is set. This change replaces
occurences by the actual path of MKL in the Nix store.

Since the pkg-config files seem to break quite frequently after
upgrades, add a post-install check to validate the pkg-config files.

(cherry picked from commit e88673a)

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.
The Intel MKL pkg-config files did not work, because they expect that
the MKLROOT environment variable is set. This change replaces
occurences by the actual path of MKL in the Nix store.

Since the pkg-config files seem to break quite frequently after
upgrades, add a post-install check to validate the pkg-config files.

(cherry picked from commit e88673a)
@danieldk danieldk changed the title mkl: fix expectation of MKLROOT being set in pkg-config files [20.03] mkl: fix expectation of MKLROOT being set in pkg-config files May 14, 2020
@ofborg ofborg bot requested a review from bhipple May 14, 2020
@bhipple
Copy link
Contributor

bhipple commented May 14, 2020

Result of nixpkgs-review pr 87836 1

2 packages failed to build:
- arrayfire
- forge
5 packages built:
- clmagma
- mkl
- python27Packages.mkl-service
- python37Packages.mkl-service
- python38Packages.mkl-service
@bhipple
Copy link
Contributor

bhipple commented May 14, 2020

Both arrayfire and forge are currently broken on 20.03, so this PR is a strict improvement.

@bhipple bhipple merged commit a7c70f2 into NixOS:release-20.03 May 14, 2020
16 checks passed
16 checks passed
mkl, mkl.passthru.tests on aarch64-linux No attempt
Details
mkl, mkl.passthru.tests on x86_64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
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="2dd4f2a"; rev="2dd4f2a0042a686652910359fe13ea6855bc626f"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2dd4f2a"; rev="2dd4f2a0042a686652910359fe13ea6855bc626f"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2dd4f2a"; rev="2dd4f2a0042a686652910359fe13ea6855bc626f"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2dd4f2a"; rev="2dd4f2a0042a686652910359fe13ea6855bc626f"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2dd4f2a"; rev="2dd4f2a0042a686652910359fe13ea6855bc626f"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2dd4f2a"; rev="2dd4f2a0042a686652910359fe13ea6855bc626f"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2dd4f2a"; rev="2dd4f2a0042a686652910359fe13ea6855bc626f"; } ./pkgs/t
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.