update Intel tools for CMSSW 10.0.x

gcc-toolfile.spec

@@ -140,7 +140,7 @@ EOF_TOOLFILE
 # optimizations as they become available in gcc.
 COMPILER_CXXFLAGS=
 
-COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -std=c++1z -ftree-vectorize"
+COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -std=c++17 -ftree-vectorize"
 COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -Wstrict-overflow"
 COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits"
 COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -fvisibility-inlines-hidden"

icc-gcc-toolfile.spec

@@ -30,7 +30,7 @@ export ICC_VERSION=ICC_SCRAM_VERSION
 export GCC_ROOT
 
 mkdir -p %i/etc/scram.d
-# Generic template for the toolfiles. 
+# Generic template for the toolfiles.
 # *** USE @VARIABLE@ plus associated environment variable to customize. ***
 # DO NOT DUPLICATE the toolfile template.
 
@@ -46,30 +46,22 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/icc-cxxcompiler.xml
     <client>
       <environment name="ICC_CXXCOMPILER_BASE" default="@ICC_ROOT@/installation" handler="warn"/>
       <environment name="CXX" value="$ICC_CXXCOMPILER_BASE/%{iccbin_dir}/icpc" handler="warn"/>
+      <environment name="LIBDIR" default="$ICC_CXXCOMPILER_BASE/compiler/lib/intel64"/>
     </client>
-    # drop flags not supported by llvm
-    # -Wno-non-template-friend removed since it's not supported, yet, by llvm.
-    <flags REM_CXXFLAGS="-Wno-non-template-friend"/>
-    <flags REM_CXXFLAGS="-Werror=format-contains-nul"/>
-    <flags REM_CXXFLAGS="-Wno-vla"/>
-    <flags REM_CXXFLAGS="-Wstrict-overflow"/>
-    <flags REM_CXXFLAGS="-Wno-strict-overflow"/>
-    <flags REM_CXXFLAGS="-fipa-pta"/>
     <flags REM_CXXFLAGS="-felide-constructors"/>
-    <flags REM_CXXFLAGS="-fdiagnostics-show-option"/>
-    <flags REM_CXXFLAGS="-Wno-non-template-friend"/>
-    <flags REM_CXXFLAGS="-Werror=format-contains-nul"/>
-    <flags REM_CXXFLAGS="-Wunknown-pragmas"/>
     <flags REM_CXXFLAGS="-ftree-vectorize"/>
-    <flags REM_CXXFLAGS="-Wno-unused-local-typedefs"/>
+    <flags REM_CXXFLAGS="-Wstrict-overflow"/>
+    <flags REM_CXXFLAGS="-fno-crossjumping"/>
+    <flags REM_CXXFLAGS="-Wno-non-template-friend"/>
     <flags REM_CXXFLAGS="-Wno-psabi"/>
-    <flags REM_CXXFLAGS="-ffast-math"/>
-    <flags REM_CXXFLAGS="-flto"/>
-    <flags REM_CXXFLAGS="-fno-lto"/>
+    <flags REM_CXXFLAGS="-Wno-unused-local-typedefs"/>
+    <flags REM_CXXFLAGS="-Wno-vla"/>
     <flags REM_LDFLAGS="-Wl,--icf=all"/>
     <flags CXXFLAGS="-Wno-unknown-pragmas"/>
     <flags CXXFLAGS="-axSSE4.1,SSE4.2,AVX,CORE-AVX2"/>
     <flags CXXFLAGS="-wd869"/>
+    <flags CXXFLAGS="-no-parallel"/>
+    <lib name="irc"/>
     <architecture name="_mic_">
       <flags CXXFLAGS="-mmic"/>
       <flags LDFLAGS="-mmic"/>
@@ -95,7 +87,7 @@ EOF_TOOLFILE
 
 cat << \EOF_TOOLFILE >%i/etc/scram.d/icc-f77compiler.xml
   <tool name="icc-f77compiler" version="@ICC_VERSION@" type="compiler">
-    <use name="gcc-f77compiler"/>    
+    <use name="gcc-f77compiler"/>
     <client>
       <environment name="ICC_FCOMPILER_BASE" default="@ICC_ROOT@/ifort" handler="warn"/>
       <environment name="FC" default="$ICC_FCOMPILER_BASE/%{f77bin_dir}/ifort" handler="warn"/>

icc-provides.spec

@@ -1,4 +1,4 @@
-### RPM external icc-provides composer_xe_2013
+### RPM external icc-provides 2018.0.128
 ## NOCOMPILER
 %define mic %(case %cmsplatf in (*_mic_*) echo true;; (*) echo false;; esac)
 Source: none

icc-scram.spec

@@ -1,9 +1,9 @@
-### RPM cms icc-scram 2017.2.174
+### RPM cms icc-scram 2018.0.128
 ## NOCOMPILER
 Requires: icc-provides
 %prep
 %build
 %install
 cd %i
-ln -s /cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2017/compilers_and_libraries_%{realversion}/linux installation
-ln -s /cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2017/compilers_and_libraries_%{realversion}/linux ifort
+ln -s /cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2018/compilers_and_libraries_%{realversion}/linux installation
+ln -s /cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2018/compilers_and_libraries_%{realversion}/linux ifort

intel-vtune.spec

@@ -1,4 +1,4 @@
-### RPM external intel-vtune 2017.3.0.510739
+### RPM external intel-vtune 2018.0.2.525261
 ## NOCOMPILER
 
 %prep
@@ -11,11 +11,11 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/intel-vtune.xml
 <tool name="intel-vtune" version="%{realversion}">
   <info url="https://software.intel.com/en-us/intel-vtune-amplifier-xe"/>
   <client>
-    <environment name="INTEL_VTUNE_BASE" default="/cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2017/vtune_amplifier_xe_%{realversion}"/>
+    <environment name="INTEL_VTUNE_BASE" default="/cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2018/vtune_amplifier_%{realversion}"/>
     <environment name="BINDIR" default="$INTEL_VTUNE_BASE/bin64"/>
   </client>
   <runtime name="PATH" value="$INTEL_VTUNE_BASE/bin64" type="path"/>
-  <runtime name="VTUNE_AMPLIFIER_XE_2017_DIR" value="$INTEL_VTUNE_BASE"/>
+  <runtime name="VTUNE_AMPLIFIER_2018_DIR" value="$INTEL_VTUNE_BASE"/>
 </tool>
 EOF_TOOLFILE
 

tbb.spec

@@ -1,4 +1,4 @@
-### RPM external tbb 2018
+### RPM external tbb 2018_U1
 
 %define tag %{realversion}
 %define branch tbb_2018