File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -104,7 +104,11 @@ scikit_learn_install() {
104
104
# Without openmp, we use the system clang. Here we use /usr/bin/ar
105
105
# instead because llvm-ar errors
106
106
export AR=/usr/bin/ar
107
- # delete omp.h
107
+ # Make sure omp.h is not present in the conda environment, so that
108
+ # using an unprotected "cimport openmp" will make this build fail. At
109
+ # the time of writing, on OSX, blas (mkl or openblas) brings in openmp
110
+ # so that you end up having the omp.h include inside the conda
111
+ # environment.
108
112
find $CONDA_PREFIX -name omp.h -delete -print
109
113
fi
110
114
Original file line number Diff line number Diff line change @@ -9,7 +9,6 @@ cimport numpy as cnp
9
9
from cython cimport floating
10
10
11
11
cnp.import_array()
12
- cimport openmp
13
12
14
13
def _inplace_contiguous_isotonic_regression (floating[::1] y , floating[::1] w ):
15
14
cdef:
You can’t perform that action at this time.
0 commit comments