Merge pull request #32 from reedts/20170915171707_new_pr_icc20180128

Updated ifort patch to fit new version and removed example archives from imkl

Author: boegel

easybuild/easyconfigs/i/ifort/ifort-2018.0.128-GCC-6.4.0-2.28.eb

@@ -12,11 +12,11 @@ sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran.tg
 
 checksums = [
     '597718bf752a52e043675102c6c03971be5dd3400a2e849bc295094395beef89',  # parallel_studio_xe_2018_composer_edition_for_fortran.tgz
-    '7241e492a5f7ba4e62e8106c97f585c2fd931e32886d886f7bf0a9020e421325',  # ifort_2017_no_mpi_mic_dependency.patch
+    '64793f16491eb35b1c008eaacc348bff283a53f78ba766e5ece7878a38ae6064'   # ifort_2017_no_mpi_mic_dependency.patch
 ]
 
 # remove dependency on intel-mpi-rt-mic
-patches = ['ifort_2017_no_mpi_mic_dependency.patch']
+patches = ['ifort_2017.09_no_mpi_mic_dependency.patch']
 
 gccver = '6.4.0'
 binutilsver = '2.28'

easybuild/easyconfigs/i/ifort/ifort_2017.09_no_mpi_mic_dependency.patch

@@ -0,0 +1,11 @@
+--- pset/mediaconfig.xml.orig	2017-10-19 13:44:49.383480127 +0200
++++ pset/mediaconfig.xml	2017-10-19 13:48:09.237258398 +0200
+@@ -888,7 +888,7 @@
+     </Layers>
+     <InstallDir>${COMPLIB_ROOT}</InstallDir>
+     <GUID>1503574163037</GUID>
+-    <Component depend="35.3;1.1;1.3;1.91;1.11;1.12;1.14;1.16;1.7;1.27;1.24;142.2" id="1" invisible="0" mandatory="0" platform="INTEL64">
++    <Component depend="35.3;1.1;1.3;1.91;1.11;1.12;1.14;1.16;1.7;1.27;1.24" id="1" invisible="0" mandatory="0" platform="INTEL64">
+       <Name>Intel Fortran Compiler for Intel(R) 64</Name>
+       <Description>Intel Fortran Compiler 18.0</Description>
+       <Name locale="">Intel Fortran Compiler for Intel(R) 64</Name>

easybuild/easyconfigs/i/imkl/imkl-2018.0.128-iimpi-2017.09.eb

@@ -27,8 +27,6 @@ postinstallcmds = [
     'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
     'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
     'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
-    'tar xvzf %(installdir)s/mkl/examples/examples_mic_c.tgz -C %(installdir)s/mkl/examples/',
-    'tar xvzf %(installdir)s/mkl/examples/examples_mic_f.tgz -C %(installdir)s/mkl/examples/'
 ]
 
 modextravars = {