commit 578f231a53bfbedfad4b4cc17547f67ed99a72ba · pyrox.dev/nixpkgs

+5 -5

pkgs/development/ocaml-modules/torch/default.nix

···

       12
       12
        
       , ppx_sexp_conv

     

       13
       13
        
       , sexplib

     

       14
       14
        
       , stdio

     

       15
       15
       -
       , pytorch

     

       15
       15
       +
       , torch

     

       16
       16
        
       }:

     

       17
       17
        
       

     

       18
       18
        
       buildDunePackage rec {

     
···

       37
       37
        
           ctypes

     

       38
       38
        
           npy

     

       39
       39
        
           ocaml-compiler-libs

     

       40
       40
       -
           pytorch

     

       41
       41
       -
           pytorch.dev

     

       42
       40
        
           ppx_custom_printf

     

       43
       41
        
           ppx_expect

     

       44
       42
        
           ppx_sexp_conv

     

       45
       43
        
           sexplib

     

       46
       44
        
           stdio

     

       45
       45
       +
           torch

     

       46
       46
       +
           torch.dev

     

       47
       47
        
         ];

     

       48
       48
        
       

     

       49
       49
       -
         preBuild = "export LIBTORCH=${pytorch.dev}/";

     

       49
       49
       +
         preBuild = "export LIBTORCH=${torch.dev}/";

     

       50
       50
        
       

     

       51
       51
        
         doCheck = !stdenv.isAarch64;

     

       52
       52
        
         checkPhase = "dune runtest";

     
···

       56
       56
        
           description = "Ocaml bindings to Pytorch";

     

       57
       57
        
           maintainers = [ maintainers.bcdarwin ];

     

       58
       58
        
           license = licenses.asl20;

     

       59
       59
       -
           broken = lib.versionAtLeast pytorch.version "1.11";

     

       59
       59
       +
           broken = lib.versionAtLeast torch.version "1.11";

     

       60
       60
        
         };

     

       61
       61
        
       }

+2 -2

pkgs/development/python-modules/boxx/default.nix

···

       12
       12
        
       , fn

     

       13
       13
        
       , pyopengl

     

       14
       14
        
       , seaborn

     

       15
       15
       -
       , pytorch

     

       15
       15
       +
       , torch

     

       16
       16
        
       , pythonOlder

     

       17
       17
        
       , torchvision

     

       18
       18
        
       }:

     
···

       43
       43
        
       

     

       44
       44
        
         checkInputs = [

     

       45
       45
        
           xvfb-run

     

       46
       46
       -
           pytorch

     

       46
       46
       +
           torch

     

       47
       47
        
           torchvision

     

       48
       48
        
         ];

     

       49
       49

+2 -2

pkgs/development/python-modules/coqui-trainer/default.nix

···

       6
       6
        
       

     

       7
       7
        
       , coqpit

     

       8
       8
        
       , fsspec

     

       9
       9
       -
       , pytorch-bin

     

       9
       9
       +
       , torch-bin

     

       10
       10
        
       , tensorboardx

     

       11
       11
        
       , protobuf

     

       12
       12
        
       

     
···

       33
       33
        
         propagatedBuildInputs = [

     

       34
       34
        
           coqpit

     

       35
       35
        
           fsspec

     

       36
       36
       -
           pytorch-bin

     

       36
       36
       +
           torch-bin

     

       37
       37
        
           soundfile

     

       38
       38
        
           tensorboardx

     

       39
       39
        
           protobuf

+2 -2

pkgs/development/python-modules/deepwave/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildPythonPackage

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       -
       , pytorch

     

       4
       4
       +
       , torch

     

       5
       5
        
       , ninja

     

       6
       6
        
       , scipy

     

       7
       7
        
       , which

     
···

       48
       48
        
           export HOME=$(mktemp -d)

     

       49
       49
        
         '';

     

       50
       50
        
       

     

       51
       51
       -
         propagatedBuildInputs = [ pytorch pybind11 ];

     

       51
       51
       +
         propagatedBuildInputs = [ torch pybind11 ];

     

       52
       52
        
       

     

       53
       53
        
         checkInputs = [

     

       54
       54
        
           which

+2 -2

pkgs/development/python-modules/elegy/default.nix

···

       8
       8
        
       , lib

     

       9
       9
        
       , poetry

     

       10
       10
        
       , pytestCheckHook

     

       11
       11
       -
       , pytorch

     

       11
       11
       +
       , torch

     

       12
       12
        
       , pyyaml

     

       13
       13
        
       , sh

     

       14
       14
        
       , tables

     
···

       66
       66
        
       

     

       67
       67
        
         checkInputs = [

     

       68
       68
        
           pytestCheckHook

     

       69
       69
       -
           pytorch

     

       69
       69
       +
           torch

     

       70
       70
        
           sh

     

       71
       71
        
           tensorflow

     

       72
       72
        
         ];

+2 -2

pkgs/development/python-modules/ezyrb/default.nix

···

       8
       8
        
       , scipy

     

       9
       9
        
       , matplotlib

     

       10
       10
        
       , scikit-learn

     

       11
       11
       -
       , pytorch

     

       11
       11
       +
       , torch

     

       12
       12
        
       , pytestCheckHook

     

       13
       13
        
       }:

     

       14
       14
        
       

     
···

       32
       32
        
           scipy

     

       33
       33
        
           matplotlib

     

       34
       34
        
           scikit-learn

     

       35
       35
       -
           pytorch

     

       35
       35
       +
           torch

     

       36
       36
        
         ];

     

       37
       37
        
       

     

       38
       38
        
         checkInputs = [

+2 -2

pkgs/development/python-modules/functorch/default.nix

···

       5
       5
        
       , ninja

     

       6
       6
        
       , pytestCheckHook

     

       7
       7
        
       , python

     

       8
       8
       -
       , pytorch

     

       8
       8
       +
       , torch

     

       9
       9
        
       , pybind11

     

       10
       10
        
       , which

     

       11
       11
        
       }:

     
···

       26
       26
        
         # `setup.py` imports `torch.utils.cpp_extension`.

     

       27
       27
        
         nativeBuildInputs = [

     

       28
       28
        
           ninja

     

       29
       29
       -
           pytorch

     

       29
       29
       +
           torch

     

       30
       30
        
           which

     

       31
       31
        
         ];

     

       32
       32

+2 -2

pkgs/development/python-modules/ignite/default.nix

···

       8
       8
        
       , matplotlib

     

       9
       9
        
       , mock

     

       10
       10
        
       , packaging

     

       11
       11
       -
       , pytorch

     

       11
       11
       +
       , torch

     

       12
       12
        
       , scikit-learn

     

       13
       13
        
       , tqdm

     

       14
       14
        
       }:

     
···

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ];

     

       28
       28
       -
         propagatedBuildInputs = [ packaging pytorch scikit-learn tqdm ];

     

       28
       28
       +
         propagatedBuildInputs = [ packaging torch scikit-learn tqdm ];

     

       29
       29
        
       

     

       30
       30
        
         # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.

     

       31
       31
        
         doCheck = pythonOlder "3.9";

+2 -2

pkgs/development/python-modules/monai/default.nix

···

       6
       6
        
       , ignite

     

       7
       7
        
       , numpy

     

       8
       8
        
       , pybind11

     

       9
       9
       -
       , pytorch

     

       9
       9
       +
       , torch

     

       10
       10
        
       , which

     

       11
       11
        
       }:

     

       12
       12
        
       

     
···

       33
       33
        
       

     

       34
       34
        
         nativeBuildInputs = [ ninja which ];

     

       35
       35
        
         buildInputs = [ pybind11 ];

     

       36
       36
       -
         propagatedBuildInputs = [ numpy pytorch ignite ];

     

       36
       36
       +
         propagatedBuildInputs = [ numpy torch ignite ];

     

       37
       37
        
       

     

       38
       38
        
         BUILD_MONAI = 1;

     

       39
       39

-1

pkgs/development/python-modules/py-deprecate/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , pytestCheckHook

     

       5
       5
        
       , scikit-learn

     

       6
       6
       -
       , pytorch

     

       7
       6
        
       }:

     

       8
       7
        
       

     

       9
       8
        
       let

+2 -2

pkgs/development/python-modules/pymanopt/default.nix

···

       3
       3
        
       , buildPythonPackage

     

       4
       4
        
       , numpy

     

       5
       5
        
       , scipy

     

       6
       6
       -
       , pytorch

     

       6
       6
       +
       , torch

     

       7
       7
        
       , autograd

     

       8
       8
        
       , nose2

     

       9
       9
        
       , matplotlib

     
···

       21
       21
        
           sha256 = "sha256-dqyduExNgXIbEFlgkckaPfhLFSVLqPgwAOyBUdowwiQ=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         propagatedBuildInputs = [ numpy scipy pytorch ];

     

       24
       24
       +
         propagatedBuildInputs = [ numpy scipy torch ];

     

       25
       25
        
         checkInputs = [ nose2 autograd matplotlib tensorflow ];

     

       26
       26
        
       

     

       27
       27
        
         checkPhase = ''

+2 -2

pkgs/development/python-modules/pyro-ppl/default.nix

···

       10
       10
        
       , pillow

     

       11
       11
        
       , pyro-api

     

       12
       12
        
       , pythonOlder

     

       13
       13
       -
       , pytorch

     

       13
       13
       +
       , torch

     

       14
       14
        
       , scikit-learn

     

       15
       15
        
       , seaborn

     

       16
       16
        
       , torchvision

     
···

       32
       32
        
       

     

       33
       33
        
         propagatedBuildInputs = [

     

       34
       34
        
           pyro-api

     

       35
       35
       -
           pytorch

     

       35
       35
       +
           torch

     

       36
       36
        
           networkx

     

       37
       37
        
           opt-einsum

     

       38
       38
        
           tqdm

+2 -2

pkgs/development/python-modules/pytorch-lightning/default.nix

···

       6
       6
        
       , fsspec

     

       7
       7
        
       , packaging

     

       8
       8
        
       , pytestCheckHook

     

       9
       9
       -
       , pytorch

     

       9
       9
       +
       , torch

     

       10
       10
        
       , pyyaml

     

       11
       11
        
       , tensorboard

     

       12
       12
        
       , torchmetrics

     
···

       29
       29
        
           packaging

     

       30
       30
        
           future

     

       31
       31
        
           fsspec

     

       32
       32
       -
           pytorch

     

       32
       32
       +
           torch

     

       33
       33
        
           pyyaml

     

       34
       34
        
           tensorboard

     

       35
       35
        
           torchmetrics

+2 -2

pkgs/development/python-modules/pytorch-metric-learning/default.nix

···

       5
       5
        
       , numpy

     

       6
       6
        
       , scikit-learn

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
       -
       , pytorch

     

       8
       8
       +
       , torch

     

       9
       9
        
       , torchvision

     

       10
       10
        
       , tqdm

     

       11
       11
        
       , faiss

     
···

       26
       26
        
       

     

       27
       27
        
         propagatedBuildInputs = [

     

       28
       28
        
           numpy

     

       29
       29
       -
           pytorch

     

       29
       29
       +
           torch

     

       30
       30
        
           scikit-learn

     

       31
       31
        
           torchvision

     

       32
       32
        
           tqdm

+2 -2

pkgs/development/python-modules/pytorch-pfn-extras/default.nix

···

       5
       5
        
       , onnx

     

       6
       6
        
       , packaging

     

       7
       7
        
       , pytestCheckHook

     

       8
       8
       -
       , pytorch

     

       8
       8
       +
       , torch

     

       9
       9
        
       , torchvision

     

       10
       10
        
       , typing-extensions

     

       11
       11
        
       }:

     
···

       21
       21
        
           sha256 = "sha256-w4WSEgNLdVLDnKS4kzJBK9BkrrGzbk2aCIhk4HCM/Bk=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
       -
         propagatedBuildInputs = [ numpy packaging pytorch typing-extensions ];

     

       24
       24
       +
         propagatedBuildInputs = [ numpy packaging torch typing-extensions ];

     

       25
       25
        
       

     

       26
       26
        
         checkInputs = [ onnx pytestCheckHook torchvision ];

     

       27
       27

+2 -2

pkgs/development/python-modules/pytorch/bin.nix pkgs/development/python-modules/torch/bin.nix

···

       24
       24
        
       in buildPythonPackage {

     

       25
       25
        
         inherit version;

     

       26
       26
        
       

     

       27
       27
       -
         pname = "pytorch";

     

       28
       28
       -
         # Don't forget to update pytorch to the same version.

     

       27
       27
       +
         pname = "torch";

     

       28
       28
       +
         # Don't forget to update torch to the same version.

     

       29
       29
        
       

     

       30
       30
        
         format = "wheel";

     

       31
       31

+1 -1

pkgs/development/python-modules/pytorch/binary-hashes.nix pkgs/development/python-modules/torch/binary-hashes.nix

···

       1
       1
       -
       # Warning: use the same CUDA version as pytorch-bin.

     

       1
       1
       +
       # Warning: use the same CUDA version as torch-bin.

     

       2
       2
        
       #

     

       3
       3
        
       # Precompiled wheels can be found at:

     

       4
       4
        
       # https://download.pytorch.org/whl/torch_stable.html

pkgs/development/python-modules/pytorch/breakpad-sigstksz.patch pkgs/development/python-modules/torch/breakpad-sigstksz.patch

+2 -2

pkgs/development/python-modules/pytorch/default.nix pkgs/development/python-modules/torch/default.nix

···

       120
       120
        
           "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ";

     

       121
       121
        
       

     

       122
       122
        
       in buildPythonPackage rec {

     

       123
       123
       -
         pname = "pytorch";

     

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

     

       123
       123
       +
         pname = "torch";

     

       124
       124
       +
         # Don't forget to update torch-bin to the same version.

     

       125
       125
        
         version = "1.11.0";

     

       126
       126
        
         format = "setuptools";

     

       127
       127

pkgs/development/python-modules/pytorch/prefetch.sh pkgs/development/python-modules/torch/prefetch.sh

pkgs/development/python-modules/pytorch/pthreadpool-disable-gcd.diff pkgs/development/python-modules/torch/pthreadpool-disable-gcd.diff

+2 -2

pkgs/development/python-modules/pywick/default.nix

···

       8
       8
        
       , pandas

     

       9
       9
        
       , pillow

     

       10
       10
        
       , six

     

       11
       11
       -
       , pytorch

     

       11
       11
       +
       , torch

     

       12
       12
        
       , torchvision

     

       13
       13
        
       , tqdm

     

       14
       14
        
       , lib

     
···

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         propagatedBuildInputs = [

     

       31
       31
       -
           h5py hickle numpy pandas pillow six pytorch torchvision tqdm

     

       31
       31
       +
           h5py hickle numpy pandas pillow six torch torchvision tqdm

     

       32
       32
        
         ];

     

       33
       33
        
       

     

       34
       34
        
         checkInputs = [ pytest ];

+2 -2

pkgs/development/python-modules/qiskit-machine-learning/default.nix

···

       13
       13
        
       , sparse

     

       14
       14
        
         # Optional inputs

     

       15
       15
        
       , withTorch ? true

     

       16
       16
       -
       , pytorch

     

       16
       16
       +
       , torch

     

       17
       17
        
         # Check Inputs

     

       18
       18
        
       , pytestCheckHook

     

       19
       19
        
       , ddt

     
···

       41
       41
        
           qiskit-terra

     

       42
       42
        
           scikit-learn

     

       43
       43
        
           sparse

     

       44
       44
       -
         ] ++ lib.optional withTorch pytorch;

     

       44
       44
       +
         ] ++ lib.optional withTorch torch;

     

       45
       45
        
       

     

       46
       46
        
         doCheck = false;  # TODO: enable. Tests fail on unstable due to some multithreading issue?

     

       47
       47
        
         checkInputs = [

+2 -2

pkgs/development/python-modules/rising/default.nix

···

       6
       6
        
       , pytest-cov

     

       7
       7
        
       , dill

     

       8
       8
        
       , numpy

     

       9
       9
       -
       , pytorch

     

       9
       9
       +
       , torch

     

       10
       10
        
       , threadpoolctl

     

       11
       11
        
       , tqdm

     

       12
       12
        
       }:

     
···

       24
       24
        
           sha256 = "15wYWToXRae1cMpHWbJwzAp0THx6ED9ixQgL+n1v9PI=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
       -
         propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ];

     

       27
       27
       +
         propagatedBuildInputs = [ numpy torch threadpoolctl tqdm ];

     

       28
       28
        
         checkInputs = [ dill pytest-cov pytestCheckHook ];

     

       29
       29
        
       

     

       30
       30
        
         disabledTests = [ "test_affine" ];  # deprecated division operator '/'

+2 -2

pkgs/development/python-modules/skorch/default.nix

···

       7
       7
        
       , flaky

     

       8
       8
        
       , numpy

     

       9
       9
        
       , pandas

     

       10
       10
       -
       , pytorch

     

       10
       10
       +
       , torch

     

       11
       11
        
       , scikit-learn

     

       12
       12
        
       , scipy

     

       13
       13
        
       , tabulate

     
···

       23
       23
        
           sha256 = "b35cb4e50045742f0ffcfad33044af691d5d36b50212573753a804483a947ca9";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ];

     

       26
       26
       +
         propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ];

     

       27
       27
        
         checkInputs = [ pytest pytest-cov flaky pandas pytestCheckHook ];

     

       28
       28
        
       

     

       29
       29
        
         disabledTests = [

+2 -2

pkgs/development/python-modules/slicer/default.nix

···

       4
       4
        
       , isPy27

     

       5
       5
        
       , pytestCheckHook

     

       6
       6
        
       , pandas

     

       7
       7
       -
       , pytorch

     

       7
       7
       +
       , torch

     

       8
       8
        
       , scipy

     

       9
       9
        
       }:

     

       10
       10
        
       

     
···

       18
       18
        
           sha256 = "f5d5f7b45f98d155b9c0ba6554fa9770c6b26d5793a3e77a1030fb56910ebeec";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         checkInputs = [ pytestCheckHook pandas pytorch scipy ];

     

       21
       21
       +
         checkInputs = [ pytestCheckHook pandas torch scipy ];

     

       22
       22
        
       

     

       23
       23
        
         disabledTests = [

     

       24
       24
        
           # IndexError: too many indices for array

+2 -2

pkgs/development/python-modules/spacy-transformers/default.nix

···

       3
       3
        
       , fetchPypi

     

       4
       4
        
       , buildPythonPackage

     

       5
       5
        
       , dataclasses

     

       6
       6
       -
       , pytorch

     

       6
       6
       +
       , torch

     

       7
       7
        
       , pythonOlder

     

       8
       8
        
       , spacy

     

       9
       9
        
       , spacy-alignments

     
···

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

     

       27
       27
       -
           pytorch

     

       27
       27
       +
           torch

     

       28
       28
        
           spacy

     

       29
       29
        
           spacy-alignments

     

       30
       30
        
           srsly

+2 -2

pkgs/development/python-modules/stanza/default.nix

+2 -2

pkgs/development/python-modules/tensorboardx/default.nix

···

       10
       10
        
       , pillow

     

       11
       11
        
       , protobuf3_8

     

       12
       12
        
       , pytestCheckHook

     

       13
       13
       -
       , pytorch

     

       13
       13
       +
       , torch

     

       14
       14
        
       , six

     

       15
       15
        
       , soundfile

     

       16
       16
        
       , tensorboard

     
···

       55
       55
        
           moto

     

       56
       56
        
           pillow

     

       57
       57
        
           pytestCheckHook

     

       58
       58
       -
           pytorch

     

       58
       58
       +
           torch

     

       59
       59
        
           tensorboard

     

       60
       60
        
           torchvision

     

       61
       61
        
         ];

+2 -2

pkgs/development/python-modules/test-tube/default.nix

···

       7
       7
        
       , imageio

     

       8
       8
        
       , numpy

     

       9
       9
        
       , pandas

     

       10
       10
       -
       , pytorch

     

       10
       10
       +
       , torch

     

       11
       11
        
       , tensorboard

     

       12
       12
        
       }:

     

       13
       13
        
       

     
···

       33
       33
        
           imageio

     

       34
       34
        
           numpy

     

       35
       35
        
           pandas

     

       36
       36
       -
           pytorch

     

       36
       36
       +
           torch

     

       37
       37
        
           tensorboard

     

       38
       38
        
         ];

     

       39
       39

+2 -2

pkgs/development/python-modules/torch-tb-profiler/default.nix

···

       3
       3
        
       , lib

     

       4
       4
        
       , pandas

     

       5
       5
        
       , pytestCheckHook

     

       6
       6
       -
       , pytorch

     

       6
       6
       +
       , torch

     

       7
       7
        
       , tensorboard

     

       8
       8
        
       , torchvision

     

       9
       9
        
       }:

     
···

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [ pandas tensorboard ];

     

       29
       29
        
       

     

       30
       30
       -
         checkInputs = [ pytestCheckHook pytorch torchvision ];

     

       30
       30
       +
         checkInputs = [ pytestCheckHook torch torchvision ];

     

       31
       31
        
       

     

       32
       32
        
         disabledTests = [

     

       33
       33
        
           # Tests that attempt to access the filesystem in naughty ways.

+3 -3

pkgs/development/python-modules/torchaudio/bin.nix

···

       7
       7
        
       , isPy39

     

       8
       8
        
       , isPy310

     

       9
       9
        
       , python

     

       10
       10
       -
       , pytorch-bin

     

       10
       10
       +
       , torch-bin

     

       11
       11
        
       , pythonOlder

     

       12
       12
        
       , pythonAtLeast

     

       13
       13
        
       }:

     
···

       26
       26
        
         disabled = !(isPy37 || isPy38 || isPy39 || isPy310);

     

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [

     

       29
       29
       -
           pytorch-bin

     

       29
       29
       +
           torch-bin

     

       30
       30
        
         ];

     

       31
       31
        
       

     

       32
       32
        
         # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.

     
···

       38
       38
        
           # Note: after patchelf'ing, libcudart can still not be found. However, this should

     

       39
       39
        
           #       not be an issue, because PyTorch is loaded before torchvision and brings

     

       40
       40
        
           #       in the necessary symbols.

     

       41
       41
       -
           patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:${pytorch-bin}/${python.sitePackages}/torch/lib:" \

     

       41
       41
       +
           patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:${torch-bin}/${python.sitePackages}/torch/lib:" \

     

       42
       42
        
             "$out/${python.sitePackages}/torchaudio/_torchaudio.so"

     

       43
       43
        
         '';

     

       44
       44

+1 -1

pkgs/development/python-modules/torchaudio/binary-hashes.nix

···

       1
       1
       -
       # Warning: Need to update at the same time as pytorch-bin

     

       1
       1
       +
       # Warning: Need to update at the same time as torch-bin

     

       2
       2
        
       #

     

       3
       3
        
       # Precompiled wheels can be found at:

     

       4
       4
        
       # https://download.pytorch.org/whl/torch_stable.html

+2 -2

pkgs/development/python-modules/torchgpipe/default.nix

···

       4
       4
        
       , isPy27

     

       5
       5
        
       , pytest-runner

     

       6
       6
        
       , pytestCheckHook

     

       7
       7
       -
       , pytorch

     

       7
       7
       +
       , torch

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     
···

       20
       20
        
           sha256 = "0ki0njhmz1i3pkpr3y6h6ac7p5qh1kih06mknc2s18mfw34f2l55";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         propagatedBuildInputs = [ pytorch ];

     

       23
       23
       +
         propagatedBuildInputs = [ torch ];

     

       24
       24
        
       

     

       25
       25
        
         checkInputs = [ pytest-runner pytestCheckHook ];

     

       26
       26
        
         disabledTests = [

+2 -2

pkgs/development/python-modules/torchinfo/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , pytestCheckHook

     

       5
       5
        
       , pythonOlder

     

       6
       6
       -
       , pytorch

     

       6
       6
       +
       , torch

     

       7
       7
        
       , torchvision

     

       8
       8
        
       }:

     

       9
       9
        
       

     
···

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         propagatedBuildInputs = [

     

       25
       25
       -
           pytorch

     

       25
       25
       +
           torch

     

       26
       26
        
           torchvision

     

       27
       27
        
         ];

     

       28
       28

+2 -2

pkgs/development/python-modules/torchmetrics/default.nix

···

       7
       7
        
       , packaging

     

       8
       8
        
       , psutil

     

       9
       9
        
       , py-deprecate

     

       10
       10
       -
       , pytorch

     

       10
       10
       +
       , torch

     

       11
       11
        
       , pytestCheckHook

     

       12
       12
        
       , torchmetrics

     

       13
       13
        
       , pytorch-lightning

     
···

       34
       34
        
       

     

       35
       35
        
         # Let the user bring their own instance

     

       36
       36
        
         buildInputs = [

     

       37
       37
       -
           pytorch

     

       37
       37
       +
           torch

     

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
        
         checkInputs = [

+3 -3

pkgs/development/python-modules/torchvision/bin.nix

···

       9
       9
        
       , patchelf

     

       10
       10
        
       , pillow

     

       11
       11
        
       , python

     

       12
       12
       -
       , pytorch-bin

     

       12
       12
       +
       , torch-bin

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       let

     
···

       34
       34
        
       

     

       35
       35
        
         propagatedBuildInputs = [

     

       36
       36
        
           pillow

     

       37
       37
       -
           pytorch-bin

     

       37
       37
       +
           torch-bin

     

       38
       38
        
         ];

     

       39
       39
        
       

     

       40
       40
        
         # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.

     
···

       48
       48
        
           # Note: after patchelf'ing, libcudart can still not be found. However, this should

     

       49
       49
        
           #       not be an issue, because PyTorch is loaded before torchvision and brings

     

       50
       50
        
           #       in the necessary symbols.

     

       51
       51
       -
           patchelf --set-rpath "${rpath}:${pytorch-bin}/${python.sitePackages}/torch/lib:" \

     

       51
       51
       +
           patchelf --set-rpath "${rpath}:${torch-bin}/${python.sitePackages}/torch/lib:" \

     

       52
       52
        
             "$out/${python.sitePackages}/torchvision/_C.so"

     

       53
       53
        
         '';

     

       54
       54

+1 -1

pkgs/development/python-modules/torchvision/binary-hashes.nix

···

       1
       1
       -
       # Warning: use the same CUDA version as pytorch-bin.

     

       1
       1
       +
       # Warning: use the same CUDA version as torch-bin.

     

       2
       2
        
       #

     

       3
       3
        
       # Precompiled wheels can be found at:

     

       4
       4
        
       # https://download.pytorch.org/whl/torch_stable.html

+5 -5

pkgs/development/python-modules/torchvision/default.nix

···

       9
       9
        
       , numpy

     

       10
       10
        
       , scipy

     

       11
       11
        
       , pillow

     

       12
       12
       -
       , pytorch

     

       12
       12
       +
       , torch

     

       13
       13
        
       , pytest

     

       14
       14
       -
       , cudaSupport ? pytorch.cudaSupport or false # by default uses the value from pytorch

     

       14
       14
       +
       , cudaSupport ? torch.cudaSupport or false # by default uses the value from torch

     

       15
       15
        
       }:

     

       16
       16
        
       

     

       17
       17
        
       let

     

       18
       18
       -
         inherit (pytorch.cudaPackages) cudatoolkit cudnn;

     

       18
       18
       +
         inherit (torch.cudaPackages) cudatoolkit cudnn;

     

       19
       19
        
       

     

       20
       20
        
         cudatoolkit_joined = symlinkJoin {

     

       21
       21
        
           name = "${cudatoolkit.name}-unsplit";

     

       22
       22
        
           paths = [ cudatoolkit.out cudatoolkit.lib ];

     

       23
       23
        
         };

     

       24
       24
       -
         cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList;

     

       24
       24
       +
         cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" torch.cudaArchList;

     

       25
       25
        
       in buildPythonPackage rec {

     

       26
       26
        
         pname = "torchvision";

     

       27
       27
        
         version = "0.13.0";

     
···

       42
       42
        
         buildInputs = [ libjpeg_turbo libpng ]

     

       43
       43
        
           ++ lib.optionals cudaSupport [ cudnn ];

     

       44
       44
        
       

     

       45
       45
       -
         propagatedBuildInputs = [ numpy pillow pytorch scipy ];

     

       45
       45
       +
         propagatedBuildInputs = [ numpy pillow torch scipy ];

     

       46
       46
        
       

     

       47
       47
        
         preBuild = lib.optionalString cudaSupport ''

     

       48
       48
        
           export TORCH_CUDA_ARCH_LIST="${cudaArchStr}"

+2 -2

pkgs/development/python-modules/transformers/default.nix

···

       17
       17
        
       , scikit-learn

     

       18
       18
        
       , pillow

     

       19
       19
        
       , pyyaml

     

       20
       20
       -
       , pytorch

     

       20
       20
       +
       , torch

     

       21
       21
        
       , tokenizers

     

       22
       22
        
       , tqdm

     

       23
       23
        
       }:

     
···

       67
       67
        
             # tf2onnx

     

       68
       68
        
           ];

     

       69
       69
        
           torch = [

     

       70
       70
       -
             pytorch

     

       70
       70
       +
             torch

     

       71
       71
        
           ];

     

       72
       72
        
           tokenizers = [

     

       73
       73
        
             tokenizers

+2 -2

pkgs/development/python-modules/wandb/default.nix

···

       25
       25
        
       , pytestCheckHook

     

       26
       26
        
       , python-dateutil

     

       27
       27
        
       , pythonOlder

     

       28
       28
       -
       , pytorch

     

       28
       28
       +
       , torch

     

       29
       29
        
       , pyyaml

     

       30
       30
        
       , requests

     

       31
       31
        
       , scikit-learn

     
···

       94
       94
        
           pytest-mock

     

       95
       95
        
           pytest-xdist

     

       96
       96
        
           pytestCheckHook

     

       97
       97
       -
           pytorch

     

       97
       97
       +
           torch

     

       98
       98
        
           scikit-learn

     

       99
       99
        
           tqdm

     

       100
       100
        
         ];

+1 -1

pkgs/tools/audio/tts/default.nix

···

       84
       84
        
           pandas

     

       85
       85
        
           pypinyin

     

       86
       86
        
           pysbd

     

       87
       87
       -
           pytorch-bin

     

       88
       87
        
           pyworld

     

       89
       88
        
           scipy

     

       90
       89
        
           soundfile

     

       91
       90
        
           tensorflow

     

       91
       91
       +
           torch-bin

     

       92
       92
        
           torchaudio-bin

     

       93
       93
        
           tqdm

     

       94
       94
        
           umap-learn

+1 -1

pkgs/top-level/ocaml-packages.nix

···

       1232
       1232
        
           tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { };

     

       1233
       1233
        
       

     

       1234
       1234
        
           torch = callPackage ../development/ocaml-modules/torch {

     

       1235
       1235
       -
             inherit (pkgs.python3Packages) pytorch;

     

       1235
       1235
       +
             inherit (pkgs.python3Packages) torch;

     

       1236
       1236
        
           };

     

       1237
       1237
        
       

     

       1238
       1238
        
           ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };

+4

pkgs/top-level/python-aliases.nix

···

       158
       158
        
         python-subunit = subunit; # added 2021-09-10

     

       159
       159
        
         pytest_xdist = pytest-xdist; # added 2021-01-04

     

       160
       160
        
         python_simple_hipchat = python-simple-hipchat; # added 2021-07-21

     

       161
       161
       +
         pytorch = torch; # added 2022-09-30

     

       162
       162
       +
         pytorch-bin = torch-bin; # added 2022-09-30

     

       163
       163
       +
         pytorchWithCuda = torchWithCuda; # added 2022-09-30

     

       164
       164
       +
         pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30

     

       161
       165
        
         pytwitchapi = twitchapi; # added 2022-03-07

     

       162
       166
        
         qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09

     

       163
       167
        
         qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";

+17 -16

pkgs/top-level/python-packages.nix

···

       9045
       9045
        
       

     

       9046
       9046
        
         pytools = callPackage ../development/python-modules/pytools { };

     

       9047
       9047
        
       

     

       9048
       9048
       -
         pytorch = callPackage ../development/python-modules/pytorch {

     

       9049
       9049
       -
           cudaSupport = pkgs.config.cudaSupport or false;

     

       9050
       9050
       -
           inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;

     

       9051
       9051
       -
           inherit (pkgs.darwin) libobjc;

     

       9052
       9052
       -
         };

     

       9053
       9053
       -
       

     

       9054
       9054
       -
         pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { };

     

       9055
       9055
       -
       

     

       9056
       9048
        
         pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { };

     

       9057
       9049
        
       

     

       9058
       9050
        
         pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { };

     

       9059
       9051
        
       

     

       9060
       9052
        
         pytorch-pfn-extras = callPackage ../development/python-modules/pytorch-pfn-extras { };

     

       9061
       9061
       -
       

     

       9062
       9062
       -
         pytorchWithCuda = self.pytorch.override {

     

       9063
       9063
       -
           cudaSupport = true;

     

       9064
       9064
       -
         };

     

       9065
       9065
       -
       

     

       9066
       9066
       -
         pytorchWithoutCuda = self.pytorch.override {

     

       9067
       9067
       -
           cudaSupport = false;

     

       9068
       9068
       -
         };

     

       9069
       9053
        
       

     

       9070
       9054
        
         pytraccar = callPackage ../development/python-modules/pytraccar { };

     

       9071
       9055
        
       

     
···

       10932
       10916
        
         toonapi = callPackage ../development/python-modules/toonapi { };

     

       10933
       10917
        
       

     

       10934
       10918
        
         toposort = callPackage ../development/python-modules/toposort { };

     

       10919
       10919
       +
       

     

       10920
       10920
       +
         torch = callPackage ../development/python-modules/torch {

     

       10921
       10921
       +
           cudaSupport = pkgs.config.cudaSupport or false;

     

       10922
       10922
       +
           inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;

     

       10923
       10923
       +
           inherit (pkgs.darwin) libobjc;

     

       10924
       10924
       +
         };

     

       10925
       10925
       +
       

     

       10926
       10926
       +
         torch-bin = callPackage ../development/python-modules/torch/bin.nix { };

     

       10927
       10927
       +
       

     

       10928
       10928
       +
       

     

       10929
       10929
       +
         torchWithCuda = self.torch.override {

     

       10930
       10930
       +
           cudaSupport = true;

     

       10931
       10931
       +
         };

     

       10932
       10932
       +
       

     

       10933
       10933
       +
         torchWithoutCuda = self.torch.override {

     

       10934
       10934
       +
           cudaSupport = false;

     

       10935
       10935
       +
         };

     

       10935
       10936
        
       

     

       10936
       10937
        
         torch-tb-profiler = callPackage ../development/python-modules/torch-tb-profiler/default.nix { };

     

       10937
       10938

+1 -1

pkgs/top-level/release-cuda.nix

···

       48
       48
        
           python3.pkgs.libgpuarray = linux;

     

       49
       49
        
           python3.pkgs.tensorflowWithCuda = linux;

     

       50
       50
        
           python3.pkgs.pyrealsense2WithCuda = linux;

     

       51
       51
       -
           python3.pkgs.pytorchWithCuda = linux;

     

       51
       51
       +
           python3.pkgs.torchWithCuda = linux;

     

       52
       52
        
           python3.pkgs.jaxlib = linux;

     

       53
       53
        
         }) // (genAttrs packageSets evalPackageSet));

     

       54
       54