public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mxnet: disable GPU autodetection

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-09-17 19:35:47 +03:00
parent 098c6825e0
commit 67bbe467a4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/science/math/mxnet/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchgit, cmake { stdenv, lib, fetchgit, cmake
, opencv, gtest, openblas, liblapack , opencv, gtest, openblas, liblapack
, cudaSupport ? false, cudatoolkit , cudaSupport ? false, cudatoolkit, nvidia_x11
, cudnnSupport ? false, cudnn , cudnnSupport ? false, cudnn
}: }:
@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ opencv gtest openblas liblapack ] buildInputs = [ opencv gtest openblas liblapack ]
++ lib.optional cudaSupport cudatoolkit ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
++ lib.optional cudnnSupport cudnn; ++ lib.optional cudnnSupport cudnn;
cmakeFlags = lib.optional (!cudaSupport) "-DUSE_CUDA=OFF" cmakeFlags = [
++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF"; (if cudaSupport then "-DCUDA_ARCH_NAME=All" else "-DUSE_CUDA=OFF")
] ++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
installPhase = '' installPhase = ''
install -Dm755 libmxnet.so $out/lib/libmxnet.so install -Dm755 libmxnet.so $out/lib/libmxnet.so

4
pkgs/top-level/all-packages.nix
View File

@ -18559,7 +18559,9 @@ with pkgs;
sbcl = null; sbcl = null;
}; };
mxnet = callPackage ../applications/science/math/mxnet { }; mxnet = callPackage ../applications/science/math/mxnet {
inherit (linuxPackages) nvidia_x11;
};
wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; }; wxmaxima = callPackage ../applications/science/math/wxmaxima { wxGTK = wxGTK30; };