Skip to content
Snippets Groups Projects
Commit 78df5332 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'mkl-numpy' into 'master' 

Fix numpy and mkl version incompatibility

See merge request !41
parents dc15cc4f 9b087b5a
Branches
Tags
1 merge request!41Fix numpy and mkl version incompatibility
Pipeline #29372 passed
Stage: build
Stage: deploy
Hide whitespace changes
Inline Side-by-side
bob/devtools/data/conda_build_config.yaml
+ 2
− 2
View file @ 78df5332
...@@ -74,7 +74,7 @@ cython: ...@@ -74,7 +74,7 @@ cython:
# we are linking against them. It is best to keep this in sync with: # we are linking against them. It is best to keep this in sync with:
# https://github.com/AnacondaRecipes/aggregate/blob/master/conda_build_config.yaml # https://github.com/AnacondaRecipes/aggregate/blob/master/conda_build_config.yaml
numpy: numpy:
- 1.14.5 - 1.15.0
boost: boost:
- 1.67.0 - 1.67.0
ffmpeg: ffmpeg:
...@@ -100,7 +100,7 @@ libsvm: ...@@ -100,7 +100,7 @@ libsvm:
libtiff: libtiff:
- 4.0.9 - 4.0.9
mkl: mkl:
- 2019.3 - 2019.1
openfst: openfst:
- 1.6.1 - 1.6.1
sox: sox:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment