TheanoWithCuda: cudnn shouldn't be optional #26263
Merged
+2
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@twhitehead, thanks for your PR! By analyzing the history of the files in this pull request, we identified @artuuge and @FRidh to be potential reviewers. |
FRidh
reviewed
May 31, 2017
| @@ -56,7 +56,7 @@ buildPythonPackage rec { | |||
| pycuda | |||
| cudatoolkit | |||
| libgpuarray | |||
| ] ++ (stdenv.lib.optional (cudnn != null) [ cudnn ]); | |||
| ] ++ (stdenv.lib.optional (cudnn != null) cudnn); | |||
There was a problem hiding this comment.
Why would cudnn be optional? I think there's no reason and it should simply be added to the list, unconditionally.
There was a problem hiding this comment.
I don't know why it would have been optional. From the blame history it seems that is just how @artuuge wrote it in the original commit. I can certainly adjust the pull to just include it unconditionally.
* python27.withPackages drops nested propagatedBuildInputs * not clear why cudnn was optional to begin with
twhitehead
force-pushed
the
theano-cuda-cudnn
branch
from
33cc4cb to
20730dc
Compare
|
@FRidh I've updated it to just include cudnn unconditionally now. I was pretty trivial, so I haven't personally tested it yet. Presumably the Travis CI system will do that. |
7 tasks
FRidh
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
The
propagatedBuildInputscontainedoptional (cudnn != null) [ cudnn ]. Asoptionalwraps its arguement in a list (optionalsis intended for lists notoptional) this changespropagatedBuildInputsinto a nested list.For the package itself, this appears to have no effect. The nested list is flattened and it produces the exact same derivation. When used with
withPackages, however, nested values do not get flattened. Instead they are just silently dropped.Before this change
fgrep -q cudnn $(nix-instantiate -E '(import ./. {}).python27Packages.TheanoWithCuda' && echo present || echo not presentAfter this change
fgrep -q cudnn $(nix-instantiate -E '(import ./. {}).python27Packages.TheanoWithCuda' && echo present || echo not presentThings done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)