From e1ba37b13030d7d927a5a33821651a28d92fa910 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 15 Dec 2022 21:46:15 +0100 Subject: [PATCH 1/3] add gfbf as subtoolchain of foss --- easybuild/toolchains/foss.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/toolchains/foss.py b/easybuild/toolchains/foss.py index 970a2ea9b3..4de760b49f 100644 --- a/easybuild/toolchains/foss.py +++ b/easybuild/toolchains/foss.py @@ -30,6 +30,7 @@ from distutils.version import LooseVersion from easybuild.toolchains.gompi import Gompi +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 @@ -40,7 +41,7 @@ class Foss(Gompi, OpenBLAS, FlexiBLAS, ScaLAPACK, Fftw): """Compiler toolchain with GCC, OpenMPI, OpenBLAS, ScaLAPACK and FFTW.""" NAME = 'foss' - SUBTOOLCHAIN = [Gompi.NAME, Golf.NAME] + SUBTOOLCHAIN = [Gompi.NAME, Golf.NAME, Gfbf.NAME] def __init__(self, *args, **kwargs): """Toolchain constructor.""" From 26e3e223f0f916e929d51e70eba1032f91c1ec1f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 16 Dec 2022 11:04:29 +0100 Subject: [PATCH 2/3] also pick up banned linked shared libs from golf and gfbf subtoolchain in foss toolchain --- easybuild/toolchains/foss.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easybuild/toolchains/foss.py b/easybuild/toolchains/foss.py index 4de760b49f..018a462c84 100644 --- a/easybuild/toolchains/foss.py +++ b/easybuild/toolchains/foss.py @@ -71,6 +71,8 @@ def banned_linked_shared_libs(self): """ res = [] res.extend(Gompi.banned_linked_shared_libs(self)) + res.extend(Golf.banned_linked_shared_libs(self)) + res.extend(Gfbf.banned_linked_shared_libs(self)) if self.looseversion >= LooseVersion('2021.0'): res.extend(FlexiBLAS.banned_linked_shared_libs(self)) From 029695ea4baf1e09e3eca18269546236a677633e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 17 Dec 2022 10:48:53 +0100 Subject: [PATCH 3/3] don't try to collect list of banned linked shared libs for golf and gfbf toolchains, already handled via separate toolchain components like OpenBLAS/FlexiBLAS --- easybuild/toolchains/foss.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/easybuild/toolchains/foss.py b/easybuild/toolchains/foss.py index 018a462c84..4de760b49f 100644 --- a/easybuild/toolchains/foss.py +++ b/easybuild/toolchains/foss.py @@ -71,8 +71,6 @@ def banned_linked_shared_libs(self): """ res = [] res.extend(Gompi.banned_linked_shared_libs(self)) - res.extend(Golf.banned_linked_shared_libs(self)) - res.extend(Gfbf.banned_linked_shared_libs(self)) if self.looseversion >= LooseVersion('2021.0'): res.extend(FlexiBLAS.banned_linked_shared_libs(self))