diff options
author | Anders Kaseorg <andersk@mit.edu> | 2018-05-04 10:19:31 -0400 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-05-04 16:19:31 +0200 |
commit | ce00943916f81d26d15fab054315aa494233496c (patch) | |
tree | 71c77caed82be6a74beaed261194b758124c359a /pkgs/development/python-modules/pytorch | |
parent | 026dc16b85f43a653c191c4075a4d1d17733cbaa (diff) | |
download | nixlib-ce00943916f81d26d15fab054315aa494233496c.tar nixlib-ce00943916f81d26d15fab054315aa494233496c.tar.gz nixlib-ce00943916f81d26d15fab054315aa494233496c.tar.bz2 nixlib-ce00943916f81d26d15fab054315aa494233496c.tar.lz nixlib-ce00943916f81d26d15fab054315aa494233496c.tar.xz nixlib-ce00943916f81d26d15fab054315aa494233496c.tar.zst nixlib-ce00943916f81d26d15fab054315aa494233496c.zip |
pytorch: 0.2.0 → 0.3.1 with CUDA and cuDNN (#38530)
* pytorch-0.3 with optional cuda and cudnn * pytorch tests reenabled if compiling without cuda * pytorch: Conditionalize cudnn dependency on cudaSupport Signed-off-by: Anders Kaseorg <andersk@mit.edu> * pytorch: Compile with the same GCC version used by CUDA if cudaSupport Fixes this error: In file included from /nix/store/gv7w3c71jg627cpcff04yi6kwzpzjyap-cudatoolkit-9.1.85.1/include/host_config.h:50:0, from /nix/store/gv7w3c71jg627cpcff04yi6kwzpzjyap-cudatoolkit-9.1.85.1/include/cuda_runtime.h:78, from <command-line>:0: /nix/store/gv7w3c71jg627cpcff04yi6kwzpzjyap-cudatoolkit-9.1.85.1/include/crt/host_config.h:121:2: error: #error -- unsupported GNU version! gcc versions later than 6 are not supported! #error -- unsupported GNU version! gcc versions later than 6 are not supported! ^~~~~ Signed-off-by: Anders Kaseorg <andersk@mit.edu> * pytorch: Build with joined cudatoolkit Similar to #30058 for TensorFlow. Signed-off-by: Anders Kaseorg <andersk@mit.edu> * pytorch: 0.3.0 -> 0.3.1 Signed-off-by: Anders Kaseorg <andersk@mit.edu> * pytorch: Patch for “refcounted file mapping not supported” failure Signed-off-by: Anders Kaseorg <andersk@mit.edu> * pytorch: Skip distributed tests Signed-off-by: Anders Kaseorg <andersk@mit.edu> * pytorch: Use the stub libcuda.so from cudatoolkit for running tests Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/development/python-modules/pytorch')
-rw-r--r-- | pkgs/development/python-modules/pytorch/default.nix | 66 |
1 files changed, 56 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index a510eedee4fd..c8376196d3ac 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,8 +1,31 @@ -{ buildPythonPackage, fetchFromGitHub, lib, numpy, pyyaml, cffi, cmake, - git, stdenv }: +{ buildPythonPackage, + cudaSupport ? false, cudatoolkit ? null, cudnn ? null, + fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, cmake, + git, stdenv, linkFarm, symlinkJoin, + utillinux, which }: -buildPythonPackage rec { - version = "0.2.0"; +assert cudnn == null || cudatoolkit != null; +assert !cudaSupport || cudatoolkit != null; + +let + cudatoolkit_joined = symlinkJoin { + name = "${cudatoolkit.name}-unsplit"; + paths = [ cudatoolkit.out cudatoolkit.lib ]; + }; + + # Normally libcuda.so.1 is provided at runtime by nvidia-x11 via + # LD_LIBRARY_PATH=/run/opengl-driver/lib. We only use the stub + # libcuda.so from cudatoolkit for running tests, so that we don’t have + # to recompile pytorch on every update to nvidia-x11 or the kernel. + cudaStub = linkFarm "cuda-stub" [{ + name = "libcuda.so.1"; + path = "${cudatoolkit}/lib/stubs/libcuda.so"; + }]; + cudaStubEnv = lib.optionalString cudaSupport + "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} "; + +in buildPythonPackage rec { + version = "0.3.1"; pname = "pytorch"; name = "${pname}-${version}"; @@ -10,18 +33,41 @@ buildPythonPackage rec { owner = "pytorch"; repo = "pytorch"; rev = "v${version}"; - sha256 = "1s3f46ga1f4lfrcj3lpvvhgkdr1pi8i2hjd9xj9qiz3a9vh2sj4n"; + fetchSubmodules = true; + sha256 = "1k8fr97v5pf7rni5cr2pi21ixc3pdj3h3lkz28njbjbgkndh7mr3"; }; - checkPhase = '' - ${stdenv.shell} test/run_test.sh + patches = [ + (fetchpatch { + # make sure stdatomic.h is included when checking for ATOMIC_INT_LOCK_FREE + # Fixes this test failure: + # RuntimeError: refcounted file mapping not supported on your system at /tmp/nix-build-python3.6-pytorch-0.3.0.drv-0/source/torch/lib/TH/THAllocator.c:525 + url = "https://github.com/pytorch/pytorch/commit/502aaf39cf4a878f9e4f849e5f409573aa598aa9.patch"; + stripLen = 3; + extraPrefix = "torch/lib/"; + sha256 = "1miz4lhy3razjwcmhxqa4xmlcmhm65lqyin1czqczj8g16d3f62f"; + }) + ]; + + postPatch = '' + substituteInPlace test/run_test.sh --replace \ + "INIT_METHOD='file://'\$TEMP_DIR'/shared_init_file' \$PYCMD ./test_distributed.py" \ + "echo Skipped for Nix package" + ''; + + preConfigure = lib.optionalString cudaSupport '' + export CC=${cudatoolkit.cc}/bin/gcc + '' + lib.optionalString (cudaSupport && cudnn != null) '' + export CUDNN_INCLUDE_DIR=${cudnn}/include ''; buildInputs = [ cmake git numpy.blas - ]; + utillinux + which + ] ++ lib.optionals cudaSupport [cudatoolkit_joined cudnn]; propagatedBuildInputs = [ cffi @@ -29,8 +75,8 @@ buildPythonPackage rec { pyyaml ]; - preConfigure = '' - export NO_CUDA=1 + checkPhase = '' + ${cudaStubEnv}${stdenv.shell} test/run_test.sh ''; meta = { |