ci fix mkl

laoyuer · Jun 7, 2019 · b0fc17f · b0fc17f
1 parent ffb357c
commit b0fc17f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ci/travis/install.sh b/ci/travis/install.sh
@@ -55,7 +55,7 @@ gem install coveralls-lcov
 
 
 # Add MKL shared libraries to the path
-export MKL_SHARED_LIB_DIR=`python -c 'import numpy.distutils.system_info as sysinfo; print(sysinfo.get_info("mkl")["library_dirs"][0])'`
+export MKL_SHARED_LIB_DIR=`ls -rd $HOME/miniconda/pkgs/*/ | grep mkl-2 | head -n 1`/lib
 
 echo "MKL shared library path: ${MKL_SHARED_LIB_DIR}"
 

diff --git a/docs/get_started/linear_system_solvers.rst b/docs/get_started/linear_system_solvers.rst
@@ -61,9 +61,12 @@ Install with Anaconda
 ^^^^^^^^^^^^^^^^^^^^^
 `Anaconda Python distribution <https://www.anaconda.com/download/>`_ comes with the intel MKL libraries preinstalled including MKL Pardiso.
 To use this version, the Anaconda libraries folders have to be in your system path.
-Anaconda environments should add them automatically so in most cases you do not have do to anything. If you get an error where OSQP cannot find MKL, you can add the right path by adding the output from the following command to your path:
+Anaconda environments should add them automatically so in most cases you do not have do to anything. If you get an error where OSQP cannot find MKL, you can add the right path by adding the output from the following command to your path variable:
 
 .. code::
 
-   python -c 'import numpy.distutils.system_info as sysinfo; print(sysinfo.get_info("mkl")["library_dirs"][0])'
+   echo "`ls -rd ${ANACONDA_ROOT}/pkgs/*/ | grep mkl-2 | head -n 1`/lib"
+
+
+where :code:`ANACONDA_ROOT` is the root of your anaconda installation.