Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
ENH: Use intelics/2017 on cluster
  • Loading branch information
Pariksheet Nanda committed Feb 22, 2018
1 parent 4479ed8 commit 8ccfa0a
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions Utilities/Install/opti_FindMKL.m
Expand Up @@ -11,6 +11,10 @@ if (nargin < 2 || isempty(ifortStatic))
ifortStatic = false;
end

MKL_linux.compiler = {'/apps2/intelics/2017/compilers_and_libraries_2017.0.098/linux/compiler'};
MKL_linux.mkl = {'/apps2/intelics/2017/compilers_and_libraries_2017.0.098/linux/mkl'};
MKL_linux.ver = '2017';

%Known MKL path locations (Modify to suit your system by adding to cell arrays, or create a new structure for other versions)
MKL11_3.compiler = {'C:\Program Files\IntelSWTools\compilers_and_libraries\windows\compiler','C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\compiler'};
MKL11_3.mkl = {'C:\Program Files\IntelSWTools\compilers_and_libraries\windows\mkl','C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\mkl'};
Expand All @@ -37,7 +41,7 @@ MKL10_3.mkl = {'C:\Program Files\Intel\ComposerXE-2011\mkl\','C:\Program Files (
MKL10_3.ver = '10.3';

%Add any new structures to below
MKLLIB = {MKL11_3,MKL11_2,MKL11_1,MKL11,MKL10_3_1,MKL10_3};
MKLLIB = {MKL_linux, MKL11_3,MKL11_2,MKL11_1,MKL11,MKL10_3_1,MKL10_3};


%DO NOT MODIFY BELOW HERE
Expand All @@ -59,7 +63,7 @@ for i = 1:length(mklstr.mkl)
if(exist(mklstr.mkl{i},'dir'))
dir_mkl = mklstr.mkl{i};
%Get Include Directory
mkl_inc = [dir_mkl '\include'];
mkl_inc = [dir_mkl '/include'];
if(~exist(mkl_inc,'dir'))
error('Could not find MKL include directory. Checked:\n %s',mkl_inc);
end
Expand All @@ -71,6 +75,10 @@ for i = 1:length(mklstr.mkl)
case 'PCWIN64'
mkl_lib = [dir_mkl '\lib\intel64'];
mkl_mklstr = ' -lmkl_intel_lp64';
case 'GLNXA64'
mkl_lib = [dir_mkl '/lib/intel64'];
mkl_mklstr = ' -lmkl_intel_lp64';

end
if(~exist(mkl_lib,'dir'))
error('Could not find MKL lib directory. Checked:\n %s\n',mkl_lib);
Expand Down Expand Up @@ -99,6 +107,8 @@ for i = 1:length(mklstr.compiler)
mkl_cmplr = [dir_cmplr '\lib\ia32'];
case 'PCWIN64'
mkl_cmplr = [dir_cmplr '\lib\intel64'];
case 'GLNXA64'
mkl_cmplr = [dir_cmplr '/lib/intel64'];
end
if(~exist(mkl_cmplr,'dir'))
error('Could not find MKL compiler directory. Checked:\n %s\n',mkl_cmplr);
Expand Down

0 comments on commit 8ccfa0a

Please sign in to comment.