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: 1606bd2a17b0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 474be6ff27bc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 1, 2017

  1. TheanoWithCuda: cudnn shouldn't be optional or list wrapped #26263 

    * python27.withPackages drops nested propagatedBuildInputs
* not clear why cudnn was optional to begin with
    @twhitehead
    twhitehead committed Jun 1, 2017
    Copy the full SHA
    20730dc View commit details

Commits on Jun 2, 2017

  1. Merge pull request #26263 from twhitehead/theano-cuda-cudnn 

    TheanoWithCuda: cudnn isn't added to python environment due to use of optional with a list
    @FRidh
    FRidh authored Jun 2, 2017
    Copy the full SHA
    474be6f View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,8 @@ buildPythonPackage rec {
pycuda
cudatoolkit
libgpuarray
] ++ (stdenv.lib.optional (cudnn != null) [ cudnn ]);
cudnn
];

passthru.cudaSupport = true;
}