NixOS · mweinelt · Aug 30, 2022 · Aug 30, 2022
diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix
@@ -12,7 +12,7 @@
 , ppx_sexp_conv
 , sexplib
 , stdio
-, pytorch
+, torch
 }:
 
 buildDunePackage rec {
@@ -37,16 +37,16 @@ buildDunePackage rec {
     ctypes
     npy
     ocaml-compiler-libs
-    pytorch
-    pytorch.dev
     ppx_custom_printf
     ppx_expect
     ppx_sexp_conv
     sexplib
     stdio
+    torch
+    torch.dev
   ];
 
-  preBuild = "export LIBTORCH=${pytorch.dev}/";
+  preBuild = "export LIBTORCH=${torch.dev}/";
 
   doCheck = !stdenv.isAarch64;
   checkPhase = "dune runtest";
@@ -56,6 +56,6 @@ buildDunePackage rec {
     description = "Ocaml bindings to Pytorch";
     maintainers = [ maintainers.bcdarwin ];
     license = licenses.asl20;
-    broken = lib.versionAtLeast pytorch.version "1.11";
+    broken = lib.versionAtLeast torch.version "1.11";
   };
 }
diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix
@@ -12,7 +12,7 @@
 , fn
 , pyopengl
 , seaborn
-, pytorch
+, torch
 , pythonOlder
 , torchvision
 }:
@@ -43,7 +43,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     xvfb-run
-    pytorch
+    torch
     torchvision
   ];
 

diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix
@@ -6,7 +6,7 @@
 
 , coqpit
 , fsspec
-, pytorch-bin
+, torch-bin
 , tensorboardx
 , protobuf
 
@@ -33,7 +33,7 @@ buildPythonPackage {
   propagatedBuildInputs = [
     coqpit
     fsspec
-    pytorch-bin
+    torch-bin
     soundfile
     tensorboardx
     protobuf

diff --git a/pkgs/development/python-modules/deepwave/default.nix b/pkgs/development/python-modules/deepwave/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, pytorch
+, torch
 , ninja
 , scipy
 , which
@@ -48,7 +48,7 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  propagatedBuildInputs = [ pytorch pybind11 ];
+  propagatedBuildInputs = [ torch pybind11 ];
 
   checkInputs = [
     which

diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix
@@ -8,7 +8,7 @@
 , lib
 , poetry
 , pytestCheckHook
-, pytorch
+, torch
 , pyyaml
 , sh
 , tables
@@ -66,7 +66,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     pytestCheckHook
-    pytorch
+    torch
     sh
     tensorflow
   ];

diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix
@@ -8,7 +8,7 @@
 , scipy
 , matplotlib
 , scikit-learn
-, pytorch
+, torch
 , pytestCheckHook
 }:
 
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     scipy
     matplotlib
     scikit-learn
-    pytorch
+    torch
   ];
 
   checkInputs = [

diff --git a/pkgs/development/python-modules/functorch/default.nix b/pkgs/development/python-modules/functorch/default.nix
@@ -5,7 +5,7 @@
 , ninja
 , pytestCheckHook
 , python
-, pytorch
+, torch
 , pybind11
 , which
 }:
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   # `setup.py` imports `torch.utils.cpp_extension`.
   nativeBuildInputs = [
     ninja
-    pytorch
+    torch
     which
   ];
 

diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix
@@ -8,7 +8,7 @@
 , matplotlib
 , mock
 , packaging
-, pytorch
+, torch
 , scikit-learn
 , tqdm
 }:
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ];
-  propagatedBuildInputs = [ packaging pytorch scikit-learn tqdm ];
+  propagatedBuildInputs = [ packaging torch scikit-learn tqdm ];
 
   # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
   doCheck = pythonOlder "3.9";

diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix
@@ -6,7 +6,7 @@
 , ignite
 , numpy
 , pybind11
-, pytorch
+, torch
 , which
 }:
 
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ ninja which ];
   buildInputs = [ pybind11 ];
-  propagatedBuildInputs = [ numpy pytorch ignite ];
+  propagatedBuildInputs = [ numpy torch ignite ];
 
   BUILD_MONAI = 1;
 

diff --git a/pkgs/development/python-modules/py-deprecate/default.nix b/pkgs/development/python-modules/py-deprecate/default.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , pytestCheckHook
 , scikit-learn
-, pytorch
 }:
 
 let

diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix
@@ -3,7 +3,7 @@
 , buildPythonPackage
 , numpy
 , scipy
-, pytorch
+, torch
 , autograd
 , nose2
 , matplotlib
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     sha256 = "sha256-dqyduExNgXIbEFlgkckaPfhLFSVLqPgwAOyBUdowwiQ=";
   };
 
-  propagatedBuildInputs = [ numpy scipy pytorch ];
+  propagatedBuildInputs = [ numpy scipy torch ];
   checkInputs = [ nose2 autograd matplotlib tensorflow ];
 
   checkPhase = ''

diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -10,7 +10,7 @@
 , pillow
 , pyro-api
 , pythonOlder
-, pytorch
+, torch
 , scikit-learn
 , seaborn
 , torchvision
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     pyro-api
-    pytorch
+    torch
     networkx
     opt-einsum
     tqdm

diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix
@@ -6,7 +6,7 @@
 , fsspec
 , packaging
 , pytestCheckHook
-, pytorch
+, torch
 , pyyaml
 , tensorboard
 , torchmetrics
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     packaging
     future
     fsspec
-    pytorch
+    torch
     pyyaml
     tensorboard
     torchmetrics

diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix
@@ -5,7 +5,7 @@
 , numpy
 , scikit-learn
 , pytestCheckHook
-, pytorch
+, torch
 , torchvision
 , tqdm
 , faiss
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     numpy
-    pytorch
+    torch
     scikit-learn
     torchvision
     tqdm

diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
@@ -5,7 +5,7 @@
 , onnx
 , packaging
 , pytestCheckHook
-, pytorch
+, torch
 , torchvision
 , typing-extensions
 }:
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     sha256 = "sha256-w4WSEgNLdVLDnKS4kzJBK9BkrrGzbk2aCIhk4HCM/Bk=";
   };
 
-  propagatedBuildInputs = [ numpy packaging pytorch typing-extensions ];
+  propagatedBuildInputs = [ numpy packaging torch typing-extensions ];
 
   checkInputs = [ onnx pytestCheckHook torchvision ];
 

diff --git a/pkgs/development/python-modules/pywick/default.nix b/pkgs/development/python-modules/pywick/default.nix
@@ -8,7 +8,7 @@
 , pandas
 , pillow
 , six
-, pytorch
+, torch
 , torchvision
 , tqdm
 , lib
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    h5py hickle numpy pandas pillow six pytorch torchvision tqdm
+    h5py hickle numpy pandas pillow six torch torchvision tqdm
   ];
 
   checkInputs = [ pytest ];

diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix
@@ -13,7 +13,7 @@
 , sparse
   # Optional inputs
 , withTorch ? true
-, pytorch
+, torch
   # Check Inputs
 , pytestCheckHook
 , ddt
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     qiskit-terra
     scikit-learn
     sparse
-  ] ++ lib.optional withTorch pytorch;
+  ] ++ lib.optional withTorch torch;
 
   doCheck = false;  # TODO: enable. Tests fail on unstable due to some multithreading issue?
   checkInputs = [

diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix
@@ -6,7 +6,7 @@
 , pytest-cov
 , dill
 , numpy
-, pytorch
+, torch
 , threadpoolctl
 , tqdm
 }:
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     sha256 = "15wYWToXRae1cMpHWbJwzAp0THx6ED9ixQgL+n1v9PI=";
   };
 
-  propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ];
+  propagatedBuildInputs = [ numpy torch threadpoolctl tqdm ];
   checkInputs = [ dill pytest-cov pytestCheckHook ];
 
   disabledTests = [ "test_affine" ];  # deprecated division operator '/'

diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix
@@ -7,7 +7,7 @@
 , flaky
 , numpy
 , pandas
-, pytorch
+, torch
 , scikit-learn
 , scipy
 , tabulate
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     sha256 = "b35cb4e50045742f0ffcfad33044af691d5d36b50212573753a804483a947ca9";
   };
 
-  propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ];
+  propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ];
   checkInputs = [ pytest pytest-cov flaky pandas pytestCheckHook ];
 
   disabledTests = [

diff --git a/pkgs/development/python-modules/slicer/default.nix b/pkgs/development/python-modules/slicer/default.nix
@@ -4,7 +4,7 @@
 , isPy27
 , pytestCheckHook
 , pandas
-, pytorch
+, torch
 , scipy
 }:
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "f5d5f7b45f98d155b9c0ba6554fa9770c6b26d5793a3e77a1030fb56910ebeec";
   };
 
-  checkInputs = [ pytestCheckHook pandas pytorch scipy ];
+  checkInputs = [ pytestCheckHook pandas torch scipy ];
 
   disabledTests = [
     # IndexError: too many indices for array

diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , buildPythonPackage
 , dataclasses
-, pytorch
+, torch
 , pythonOlder
 , spacy
 , spacy-alignments
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    pytorch
+    torch
     spacy
     spacy-alignments
     srsly