mkl fix?

Author: agramfort

.travis.yml

@@ -76,14 +76,16 @@ before_install:
         echo "PSET_INSTALL_DIR=${MKL_INSTALL_DIR}" >> silent.cfg
         ./l_mkl_2018.0.128/install.sh --user-mode -s ./silent.cfg
         export LD_LIBRARY_PATH="${MKL_INSTALL_DIR}/mkl/lib/intel64/:${LD_LIBRARY_PATH}"
+        . ${MKL_INSTALL_DIR}/mkl/bin/mklvars.sh intel64 ilp64
       else  # Mac
         export MKL_INSTALL_DIR=/opt/intel
         wget http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12185/m_mkl_2017.4.220.dmg
         hdiutil attach m_mkl_2017.4.220.dmg
-        cat l_mkl_2018.0.128/silent.cfg | grep -v EULA | grep -v PSET_INSTALL_DIR > silent.cfg
+        cat /Volumes/m_mkl_2017.4.220/m_mkl_2017.4.220.app/Contents/MacOS/silent.cfg | grep -v EULA | grep -v PSET_INSTALL_DIR > silent.cfg
         echo "ACCEPT_EULA=accept" >> silent.cfg
         echo "PSET_INSTALL_DIR=${MKL_INSTALL_DIR}" >> silent.cfg
         sudo /Volumes/m_mkl_2017.4.220/m_mkl_2017.4.220.app/Contents/MacOS/install.sh -s ./silent.cfg
+        . /opt/intel/mkl/bin/mklvars.sh intel64 ilp64
       fi
     fi
 

CMakeLists.txt

@@ -16,8 +16,11 @@ message(STATUS "BLAS Libraries: ${BLAS_LIBRARIES}")
 
 set(BLA_DEFINITIONS)
 if (BLA_VENDOR MATCHES Intel)
+    if ($ENV{MKLROOT} STREQUAL "")
+        message(FATAL_ERROR "MKLROOT is not set. Please source the Intel MKL mklvars.sh file.")
+    endif()
     find_path(MKL_INCLUDE_DIRS NAMES mkl.h
-              PATHS /opt/intel/mkl/include/)
+              PATHS $ENV{MKLROOT}/include/)
     message(STATUS "MKL Include: ${MKL_INCLUDE_DIRS}")
     include_directories(${MKL_INCLUDE_DIRS})
     set(BLA_DEFINITIONS USE_MKL)

Hello/Speaker.cpp

@@ -26,7 +26,7 @@ namespace Hello {
     double A[6] = {1.0,2.0,1.0,-3.0,4.0,-1.0};
     double B[6] = {1.0,2.0,1.0,-3.0,4.0,-1.0};
     double C[9] = {.5,.5,.5,.5,.5,.5,.5,.5,.5};
-    cblas_dgemm(CblasColMajor, CblasNoTrans, CblasTrans,3,3,2,1,A, 3, B, 3,2,C,3);
+    cblas_dgemm(CblasColMajor, CblasNoTrans, CblasTrans,3,3,2,1.,A,3,B,3,2.,C,3);
 
     std::ostringstream out;
     for(auto&& c:C)