Bump pytorch 2.4

ilastik · Sep 12, 2024 · 85feeac · 85feeac
1 parent 6996b5a
commit 85feeac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -51,10 +51,10 @@ 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
-    - torchvision=*=*cpu
     - pytest
     - pytest-grpc
+    - cpuonly
+    - ilastik-pytorch-version-helper-cpu
   imports:
     # client
     - tiktorch

diff --git a/setup.py b/setup.py
@@ -35,12 +35,7 @@
         "pyyaml",
         "xarray",
     ],
-    extras_require={
-        "server-pytorch": [
-            "pytorch>=1.6",
-            "scikit-learn",
-        ]
-    },
+    extras_require={"server-pytorch": ["pytorch>=2.4", "scikit-learn", "torchvision"]},
     entry_points={"console_scripts": ["tiktorch=tiktorch.server.base:main"]},
     # extras_require={"test": ["pytest"]},
     project_urls={  # Optional