Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dd1f371a1eb2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b01004eb4c55
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 7, 2019

  1. pytorch: Use nativeBuildInputs to specify binary build dependencies. 

    (cherry picked from commit 488230c)
    @teh @FRidh
    teh authored and FRidh committed Mar 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b01004e View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −2 pkgs/development/python-modules/pytorch/default.nix
7 changes: 5 additions & 2 deletions pkgs/development/python-modules/pytorch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -77,11 +77,14 @@ in buildPythonPackage rec {
# https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc
NIX_CFLAGS_COMPILE = lib.optionals (numpy.blasImplementation == "mkl") [ "-Wno-error=array-bounds" ];

buildInputs = [
nativeBuildInputs = [
cmake
numpy.blas
utillinux
which
];

buildInputs = [
numpy.blas
] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn ]
++ lib.optionals stdenv.isLinux [ numactl ];