Merge pull request #236 from ilastik/upd-npy

Upd numpy to v2

Author: k-dominik

.github/workflows/ci.yml

@@ -155,14 +155,14 @@ jobs:
         shell: bash -l {0}
         run: |
           conda build --test --override-channels \
-            -c ./pkgs -c pytorch -c conda-forge \
+            -c ./pkgs -c conda-forge \
             ./pkgs/noarch/${TIKTORCH_PACKAGE_NAME}
       - name: macOS Test
         if: matrix.os == 'macos-latest'
         shell: bash -l {0}
         run: |
           conda build --test --override-channels \
-            -c ./pkgs -c pytorch -c conda-forge \
+            -c ./pkgs -c conda-forge \
             ./pkgs/noarch/${TIKTORCH_PACKAGE_NAME}
       - name: Windows Test
         if: matrix.os == 'windows-latest'
@@ -174,5 +174,5 @@ jobs:
         shell: cmd /C CALL {0}
         run: |
           conda build --test --override-channels ^
-            -c %CD%\pkgs -c pytorch -c conda-forge ^
+            -c %CD%\pkgs -c conda-forge ^
             .\pkgs\noarch\%TIKTORCH_PACKAGE_NAME%

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
   rev: 23.3.0
   hooks:
   - id: black
-    language_version: python3.9
+    language_version: python3.11
     exclude: (.*_pb2.py|.*_pb2_grpc.py)
 - repo: https://github.com/timothycrosley/isort
   rev: 5.12.0

conda-recipe/meta.yaml

@@ -37,7 +37,6 @@ requirements:
       {% endif %}
     {% endfor %}
   run_constrained:
-    - mkl <2024.1.0  # [linux] until pytorch is compatible with the current version
     - cudatoolkit >=10.2
     {% for dep in setup_py_data['extras_require']['server-pytorch'] %}
     - {{ dep.lower() }}
@@ -57,11 +56,10 @@ test:
     {% for dep in setup_py_data['extras_require']['server-pytorch'] %}
     - {{ dep.lower() }}
     {% endfor %}
-    - python 3.9.*
+    - python 3.11.*
     - pytest
     - pytest-grpc
     - pytest-timeout
-    - cpuonly
   imports:
     # client
     - tiktorch

environment.yml

@@ -1,18 +1,17 @@
 name: tiktorch-server-env
 channels:
-  - pytorch
   - conda-forge
 dependencies:
   # - bioimage.spec via submodule
   # - bioimage.core via submodule
-  - python 3.9.*
-  - numpy >=1.21,<2
-  - grpcio=1.49.1 # protobuf 5 requires protoc version > 3.19.0 that requires grpcio >= 1.44
+  - python 3.11.*
+  - numpy >=2,<3
+  - grpcio=1.69.0 # protobuf 5 requires protoc version > 3.19.0 that requires grpcio >= 1.44
   - marshmallow-union
   - marshmallow=3.12.*
   - marshmallow-jsonschema
   - protobuf
-  - pyyaml=5.3.*
+  - pyyaml>5
   - requests
   - scikit-learn
   - scipy
@@ -24,11 +23,10 @@ dependencies:
 
   # pytorch
   # remove cpuonly, add cudatoolkit and cudnn for gpu support
-  - pytorch=2.3.*
+  - pytorch=2.7.*
   # currently it's necessary to force the cpu version, remove
   # torchvision pin when going for gpu
   # - torchvision
-  - cpuonly
   # - cudatoolkit >=10.2
   # - cudnn
   - torchvision
@@ -66,8 +64,3 @@ dependencies:
   - bump2version
   - mypy
   - pre_commit
-
-  - mkl <2024.1.0  # [linux] until pytorch is compatible with the current version
-
-
-

setup.py

@@ -30,7 +30,7 @@
         "bioimageio.spec",
         "bioimageio.core==0.8.0",
         "grpcio>=1.31",
-        "numpy<2",  # pytorch 2.2.2-py3.9_0 for macos is compiled with numpy 1.*
+        "numpy>=2,<3",
         "protobuf",
         "pydantic>=2.7.0,<2.10",
         "pytorch3dunet",

tiktorch/rpc/types.py

@@ -1,7 +1,8 @@
 import inspect
 import threading
 from concurrent.futures import Future
-from typing import Callable, Generic, Type, TypeVar, _GenericAlias
+from types import GenericAlias
+from typing import Callable, Generic, Type, TypeVar
 
 T = TypeVar("T")
 S = TypeVar("S")
@@ -107,7 +108,7 @@ def map(self, func: Callable[[T], S]) -> "RPCFuture[S]":
 
 
 def _checkgenericfut(type_: Type) -> bool:
-    if isinstance(type_, _GenericAlias):
+    if isinstance(type_, GenericAlias):
         origin = getattr(type_, "__origin__", None)
         return origin and issubclass(origin, Future)
     return False
@@ -116,5 +117,4 @@ def _checkgenericfut(type_: Type) -> bool:
 def isfutureret(func: Callable):
     sig = inspect.signature(func)
     ret = sig.return_annotation
-
-    return (inspect.isclass(ret) and issubclass(sig.return_annotation, Future)) or _checkgenericfut(ret)
+    return (inspect.isclass(ret) and issubclass(ret, Future)) or _checkgenericfut(ret)