OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Pinning opencv to < 3.4 in conda builds (#7923)

Browse Source 
* Pinning opencv to 3.1.0 in conda builds

* Also pinning numpy to 1.11

* Trying only specifying <3.4
This commit is contained in:
Paul Jesse Hellemn 2018-06-05 13:16:02 -07:00 committed by GitHub
parent a3fc5ed351
commit fa1bdcf4d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/build_anaconda.sh
View File

@ -324,7 +324,7 @@ if [[ -n $pytorch_too ]]; then
fi
if [[ -z $slim ]]; then
add_package 'opencv'
add_package 'opencv' '<3.4'
else
caffe2_cmake_args+=("-DUSE_OPENCV=OFF")
fi
@ -355,13 +355,8 @@ else
fi
# Change flags based on target gcc ABI
# Default conda channels use gcc 7.2, conda-forge uses gcc 4.8.5
if [[ "$(uname)" != 'Darwin' && "$GCC_USE_C11" -eq 0 ]]; then
# opencv 3.3.1 in conda-forge doesn't have imgcodecs, and opencv 3.1.0
# requires numpy 1.12
remove_lines_with 'opencv'
add_package 'opencv' '==3.1.0'
# Default conda channels use gcc 7.2, conda-forge uses gcc 4.8.5
caffe2_cmake_args+=("-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0")
conda_channel+=('-c conda-forge')
fi