commit 5e93492b7f289103fad8f14e3bd463c5d72c8e8c · pyrox.dev/nixpkgs

+26 -20
pkgs/development/python-modules/pytorch/default.nix
···

       4
       4
        
         openMPISupport ? false, openmpi ? null,

     

       5
       5
        
         buildDocs ? false,

     

       6
       6
        
         cudaArchList ? null,

     

       7
       7
       -
         numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil,

     

       8
       8
       -
         linkFarm, symlinkJoin,

     

       7
       7
       +
       

     

       8
       8
       +
         # Native build inputs

     

       9
       9
       +
         cmake, utillinux, linkFarm, symlinkJoin, which,

     

       10
       10
       +
       

     

       11
       11
       +
         # Build inputs

     

       12
       12
       +
         numactl,

     

       13
       13
       +
       

     

       14
       14
       +
         # Propagated build inputs

     

       15
       15
       +
         dataclasses, numpy, pyyaml, cffi, click, typing-extensions,

     

       16
       16
       +
       

     

       17
       17
       +
         # Unit tests

     

       18
       18
       +
         hypothesis, psutil,

     

       9
       19
        
       

     

       10
       20
        
         # virtual pkg that consistently instantiates blas across nixpkgs

     

       11
       21
        
         # See https://github.com/NixOS/nixpkgs/pull/83888

     
···

       17
       27
        
         # dependencies for torch.utils.tensorboard

     

       18
       28
        
         pillow, six, future, tensorflow-tensorboard, protobuf,

     

       19
       29
        
       

     

       20
       20
       -
         utillinux, which, isPy3k }:

     

       30
       30
       +
         isPy3k, pythonOlder }:

     

       21
       31
        
       

     

       22
       32
        
       assert !openMPISupport || openmpi != null;

     

       23
       33
        
       

     
···

       102
       112
        
       in buildPythonPackage rec {

     

       103
       113
        
         pname = "pytorch";

     

       104
       114
        
         # Don't forget to update pytorch-bin to the same version.

     

       105
       105
       -
         version = "1.6.0";

     

       115
       115
       +
         version = "1.7.0";

     

       106
       116
        
       

     

       107
       117
        
         disabled = !isPy3k;

     

       108
       118
        
       

     
···

       117
       127
        
           repo   = "pytorch";

     

       118
       128
        
           rev    = "v${version}";

     

       119
       129
        
           fetchSubmodules = true;

     

       120
       120
       -
           sha256 = "14hhjsi6fnpaw9m1a3bhvdinsks6fhss6bbcrfk6jgns64abqdaz";

     

       130
       130
       +
           sha256 = "0hb11m5kvs4nsi5bc9ijnv6k07593p9dw40rcn33s9vspinrcjd4";

     

       121
       131
        
         };

     

       122
       132
        
       

     

       123
       123
       -
         patches = lib.optionals stdenv.isAarch64 [

     

       124
       124
       -
           # GNU aarch64 assembler does not support 4s on neon mov:

     

       125
       125
       -
           # https://github.com/pytorch/pytorch/issues/33124

     

       126
       126
       -
           #

     

       127
       127
       -
           # Fix from:

     

       128
       128
       -
           # https://github.com/pytorch/pytorch/pull/40584

     

       129
       129
       -
           #

     

       130
       130
       -
           # This patch can be removed with the next major version (1.7.0).

     

       131
       131
       -
           (fetchpatch {

     

       132
       132
       -
             name = "qnnpack-neon-fix.patch";

     

       133
       133
       -
             url = "https://github.com/pytorch/pytorch/commit/7676682584d0caf9243bce74ea0a88711ec4a807.diff";

     

       134
       134
       -
             sha256 = "13spncaqlpsp8qk2850yly7xqwmhhfwznhmzkk8jgpslkbx75vgq";

     

       135
       135
       -
           })

     

       136
       136
       -
         ] ++ lib.optionals stdenv.isDarwin [

     

       133
       133
       +
         patches = lib.optionals stdenv.isDarwin [

     

       137
       134
        
           # pthreadpool added support for Grand Central Dispatch in April

     

       138
       135
        
           # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO)

     

       139
       136
        
           # that is available starting with macOS 10.13. However, our current

     
···

       141
       138
        
           # pthread support.

     

       142
       139
        
           ./pthreadpool-disable-gcd.diff

     

       143
       140
        
         ];

     

       141
       141
       +
       

     

       142
       142
       +
         # The dataclasses module is included with Python >= 3.7. This should

     

       143
       143
       +
         # be fixed with the next PyTorch release.

     

       144
       144
       +
         postPatch = ''

     

       145
       145
       +
           substituteInPlace setup.py \

     

       146
       146
       +
             --replace "'dataclasses'" "'dataclasses; python_version < \"3.7\"'"

     

       147
       147
       +
         '';

     

       144
       148
        
       

     

       145
       149
        
         preConfigure = lib.optionalString cudaSupport ''

     

       146
       150
        
           export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}"

     
···

       217
       221
        
           click

     

       218
       222
        
           numpy

     

       219
       223
        
           pyyaml

     

       224
       224
       +
           typing-extensions

     

       220
       225
        
           # the following are required for tensorboard support

     

       221
       226
        
           pillow six future tensorflow-tensorboard protobuf

     

       222
       222
       -
         ] ++ lib.optionals openMPISupport [ openmpi ];

     

       227
       227
       +
         ] ++ lib.optionals openMPISupport [ openmpi ]

     

       228
       228
       +
           ++ lib.optionals (pythonOlder "3.7") [ dataclasses ];

     

       223
       229
        
       

     

       224
       230
        
         checkInputs = [ hypothesis ninja psutil ];

     

       225
       231