Merge pull request #179 from k-dominik/update-conda-recipe

Updated the conda recipe

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 20.9.4
+current_version = 21.7.0
 parse = (?P<year>\d+)\.(?P<month>\d+)\.(?P<number>\d+)((?P<release>[a-z]+)?(?P<build>\d+)?)?
 serialize = 
 	{year}.{month}.{number}{release}

.circleci/config.yml

@@ -133,12 +133,8 @@ jobs:
           name: build packages
           command: |
             . /opt/conda/etc/profile.d/conda.sh
-            conda activate tiktorch-server-env
             ./scripts/conda_build.sh conda-recipe-client
-            ./scripts/conda_build.sh bioimageio-core-recipe
-            ./scripts/conda_build.sh bioimageio-torch-recipe
             ./scripts/conda_build.sh conda-recipe
-            ./scripts/conda_build.sh conda-recipe-cpu
 
 
 workflows:

conda-recipe-client/conda_build_config.yaml

@@ -1,4 +0,0 @@
-numpy:
-  - 1.14
-python:
-  - 3.7

conda-recipe-client/meta.yaml

@@ -1,33 +1,25 @@
+{% set setup_py_data = load_setup_py_data() %}
 package:
   name: tiktorch-client
-  {% set tagged_version = GIT_DESCRIBE_TAG|replace("v","")|replace("-", ".") %}
-  {% if GIT_DESCRIBE_NUMBER|int != 0 %}
-    {% set tagged_version = tagged_version %}
-  {% endif %}
-
-  version: {{tagged_version}}
+  version: {{ setup_py_data['version'] }}
 
 source:
-  git_url: ../
+  path: ../
 
 build:
   noarch: python
-  number: {{ GIT_DESCRIBE_NUMBER }}
   script: python -m pip install --no-deps --ignore-installed .
-  string: np{{CONDA_NPY}}py{{CONDA_PY}}_{{PKG_BUILDNUM}}_h{{PKG_HASH}}_g{{GIT_FULL_HASH[:7]}}
-
 
 requirements:
   build:
     - pip
     - python >=3.7
   run:
     - python >=3.7
-    - numpy >=1.14
-    - grpcio >=1.23
-    - protobuf=3.11.4
-    - paramiko
-    - pyyaml
+    {% for dep in setup_py_data['install_requires'] %}
+    - {{ dep.lower() }}
+    {% endfor %}
+
 
 about:
   home: https://github.com/ilastik/tiktorch
@@ -41,8 +33,10 @@ about:
 test:
   imports:
     - tiktorch
-    - tiktorch.launcher
     - tiktorch.proto.inference_pb2
     - tiktorch.proto.inference_pb2_grpc
     - tiktorch.proto.data_store_pb2
     - tiktorch.proto.data_store_pb2_grpc
+    - tiktorch.types
+    - tiktorch.converters
+

conda-recipe/conda_build_config.yaml

@@ -1,4 +1,7 @@
-pytorch_version:
-  - 1.0
-inferno_version:
-  - v0.4
+cpuonly:
+    - none
+    - cpuonly
+
+inferno:
+    - v0.4
+

conda-recipe/meta.yaml

@@ -1,42 +1,48 @@
+{% set setup_py_data = load_setup_py_data() %}
+{% if not cpuonly is defined %}
+  {% set cpuonly = 'none' %}
+  {% set cudatoolkit = 'none' %}
+{% endif %}
+
 package:
+  {% if cpuonly.startswith('none') %}
   name: tiktorch
-  {% set tagged_version = GIT_DESCRIBE_TAG|replace("v","")|replace("-", ".") %}
-  {% if GIT_DESCRIBE_NUMBER|int != 0 %}
-    {% set tagged_version = tagged_version %}
+  {% else %}
+  name: tiktorch-cpu
   {% endif %}
 
-  version:
-   {{tagged_version}}
+  version: {{ setup_py_data['version'] }}
 
 source:
-  git_url: ../
+  path: ../
 
 build:
   noarch: python
-  number: {{ GIT_DESCRIBE_NUMBER }}
+  number: 0
   script: python -m pip install --no-deps --ignore-installed .
-  string: np{{CONDA_NPY}}py{{CONDA_PY}}_{{PKG_BUILDNUM}}_h{{PKG_HASH}}_g{{GIT_FULL_HASH[:7]}}
   entry_points:
     - tiktorch-server = tiktorch.server.base:main
 
 requirements:
-  build:
+
+  host:
     - pip
     - python >=3.7
+
   run:
-    - git
-    - h5py
     - python >=3.7
-    - numpy >=1.14
-    - python-bioimage-io >=0.2
-    - pytorch-bioimage-io
-    - grpcio=1.23
-    - protobuf=3.11.4
-    - pyyaml
-    - paramiko
-    - inferno
-    - cudatoolkit >=10.1,<11
-    - scikit-learn
+    {% if not cpuonly.startswith('none') %}
+    - {{ cpuonly }}
+    {% else %}
+    - cudatoolkit >=10.2
+    {% endif %}
+    {% for dep in setup_py_data['install_requires'] %}
+    - {{ dep.lower() }}
+    {% endfor %}
+    {% for dep in setup_py_data['extras_require']['server'] %}
+    - {{ dep.lower() }}
+    {% endfor %}
+
 
 about:
   home: https://github.com/ilastik/tiktorch

setup.py

@@ -11,12 +11,12 @@
 
 setup(
     name="tiktorch",
-    version="20.9.4",
+    version="21.7.0",
     description="Tiktorch client/server",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/ilastik/tiktorch",
-    author="Ilastik Team",
+    author="ilastik Team",
     author_email="[email protected]",
     classifiers=[  # Optional
         "Development Status :: 3 - Alpha",
@@ -25,14 +25,24 @@
     ],
     packages=find_packages(exclude=["tests"]),  # Required
     install_requires=[
-        "inferno-pytorch",
-        "paramiko",
+        "bioimageio.spec",
+        "grpcio-tools",
+        "grpcio>=1.31",
         "numpy",
+        "paramiko",
+        "pickle5",
+        "protobuf",
         "pyyaml",
-        "torch",
-        "bioimageio.core @ git+ssh://[email protected]/bioimage-io/python-bioimage-io#egg=bioimageio.core",
-        "bioimageio.torch @ git+ssh://[email protected]/bioimage-io/pytorch-bioimage-io#egg=bioimageio.torch",
+        "xarray",
     ],
+    extras_require={
+        "server": [
+            "git",
+            "inferno",
+            "pytorch>=1.6",
+            "scikit-learn",
+        ],
+    },
     entry_points={"console_scripts": ["tiktorch=tiktorch.server.base:main"]},
     # extras_require={"test": ["pytest"]},
     project_urls={  # Optional