Bump pytorch>=2.3

conda-recipe/meta.yaml

@@ -26,7 +26,6 @@ requirements:
     - python >=3.8
   run:
     - python >=3.8
-    - pickle5  # [py37]
     {% for dep in setup_py_data['install_requires'] %}
     - {{ dep.lower() }}
     {% endfor %}
@@ -51,11 +50,11 @@ test:
     {% for dep in setup_py_data['extras_require']['server-pytorch'] %}
     - {{ dep.lower() }}
     {% endfor %}
-    # this is still necessary, torchvision doesn't work properly with cpuonly mutex
     - python 3.9.*
-    - torchvision=*=*cpu
     - pytest
     - pytest-grpc
+    - cpuonly
+    - ilastik-pytorch-version-helper-cpu
   imports:
     # client
     - tiktorch

environment.yml

@@ -25,7 +25,7 @@ dependencies:
 
   # pytorch
   # remove cpuonly, add cudatoolkit and cudnn for gpu support
-  - pytorch=2.4.*
+  - pytorch=2.3.*
   # currently it's necessary to force the cpu version, remove
   # torchvision pin when going for gpu
   # - torchvision

setup.py

@@ -35,12 +35,7 @@
         "pyyaml",
         "xarray",
     ],
-    extras_require={
-        "server-pytorch": [
-            "pytorch>=1.6",
-            "scikit-learn",
-        ]
-    },
+    extras_require={"server-pytorch": ["pytorch>=2", "scikit-learn", "torchvision"]},
     entry_points={"console_scripts": ["tiktorch=tiktorch.server.base:main"]},
     # extras_require={"test": ["pytest"]},
     project_urls={  # Optional