Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated Intel ICC compiler to test 16.0 beta release #1612

Merged
merged 2 commits into from Jun 5, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions icc-gcc-toolfile.spec
@@ -1,4 +1,4 @@
### RPM cms icc-gcc-toolfile 2.0
### RPM cms icc-gcc-toolfile 3.0

Requires: gcc-toolfile
Requires: icc-scram
Expand Down Expand Up @@ -28,6 +28,7 @@ fi
export ICC_ROOT=$ICC_SCRAM_ROOT
export ICC_VERSION=ICC_SCRAM_VERSION
export GCC_ROOT
export INTEL_LICENSE_FILE

mkdir -p %i/etc/scram.d
# Generic template for the toolfiles.
Expand Down Expand Up @@ -69,7 +70,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/icc-cxxcompiler.xml
<runtime name="PATH" value="$ICC_CXXCOMPILER_BASE/%{iccbin_dir}" type="path" handler="warn"/>
<runtime name="COMPILER_RUNTIME_OBJECTS" value="@GCC_ROOT@" handler="warn"/>
<runtime name="INTEL_LICENSE_FILE" value="28518@AT@lxlic01.cern.ch,28518@AT@lxlic02.cern.ch,28518@AT@lxlic03.cern.ch" type="path" handler="warn"/>
<runtime name="INTEL_LICENSE_FILE" value="$ICC_CXXCOMPILER_BASE/licenses" type="path" handler="warn"/>
<runtime name="INTEL_LICENSE_FILE" value="@INTEL_LICENSE_FILE@" type="path" handler="warn"/>
<runtime name="INTEL_LICENSE_FILE" value="/opt/intel/licenses" type="path" handler="warn"/>
</tool>
EOF_TOOLFILE
Expand Down
7 changes: 4 additions & 3 deletions icc-scram.spec
@@ -1,9 +1,10 @@
### RPM cms icc-scram 15.0.1
### RPM cms icc-scram 16.0beta
## INITENV SETV INTEL_LICENSE_FILE /afs/cern.ch/sw/IntelSoftware/linux/x86_64/xe2016/licenses
## NOCOMPILER
Requires: icc-provides
%prep
%build
%install
cd %i
ln -s /afs/cern.ch/sw/IntelSoftware/linux/x86_64/xe2015/composer_xe_2015.1.133 installation
ln -s /afs/cern.ch/sw/IntelSoftware/linux/x86_64/xe2015/composer_xe_2015.1.133 ifort
ln -s /afs/cern.ch/sw/IntelSoftware/linux/x86_64/xe2016/compilers_and_libraries_2016.0.056/linux installation
ln -s /afs/cern.ch/sw/IntelSoftware/linux/x86_64/xe2016/compilers_and_libraries_2016.0.056/linux ifort