Skip to content

Commit

Permalink
Fix numpy conflict (cvat-ai#278)
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxim Zhiltsov authored Jun 3, 2021
1 parent bf32c4d commit 723c500
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ lxml>=4.4.1
matplotlib>=3.3.1
opencv-python-headless>=4.1.0.25
Pillow>=6.1.0
pycocotools>=2.0.0
pycocotools>=2.0.0 --no-binary=pycocotools # https://github.com/openvinotoolkit/datumaro/issues/253
PyYAML>=5.3.1
scikit-image>=0.15.0
tensorboardX>=1.8
Expand Down
11 changes: 10 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,17 @@ def get_requirements():
'matplotlib',
'numpy>=1.17.3',
'Pillow',
'pycocotools; platform_system != "Windows"',

# Avoid 2.0.2 Linux binary distribution because of
# a conflict in numpy versions with TensorFlow:
# - TF is compiled with numpy 1.19 ABI
# - pycocotools is compiled with numpy 1.20 ABI
# Using a previous version allows to force package rebuilding.
#
# https://github.com/openvinotoolkit/datumaro/issues/253
'pycocotools!=2.0.2; platform_system != "Windows"',
'pycocotools-windows; platform_system == "Windows"',

'PyYAML',
'scikit-image',
'tensorboardX',
Expand Down

0 comments on commit 723c500

Please sign in to comment.