From 2c457218c4946e50ccec80de1e262d671408ce11 Mon Sep 17 00:00:00 2001 From: Sebastian Achilles <s.achilles@fz-juelich.de> Date: Fri, 25 Nov 2022 14:57:46 +0100 Subject: [PATCH] move BLIS, OpenBLAS, FlexiBLAS and FFTW to GCCcore --- ...BLIS-0.9.0-GCC-11.3.0.eb => BLIS-0.9.0-GCCcore-11.3.0.eb} | 2 +- ...TW-3.3.10-GCC-11.3.0.eb => FFTW-3.3.10-GCCcore-11.3.0.eb} | 2 +- ...3.2.0-GCC-11.3.0.eb => FlexiBLAS-3.2.0-GCCcore-11.3.0.eb} | 5 +++-- ....3.20-GCC-11.3.0.eb => OpenBLAS-0.3.20-GCCcore-11.3.0.eb} | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) rename Golden_Repo/b/BLIS/{BLIS-0.9.0-GCC-11.3.0.eb => BLIS-0.9.0-GCCcore-11.3.0.eb} (95%) rename Golden_Repo/f/FFTW/{FFTW-3.3.10-GCC-11.3.0.eb => FFTW-3.3.10-GCCcore-11.3.0.eb} (89%) rename Golden_Repo/f/FlexiBLAS/{FlexiBLAS-3.2.0-GCC-11.3.0.eb => FlexiBLAS-3.2.0-GCCcore-11.3.0.eb} (95%) rename Golden_Repo/o/OpenBLAS/{OpenBLAS-0.3.20-GCC-11.3.0.eb => OpenBLAS-0.3.20-GCCcore-11.3.0.eb} (95%) diff --git a/Golden_Repo/b/BLIS/BLIS-0.9.0-GCC-11.3.0.eb b/Golden_Repo/b/BLIS/BLIS-0.9.0-GCCcore-11.3.0.eb similarity index 95% rename from Golden_Repo/b/BLIS/BLIS-0.9.0-GCC-11.3.0.eb rename to Golden_Repo/b/BLIS/BLIS-0.9.0-GCCcore-11.3.0.eb index a24a01585..9d8b36bea 100644 --- a/Golden_Repo/b/BLIS/BLIS-0.9.0-GCC-11.3.0.eb +++ b/Golden_Repo/b/BLIS/BLIS-0.9.0-GCCcore-11.3.0.eb @@ -7,7 +7,7 @@ homepage = 'https://github.com/flame/blis/' description = """BLIS is a portable software framework for instantiating high-performance BLAS-like dense linear algebra libraries.""" -toolchain = {'name': 'GCC', 'version': '11.3.0'} +toolchain = {'name': 'GCCcore', 'version': '11.3.0'} source_urls = ['https://github.com/flame/blis/archive/'] sources = ['%(version)s.tar.gz'] diff --git a/Golden_Repo/f/FFTW/FFTW-3.3.10-GCC-11.3.0.eb b/Golden_Repo/f/FFTW/FFTW-3.3.10-GCCcore-11.3.0.eb similarity index 89% rename from Golden_Repo/f/FFTW/FFTW-3.3.10-GCC-11.3.0.eb rename to Golden_Repo/f/FFTW/FFTW-3.3.10-GCCcore-11.3.0.eb index 99e704483..2e8ebbded 100644 --- a/Golden_Repo/f/FFTW/FFTW-3.3.10-GCC-11.3.0.eb +++ b/Golden_Repo/f/FFTW/FFTW-3.3.10-GCCcore-11.3.0.eb @@ -5,7 +5,7 @@ homepage = 'https://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': 'GCC', 'version': '11.3.0'} +toolchain = {'name': 'GCCcore', 'version': '11.3.0'} toolchainopts = {'pic': True} source_urls = [homepage] diff --git a/Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCC-11.3.0.eb b/Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCCcore-11.3.0.eb similarity index 95% rename from Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCC-11.3.0.eb rename to Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCCcore-11.3.0.eb index 73c7f6dee..5f008c437 100644 --- a/Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCC-11.3.0.eb +++ b/Golden_Repo/f/FlexiBLAS/FlexiBLAS-3.2.0-GCCcore-11.3.0.eb @@ -7,9 +7,10 @@ homepage = 'https://gitlab.mpi-magdeburg.mpg.de/software/flexiblas-release' description = """FlexiBLAS is a wrapper library that enables the exchange of the BLAS and LAPACK implementation used by a program without recompiling or relinking it.""" -toolchain = {'name': 'GCC', 'version': '11.3.0'} +toolchain = {'name': 'GCCcore', 'version': '11.3.0'} local_extra_flags = "-fstack-protector-strong -fstack-clash-protection" -toolchainopts = {'pic': True, 'extra_cflags': local_extra_flags, 'extra_fflags': local_extra_flags} +toolchainopts = {'pic': True, 'extra_cflags': local_extra_flags, + 'extra_fflags': local_extra_flags} builddependencies = [ ('CMake', '3.23.1'), diff --git a/Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb b/Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCCcore-11.3.0.eb similarity index 95% rename from Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb rename to Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCCcore-11.3.0.eb index 72e27286e..e071d6825 100644 --- a/Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCC-11.3.0.eb +++ b/Golden_Repo/o/OpenBLAS/OpenBLAS-0.3.20-GCCcore-11.3.0.eb @@ -4,7 +4,7 @@ version = '0.3.20' homepage = 'http://www.openblas.net/' description = "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version." -toolchain = {'name': 'GCC', 'version': '11.3.0'} +toolchain = {'name': 'GCCcore', 'version': '11.3.0'} source_urls = [ # order matters, trying to download the large.tgz/timing.tgz LAPACK tarballs from GitHub causes trouble -- GitLab