Merge branch 'master' into examples
# Conflicts: # imagej/infer_ilastik_by_api.py # tests/test_ilastik.py
No related branches found
No related tags found
Showing
- api.py 59 additions, 28 deletionsapi.py
- conf/defaults.py 9 additions, 0 deletionsconf/defaults.py
- conf/ilastik.py 5 additions, 0 deletionsconf/ilastik.py
- conf/server.py 0 additions, 21 deletionsconf/server.py
- conf/testing.py 3 additions, 7 deletionsconf/testing.py
- imagej/infer_ilastik_by_api.py 0 additions, 56 deletionsimagej/infer_ilastik_by_api.py
- model_server/ilastik.py 8 additions, 6 deletionsmodel_server/ilastik.py
- model_server/image.py 3 additions, 2 deletionsmodel_server/image.py
- model_server/session.py 43 additions, 13 deletionsmodel_server/session.py
- model_server/workflow.py 11 additions, 2 deletionsmodel_server/workflow.py
- model_server/workflow_ilastik.py 73 additions, 0 deletionsmodel_server/workflow_ilastik.py
- tests/test_api.py 14 additions, 6 deletionstests/test_api.py
- tests/test_ilastik.py 24 additions, 18 deletionstests/test_ilastik.py
- tests/test_image.py 11 additions, 0 deletionstests/test_image.py
- tests/test_session.py 16 additions, 3 deletionstests/test_session.py
- tests/test_workflow.py 1 addition, 3 deletionstests/test_workflow.py
Loading
Please register or sign in to comment