cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

python3Packages.pytorch: convert boolean environment variables

Browse source 
We relied on the stdenv serialization for booleans. However, the
PyTorch configure script expects 0/1. So convert the options to 0/1
values.
This commit is contained in:
Daniël de Kok 2021-04-10 08:08:08 +02:00
parent 7b02acac3e
commit 4f876309fe
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/python-modules/pytorch/default.nix
View file

@ -38,6 +38,7 @@ assert !(MPISupport && cudaSupport) || mpi.cudatoolkit == cudatoolkit;
assert !cudaSupport || magma.cudatoolkit == cudatoolkit; assert !cudaSupport || magma.cudatoolkit == cudatoolkit;
let let
setBool = v: if v then "1" else "0";
cudatoolkit_joined = symlinkJoin { cudatoolkit_joined = symlinkJoin {
name = "${cudatoolkit.name}-unsplit"; name = "${cudatoolkit.name}-unsplit";
# nccl is here purely for semantic grouping it could be moved to nativeBuildInputs # nccl is here purely for semantic grouping it could be moved to nativeBuildInputs
@ -160,16 +161,16 @@ in buildPythonPackage rec {
# Use pytorch's custom configurations # Use pytorch's custom configurations
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
BUILD_NAMEDTENSOR = true; BUILD_NAMEDTENSOR = setBool true;
BUILD_DOCS = buildDocs; BUILD_DOCS = setBool buildDocs;
USE_MKL = blas.implementation == "mkl"; USE_MKL = setBool (blas.implementation == "mkl");
# Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for # Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for
# it by default. PyTorch currently uses its own vendored version # it by default. PyTorch currently uses its own vendored version
# of oneDNN through Intel iDeep. # of oneDNN through Intel iDeep.
USE_MKLDNN = mklDnnSupport; USE_MKLDNN = setBool mklDnnSupport;
USE_MKLDNN_CBLAS = mklDnnSupport; USE_MKLDNN_CBLAS = setBool mklDnnSupport;
preBuild = '' preBuild = ''
export MAX_JOBS=$NIX_BUILD_CORES export MAX_JOBS=$NIX_BUILD_CORES
@ -198,7 +199,7 @@ in buildPythonPackage rec {
PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_VERSION = version;
PYTORCH_BUILD_NUMBER = 0; PYTORCH_BUILD_NUMBER = 0;
USE_SYSTEM_NCCL=useSystemNccl; # don't build pytorch's third_party NCCL USE_SYSTEM_NCCL=setBool useSystemNccl; # don't build pytorch's third_party NCCL
# Suppress a weird warning in mkl-dnn, part of ideep in pytorch # Suppress a weird warning in mkl-dnn, part of ideep in pytorch
# (upstream seems to have fixed this in the wrong place?) # (upstream seems to have fixed this in the wrong place?)