tensorflowCuDNN -> tensorflowWithCuda

and move expression

+53 -35
+52
pkgs/development/python-modules/tensorflow/cuda.nix
··· 1 + { stdenv 2 + , fetchurl 3 + , buildPythonPackage 4 + , swig 5 + , numpy 6 + , six 7 + , protobuf3_0 8 + , cudatoolkit75 9 + , cudnn5_cudatoolkit75 10 + , gcc49 11 + , zlib 12 + , linuxPackages 13 + , mock 14 + }: 15 + 16 + buildPythonPackage rec { 17 + pname = "tensorflow"; 18 + version = "0.11.0rc0"; 19 + name = "${pname}-${version}"; 20 + format = "wheel"; 21 + 22 + src = fetchurl { 23 + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; 24 + sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5"; 25 + }; 26 + 27 + buildInputs = [ swig ]; 28 + propagatedBuildInputs = [ numpy six protobuf3_0 cudatoolkit75 cudnn5_cudatoolkit75 gcc49 mock ]; 29 + 30 + # Note that we need to run *after* the fixup phase because the 31 + # libraries are loaded at runtime. If we run in preFixup then 32 + # patchelf --shrink-rpath will remove the cuda libraries. 33 + postFixup = let 34 + rpath = stdenv.lib.makeLibraryPath [ 35 + gcc49.cc.lib 36 + zlib cudatoolkit75 37 + cudnn5_cudatoolkit75 38 + linuxPackages.nvidia_x11 39 + ]; 40 + in '' 41 + find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \; 42 + ''; 43 + 44 + doCheck = false; 45 + 46 + meta = with stdenv.lib; { 47 + description = "TensorFlow helps the tensors flow (no gpu support)"; 48 + homepage = http://tensorflow.org; 49 + license = licenses.asl20; 50 + platforms = platforms.linux; 51 + }; 52 + }
+1 -35
pkgs/top-level/python-packages.nix
··· 31247 31247 31248 31248 tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { }; 31249 31249 31250 - 31251 - tensorflowCuDNN = buildPythonPackage rec { 31252 - name = "tensorflow"; 31253 - version = "0.11.0rc0"; 31254 - format = "wheel"; 31255 - 31256 - src = pkgs.fetchurl { 31257 - url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; 31258 - sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5"; 31259 - }; 31260 - 31261 - buildInputs = with self; [ pkgs.swig ]; 31262 - propagatedBuildInputs = with self; [ numpy six protobuf3_0 pkgs.cudatoolkit75 pkgs.cudnn5_cudatoolkit75 pkgs.gcc49 self.mock ]; 31263 - 31264 - # Note that we need to run *after* the fixup phase because the 31265 - # libraries are loaded at runtime. If we run in preFixup then 31266 - # patchelf --shrink-rpath will remove the cuda libraries. 31267 - postFixup = let rpath = stdenv.lib.makeLibraryPath [ 31268 - pkgs.gcc49.cc.lib 31269 - pkgs.zlib pkgs.cudatoolkit75 31270 - pkgs.cudnn5_cudatoolkit75 31271 - pkgs.linuxPackages.nvidia_x11 31272 - ]; in '' 31273 - find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \; 31274 - ''; 31275 - 31276 - doCheck = false; 31277 - 31278 - meta = { 31279 - description = "TensorFlow helps the tensors flow (no gpu support)"; 31280 - homepage = http://tensorflow.org; 31281 - license = licenses.asl20; 31282 - platforms = platforms.linux; 31283 - }; 31284 - }; 31250 + tensorflowWithCuda = callPackage ../development/python-modules/tensorflow/cuda.nix { }; 31285 31251 31286 31252 tflearn = buildPythonPackage rec { 31287 31253 name = "tflearn-0.2.1";