Skip to content

Commit 5bf03ec

Browse files
authored
Merge pull request #292 from bioimage-io/fix_pip
Fix pip installation
2 parents e50c3cc + c739ae8 commit 5bf03ec

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

conda-recipe/meta.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@ requirements:
2828
- {{ dep.lower() }}
2929
{% endfor %}
3030
run_constrained:
31+
- cudatoolkit>=10.1
3132
{% for dep in setup_py_data['extras_require']['pytorch'] %}
33+
{% if dep.startswith('torch>=') %} # pip: torch -> conda: pytorch
34+
- py{{ dep.lower() }}
35+
{% else %}
3236
- {{ dep.lower() }}
37+
{% endif %}
3338
{% endfor %}
3439
{% for dep in setup_py_data['extras_require']['onnx'] %}
3540
- {{ dep.lower() }}

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
extras_require={
3939
"test": ["pytest", "black", "mypy"],
4040
"dev": ["pre-commit"],
41-
"pytorch": ["pytorch>=1.6", "torchvision", "cudatoolkit>=10.1"],
41+
"pytorch": ["torch>=1.6", "torchvision"],
4242
"tensorflow": ["tensorflow"],
4343
"onnx": ["onnxruntime"],
4444
},

0 commit comments

Comments
 (0)