diff --git a/recipe/bld.bat b/recipe/bld.bat index 91f0c1f..9a7bdfc 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,14 +1,26 @@ set CVXOPT_MSVC=1 -set "CVXOPT_BLAS_LIB_DIR=%LIBRARY_PREFIX%\lib" +set "CVXOPT_BLAS_LIB_DIR=%LIBRARY_PREFIX%" if "%blas_impl%" == "mkl" ( - set CVXOPT_BLAS_LIB=mkl_rt - set CVXOPT_LAPACK_LIB=mkl_rt + set CVXOPT_BLAS_LIB=lib\mkl_rt + set CVXOPT_LAPACK_LIB=lib\mkl_rt ) if "%blas_impl%" == "openblas" ( - set CVXOPT_BLAS_LIB=openblas - set CVXOPT_LAPACK_LIB=openblas + :: see "libopenblas" output for windows here: + :: https://github.com/conda-forge/openblas-feedstock/blob/master/recipe/meta.yaml + set CVXOPT_BLAS_LIB=bin\openblas + :: see "blas-devel" output for windows here: + :: https://github.com/conda-forge/blas-feedstock/blob/master/recipe/meta.yaml + set CVXOPT_LAPACK_LIB=bin\liblapack +) +if "%blas_impl%" == "blis" ( + :: see output for windows here: + :: https://github.com/conda-forge/blis-feedstock/blob/master/recipe/meta.yaml + set CVXOPT_BLAS_LIB=lib\libblis + :: see "blas-devel" output for windows here: + :: https://github.com/conda-forge/blas-feedstock/blob/master/recipe/meta.yaml + set CVXOPT_LAPACK_LIB=bin\liblapack ) set CVXOPT_BUILD_GSL=1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 97c8a55..19f0a0b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,8 +16,7 @@ source: build: skip: true # [py<35] - skip: true # [win and blas_impl != 'mkl'] - number: 203 + number: 204 requirements: build: @@ -29,12 +28,12 @@ requirements: - setuptools - gsl - fftw - - blas - - mkl-devel {{ mkl }} # [win and blas_impl == "mkl"] - dsdp - glpk # suitesparse is linked against on windows, and compiled-in on windows, because yeah, windows. - suitesparse # [not win] + # headers needed to compile suitesparse + - blas-devel run: - python