Skip to content

fix names of local variables in intel easyconfigs #8697

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.

Sign up for GitHub

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

Merged
wpoely86 merged 1 commit into from
Aug 9, 2019
Merged

fix names of local variables in intel easyconfigs #8697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions easybuild/easyconfigs/i/intel/intel-2016.00.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and

toolchain = SYSTEM

compver = '2016.0.109'
gccver = '4.9.3'
binutilsver = '2.25'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2016.0.109'
local_gccver = '4.9.3'
local_binutilsver = '2.25'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', '5.1.1.109', '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', '11.3.0.109', '', ('iimpi', '%s%s' % (version, gccsuff))),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', '5.1.1.109', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', '11.3.0.109', '', ('iimpi', '%s%s' % (version, local_gccsuff))),
]

moduleclass = 'toolchain'
20 changes: 10 additions & 10 deletions easybuild/easyconfigs/i/intel/intel-2016.01.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and

toolchain = SYSTEM

compver = '2016.1.150'
gccver = '4.9.3'
binutilsver = '2.25'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2016.1.150'
local_gccver = '4.9.3'
local_binutilsver = '2.25'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', '5.1.2.150', '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', '11.3.1.150', '', ('iimpi', '%s%s' % (version, gccsuff))),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', '5.1.2.150', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', '11.3.1.150', '', ('iimpi', '%s%s' % (version, local_gccsuff))),
]

moduleclass = 'toolchain'
24 changes: 12 additions & 12 deletions easybuild/easyconfigs/i/intel/intel-2016.02-GCC-4.9.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ easyblock = 'Toolchain'

name = 'intel'
version = '2016.02'
gcc_maj_min = '4.9'
versionsuffix = '-GCC-%s' % gcc_maj_min
local_gcc_maj_min = '4.9'
versionsuffix = '-GCC-%s' % local_gcc_maj_min

homepage = 'https://easybuild.readthedocs.io/en/master/Common-toolchains.html#intel-toolchain'
description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI &
Intel MKL."""

toolchain = SYSTEM

compver = '2016.2.181'
gccver = '%s.3' % gcc_maj_min
binutilsver = '2.25'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2016.2.181'
local_gccver = '%s.3' % local_gcc_maj_min
local_binutilsver = '2.25'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', '11.3.2.181', '', ('iimpi', '%s%s' % (version, gccsuff))),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', '11.3.2.181', '', ('iimpi', '%s%s' % (version, local_gccsuff))),
]

moduleclass = 'toolchain'
24 changes: 12 additions & 12 deletions easybuild/easyconfigs/i/intel/intel-2016.02-GCC-5.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ easyblock = 'Toolchain'

name = 'intel'
version = '2016.02'
gcc_maj_min = '5.3'
versionsuffix = '-GCC-%s' % gcc_maj_min
local_gcc_maj_min = '5.3'
versionsuffix = '-GCC-%s' % local_gcc_maj_min

homepage = 'https://easybuild.readthedocs.io/en/master/Common-toolchains.html#intel-toolchain'
description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI &
Intel MKL."""

toolchain = SYSTEM

compver = '2016.2.181'
gccver = '%s.0' % gcc_maj_min
binutilsver = '2.26'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2016.2.181'
local_gccver = '%s.0' % local_gcc_maj_min
local_binutilsver = '2.26'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', '11.3.2.181', '', ('iimpi', '%s%s' % (version, gccsuff))),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', '11.3.2.181', '', ('iimpi', '%s%s' % (version, local_gccsuff))),
]

moduleclass = 'toolchain'
24 changes: 12 additions & 12 deletions easybuild/easyconfigs/i/intel/intel-2016.03-GCC-4.9.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ easyblock = 'Toolchain'

name = 'intel'
version = '2016.03'
gcc_maj_min = '4.9'
versionsuffix = '-GCC-%s' % gcc_maj_min
local_gcc_maj_min = '4.9'
versionsuffix = '-GCC-%s' % local_gcc_maj_min

homepage = 'https://easybuild.readthedocs.io/en/master/Common-toolchains.html#intel-toolchain'
description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI &
Intel MKL."""

toolchain = SYSTEM

compver = '2016.3.210'
gccver = '%s.3' % gcc_maj_min
binutilsver = '2.25'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2016.3.210'
local_gccver = '%s.3' % local_gcc_maj_min
local_binutilsver = '2.25'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', '11.3.3.210', '', ('iimpi', '%s%s' % (version, gccsuff))),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', '11.3.3.210', '', ('iimpi', '%s%s' % (version, local_gccsuff))),
]

moduleclass = 'toolchain'
24 changes: 12 additions & 12 deletions easybuild/easyconfigs/i/intel/intel-2016.03-GCC-5.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ easyblock = 'Toolchain'

name = 'intel'
version = '2016.03'
gcc_maj_min = '5.3'
versionsuffix = '-GCC-%s' % gcc_maj_min
local_gcc_maj_min = '5.3'
versionsuffix = '-GCC-%s' % local_gcc_maj_min

homepage = 'https://easybuild.readthedocs.io/en/master/Common-toolchains.html#intel-toolchain'
description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI &
Intel MKL."""

toolchain = SYSTEM

compver = '2016.3.210'
gccver = '%s.0' % gcc_maj_min
binutilsver = '2.26'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2016.3.210'
local_gccver = '%s.0' % local_gcc_maj_min
local_binutilsver = '2.26'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', '11.3.3.210', '', ('iimpi', '%s%s' % (version, gccsuff))),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', '11.3.3.210', '', ('iimpi', '%s%s' % (version, local_gccsuff))),
]

moduleclass = 'toolchain'
24 changes: 12 additions & 12 deletions easybuild/easyconfigs/i/intel/intel-2016.03-GCC-5.4.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ easyblock = 'Toolchain'

name = 'intel'
version = '2016.03'
gcc_maj_min = '5.4'
versionsuffix = '-GCC-%s' % gcc_maj_min
local_gcc_maj_min = '5.4'
versionsuffix = '-GCC-%s' % local_gcc_maj_min

homepage = 'https://easybuild.readthedocs.io/en/master/Common-toolchains.html#intel-toolchain'
description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI &
Intel MKL."""

toolchain = SYSTEM

compver = '2016.3.210'
gccver = '%s.0' % gcc_maj_min
binutilsver = '2.26'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2016.3.210'
local_gccver = '%s.0' % local_gcc_maj_min
local_binutilsver = '2.26'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', '11.3.3.210', '', ('iimpi', '%s%s' % (version, gccsuff))),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', '11.3.3.210', '', ('iimpi', '%s%s' % (version, local_gccsuff))),
]

moduleclass = 'toolchain'
12 changes: 6 additions & 6 deletions easybuild/easyconfigs/i/intel/intel-2016a.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and

toolchain = SYSTEM

compver = '2016.1.150'
gccsuff = '-GCC-4.9.3-2.25'
local_compver = '2016.1.150'
local_gccsuff = '-GCC-4.9.3-2.25'

dependencies = [
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', '5.1.2.150', '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', '11.3.1.150', '', ('iimpi', '8.1.5%s' % gccsuff)),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', '5.1.2.150', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', '11.3.1.150', '', ('iimpi', '8.1.5%s' % local_gccsuff)),
]

moduleclass = 'toolchain'
18 changes: 9 additions & 9 deletions easybuild/easyconfigs/i/intel/intel-2016b.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and

toolchain = SYSTEM

compver = '2016.3.210'
gccver = '5.4.0'
binutilsver = '2.26'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2016.3.210'
local_gccver = '5.4.0'
local_binutilsver = '2.26'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, gccsuff))),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', '11.3.3.210', '', ('iimpi', version)),
]

Expand Down
20 changes: 10 additions & 10 deletions easybuild/easyconfigs/i/intel/intel-2017.00.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and

toolchain = SYSTEM

compver = '2017.0.098'
gccver = '5.4.0'
binutilsver = '2.26'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2017.0.098'
local_gccver = '5.4.0'
local_binutilsver = '2.26'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', '2017.0.098', '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', '2017.0.098', '', ('iimpi', version + gccsuff)),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', '2017.0.098', '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', '2017.0.098', '', ('iimpi', version + local_gccsuff)),
]

moduleclass = 'toolchain'
20 changes: 10 additions & 10 deletions easybuild/easyconfigs/i/intel/intel-2017.01.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and

toolchain = SYSTEM

compver = '2017.1.132'
gccver = '5.4.0'
binutilsver = '2.26'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2017.1.132'
local_gccver = '5.4.0'
local_binutilsver = '2.26'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', compver, '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', compver, '', ('iimpi', version + gccsuff)),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', local_compver, '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', local_compver, '', ('iimpi', version + local_gccsuff)),
]

moduleclass = 'toolchain'
20 changes: 10 additions & 10 deletions easybuild/easyconfigs/i/intel/intel-2017.02.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and

toolchain = SYSTEM

compver = '2017.2.174'
gccver = '6.3.0'
binutilsver = '2.27'
gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
local_compver = '2017.2.174'
local_gccver = '6.3.0'
local_binutilsver = '2.27'
local_gccsuff = '-GCC-%s-%s' % (local_gccver, local_binutilsver)
dependencies = [
('GCCcore', gccver),
('binutils', binutilsver, '-GCCcore-%s' % gccver),
('icc', compver, gccsuff),
('ifort', compver, gccsuff),
('impi', compver, '', ('iccifort', '%s%s' % (compver, gccsuff))),
('imkl', compver, '', ('iimpi', version + gccsuff)),
('GCCcore', local_gccver),
('binutils', local_binutilsver, '-GCCcore-%s' % local_gccver),
('icc', local_compver, local_gccsuff),
('ifort', local_compver, local_gccsuff),
('impi', local_compver, '', ('iccifort', '%s%s' % (local_compver, local_gccsuff))),
('imkl', local_compver, '', ('iimpi', version + local_gccsuff)),
]

moduleclass = 'toolchain'
Loading