Skip to content

Commit

Permalink
Merge pull request #10072 from akesandgren/20200316153808_new_pr_HPL23
Browse files Browse the repository at this point in the history
Switch to GCC 9.3.0 for foss/2020a and intel/2020a release
  • Loading branch information
boegel committed Mar 17, 2020
2 parents e59084d + 94f2f32 commit af945bd
Show file tree
Hide file tree
Showing 16 changed files with 75 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = '1.72.0'
homepage = 'https://www.boost.org/'
description = """Boost provides free peer-reviewed portable C++ source libraries."""

toolchain = {'name': 'gompi', 'version': '2020a-rc3'}
toolchain = {'name': 'gompi', 'version': '2020a'}
toolchainopts = {'pic': True, 'usempi': True}

source_urls = ['https://dl.bintray.com/boostorg/release/%(version)s/source/']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ homepage = 'http://www.fftw.org'
description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
in one or more dimensions, of arbitrary input size, and of both real and complex data."""

toolchain = {'name': 'gompi', 'version': '2020a-rc3'}
toolchain = {'name': 'gompi', 'version': '2020a'}
toolchainopts = {'pic': True}

source_urls = [homepage]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
easyblock = 'Toolchain'

name = 'foss'
version = '2020a-rc3'
version = '2020a'

homepage = 'https://easybuild.readthedocs.io/en/master/Common-toolchains.html#foss-toolchain'
description = """GNU Compiler Collection (GCC) based compiler toolchain, including
OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK."""

toolchain = SYSTEM

local_gccver = '9.2.0'
local_gccver = '9.3.0'

# toolchain used to build foss dependencies
local_comp_mpi_tc = ('gompi', version)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
easyblock = "Toolchain"

name = 'gompi'
version = '2020a-rc3'
version = '2020a'

homepage = '(none)'
description = """GNU Compiler Collection (GCC) based compiler toolchain,
including OpenMPI for MPI support."""

toolchain = SYSTEM

local_gccver = '9.2.0'
local_gccver = '9.3.0'

# compiler toolchain dependencies
dependencies = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = """HPL is a software package that solves a (random) dense linear s
arithmetic on distributed-memory computers. It can thus be regarded as a portable as well as freely available
implementation of the High Performance Computing Linpack Benchmark."""

toolchain = {'name': 'foss', 'version': '2020a-rc3'}
toolchain = {'name': 'foss', 'version': '2020a'}
toolchainopts = {'usempi': True}

source_urls = ['https://www.netlib.org/benchmark/%(namelower)s']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = """HPL is a software package that solves a (random) dense linear s
arithmetic on distributed-memory computers. It can thus be regarded as a portable as well as freely available
implementation of the High Performance Computing Linpack Benchmark."""

toolchain = {'name': 'intel', 'version': '2020a-rc1'}
toolchain = {'name': 'intel', 'version': '2020a'}
toolchainopts = {'usempi': True}

source_urls = ['https://www.netlib.org/benchmark/%(namelower)s']
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyconfigs/i/iccifort/iccifort-2020.0.166.eb
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ checksums = [
'b7a3d1934e8ffe1712ffb82747332e025355f9f5fbef62349d0c7b4cb7e636a5',
]

local_gccver = '9.2.0'
local_gccver = '9.3.0'

dependencies = [
('GCCcore', local_gccver),
('binutils', '2.32', '', ('GCCcore', local_gccver)),
('binutils', '2.34', '', ('GCCcore', local_gccver)),
]

# list of regex for components to install
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
easyblock = 'Toolchain'

name = 'iimpi'
version = '2020a-rc1'
version = '2020a'

homepage = 'https://software.intel.com/parallel-studio-xe'
description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = """Intel Math Kernel Library is a library of highly optimized,
applications that require maximum performance. Core math functions include
BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""

toolchain = {'name': 'iimpi', 'version': '2020a-rc1'}
toolchain = {'name': 'iimpi', 'version': '2020a'}

source_urls = ['https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16232/']
sources = ['l_mkl_%(version)s.tgz']
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This is an easyconfig file for EasyBuild, see http://easybuilders.github.io/easybuild

name = 'impi'
version = '2019.6.166'

homepage = 'https://software.intel.com/en-us/intel-mpi-library/'
description = "Intel MPI Library, compatible with MPICH ABI"

toolchain = {'name': 'iccifort', 'version': '2020.0.166'}

source_urls = ['https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16120/']
sources = ['l_mpi_%(version)s.tgz']
checksums = ['119be69f1117c93a9e5e9b8b4643918e55d2a55a78ad9567f77d16cdaf18cd6e']

dontcreateinstalldir = True

components = ['intel-mpi', 'intel-psxe', 'intel-imb']

# set up all the mpi commands to default to intel compilers
# set_mpi_wrappers_all = True

moduleclass = 'mpi'
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
easyblock = 'Toolchain'

name = 'intel'
version = '2020a-rc1'
version = '2020a'

homepage = 'https://easybuild.readthedocs.io/en/master/Common-toolchains.html#intel-toolchain'
description = "Compiler toolchain including Intel compilers, Intel MPI and Intel Math Kernel Library (MKL)."

toolchain = SYSTEM

local_compver = '2020.0.166'
local_gccver = '9.2.0'
local_gccver = '9.3.0'
dependencies = [
('GCCcore', local_gccver),
('binutils', '2.32', '-GCCcore-%s' % local_gccver),
('binutils', '2.34', '', ('GCCcore', local_gccver)),
('iccifort', local_compver),
('impi', '2019.6.166', '', ('iccifort', local_compver)),
('imkl', local_compver, '', ('iimpi', version)),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage = 'https://pypi.python.org/pypi/networkx'
description = """NetworkX is a Python package for the creation, manipulation,
and study of the structure, dynamics, and functions of complex networks."""

toolchain = {'name': 'foss', 'version': '2020a-rc3'}
toolchain = {'name': 'foss', 'version': '2020a'}

source_urls = [PYPI_SOURCE]
sources = [SOURCE_TAR_GZ]
Expand Down
30 changes: 30 additions & 0 deletions easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.3.8-GCC-9.3.0.eb
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name = 'OpenBLAS'
version = '0.3.8'

homepage = 'https://xianyi.github.com/OpenBLAS/'
description = "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."

toolchain = {'name': 'GCC', 'version': '9.3.0'}

source_urls = [
# order matters, trying to download the large.tgz/timing.tgz LAPACK tarballs from GitHub causes trouble
'https://www.netlib.org/lapack/timing/',
'https://github.com/xianyi/OpenBLAS/archive/',
]
sources = ['v%(version)s.tar.gz']
patches = [
('large.tgz', '.'),
('timing.tgz', '.'),
'OpenBLAS-0.3.8_fix-dscal-inline-asm.patch',
]
checksums = [
'8f86ade36f0dbed9ac90eb62575137388359d97d8f93093b38abe166ad7ef3a8', # v0.3.8.tar.gz
'f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1', # large.tgz
'999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af', # timing.tgz
'2e494213e6785187ab1286cda8538452f9fa897ae5110159e3bb441239f84424', # OpenBLAS-0.3.8_fix-dscal-inline-asm.patch
]

# extensive testing can be enabled by uncommenting the line below
# runtest = 'PATH=.:$PATH lapack-timing'

moduleclass = 'numlib'
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ homepage = 'https://www.netlib.org/scalapack/'
description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines
redesigned for distributed memory MIMD parallel computers."""

toolchain = {'name': 'gompi', 'version': '2020a-rc3'}
toolchain = {'name': 'gompi', 'version': '2020a'}
toolchainopts = {'pic': True}

source_urls = [homepage]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ versionsuffix = '-Python-3.8.2'
homepage = 'https://python.org/'
description = "Bundle of Python packages for scientific software"

toolchain = {'name': 'foss', 'version': '2020a-rc3'}
toolchain = {'name': 'foss', 'version': '2020a'}
toolchainopts = {'pic': True, 'lowopt': True}

dependencies = [
Expand All @@ -28,7 +28,7 @@ exts_list = [
('scipy', '1.4.1', {
'patches': ['scipy-1.4.1-fix-pthread.patch'],
'checksums': [
'dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59',
'dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59', # scipy-1.4.1.tar.gz
'4e2162a93caddce63a1aa2dfb6c181774a4f6615950e1d60c54bb4308fee3bb3', # scipy-1.4.1-fix-pthread.patch
],
}),
Expand All @@ -41,6 +41,9 @@ exts_list = [
('mpmath', '1.1.0', {
'checksums': ['fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6'],
}),
('deap', '1.3.1', {
'checksums': ['11f54493ceb54aae10dde676577ef59fc52d52f82729d5a12c90b0813c857a2f'],
}),
]

sanity_pip_check = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage = 'https://scikit-build.readthedocs.io/en/latest'
description = """Scikit-Build, or skbuild, is an improved build system generator
for CPython C/C++/Fortran/Cython extensions."""

toolchain = {'name': 'foss', 'version': '2020a-rc3'}
toolchain = {'name': 'foss', 'version': '2020a'}

source_urls = [PYPI_SOURCE]
sources = [SOURCE_TAR_GZ]
Expand Down

0 comments on commit af945bd

Please sign in to comment.