From 17983102c5497197e8466c890a487cf962048728 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Wed, 3 Jul 2024 13:48:18 +0000 Subject: [PATCH 1/4] gmpflf FlexiBLAS dependency --- easybuild/toolchains/gmpflf.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/easybuild/toolchains/gmpflf.py b/easybuild/toolchains/gmpflf.py index f040a161da..eb754cc873 100644 --- a/easybuild/toolchains/gmpflf.py +++ b/easybuild/toolchains/gmpflf.py @@ -45,3 +45,12 @@ class Gmpflf(Gmpich, OpenBLAS, FlexiBLAS, ScaLAPACK, Fftw): """Compiler toolchain with GCC, MPICH, OpenBLAS, ScaLAPACK and FFTW.""" NAME = 'gmpflf' SUBTOOLCHAIN = [Gmpich.NAME, Golf.NAME, Gfbf.NAME] + + def __init__(self, *args, **kwargs): + """Toolchain constructor.""" + super(Gmpflf, self).__init__(*args, **kwargs) + constants = ('BLAS_MODULE_NAME', 'BLAS_LIB', 'BLAS_LIB_MT', 'BLAS_FAMILY', + 'LAPACK_MODULE_NAME', 'LAPACK_IS_BLAS', 'LAPACK_FAMILY') + + for constant in constants: + setattr(self, constant, getattr(FlexiBLAS, constant)) From 7ae687c83bf6509431fae93086413fc4bff85df9 Mon Sep 17 00:00:00 2001 From: TopRichard <121792457+TopRichard@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:19:25 +0200 Subject: [PATCH 2/4] Update gmpflf.py --- easybuild/toolchains/gmpflf.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/easybuild/toolchains/gmpflf.py b/easybuild/toolchains/gmpflf.py index eb754cc873..99a01935d4 100644 --- a/easybuild/toolchains/gmpflf.py +++ b/easybuild/toolchains/gmpflf.py @@ -34,23 +34,13 @@ """ from easybuild.toolchains.gmpich import Gmpich from easybuild.toolchains.gfbf import Gfbf -from easybuild.toolchains.golf import Golf from easybuild.toolchains.fft.fftw import Fftw from easybuild.toolchains.linalg.flexiblas import FlexiBLAS from easybuild.toolchains.linalg.openblas import OpenBLAS from easybuild.toolchains.linalg.scalapack import ScaLAPACK -class Gmpflf(Gmpich, OpenBLAS, FlexiBLAS, ScaLAPACK, Fftw): +class Gmpflf(Gmpich, FlexiBLAS, ScaLAPACK, Fftw): """Compiler toolchain with GCC, MPICH, OpenBLAS, ScaLAPACK and FFTW.""" NAME = 'gmpflf' - SUBTOOLCHAIN = [Gmpich.NAME, Golf.NAME, Gfbf.NAME] - - def __init__(self, *args, **kwargs): - """Toolchain constructor.""" - super(Gmpflf, self).__init__(*args, **kwargs) - constants = ('BLAS_MODULE_NAME', 'BLAS_LIB', 'BLAS_LIB_MT', 'BLAS_FAMILY', - 'LAPACK_MODULE_NAME', 'LAPACK_IS_BLAS', 'LAPACK_FAMILY') - - for constant in constants: - setattr(self, constant, getattr(FlexiBLAS, constant)) + SUBTOOLCHAIN = [Gmpich.NAME, Gfbf.NAME] From e5d127d4701756b497a89af6864ecd4c227473b1 Mon Sep 17 00:00:00 2001 From: TopRichard <121792457+TopRichard@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:21:18 +0200 Subject: [PATCH 3/4] Update gmpflf.py --- easybuild/toolchains/gmpflf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/toolchains/gmpflf.py b/easybuild/toolchains/gmpflf.py index 99a01935d4..f5db523dc1 100644 --- a/easybuild/toolchains/gmpflf.py +++ b/easybuild/toolchains/gmpflf.py @@ -41,6 +41,6 @@ class Gmpflf(Gmpich, FlexiBLAS, ScaLAPACK, Fftw): - """Compiler toolchain with GCC, MPICH, OpenBLAS, ScaLAPACK and FFTW.""" + """Compiler toolchain with GCC, MPICH, FlexiBLAS, ScaLAPACK and FFTW.""" NAME = 'gmpflf' SUBTOOLCHAIN = [Gmpich.NAME, Gfbf.NAME] From 9846b9a9f08cdb6b90d71a709887358eed1254df Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 4 Jul 2024 11:31:41 +0200 Subject: [PATCH 4/4] remove unused import for OpenBLAS in gmpflf toolchain definition --- easybuild/toolchains/gmpflf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/toolchains/gmpflf.py b/easybuild/toolchains/gmpflf.py index f5db523dc1..30d10a90f7 100644 --- a/easybuild/toolchains/gmpflf.py +++ b/easybuild/toolchains/gmpflf.py @@ -36,7 +36,6 @@ from easybuild.toolchains.gfbf import Gfbf from easybuild.toolchains.fft.fftw import Fftw from easybuild.toolchains.linalg.flexiblas import FlexiBLAS -from easybuild.toolchains.linalg.openblas import OpenBLAS from easybuild.toolchains.linalg.scalapack import ScaLAPACK