From d7f05e08be36d373a3d9d10c321d2172d3546660 Mon Sep 17 00:00:00 2001 From: Justin Cook Date: Wed, 12 Feb 2025 07:07:06 -0600 Subject: [PATCH] libfabric: use the class variable to get the list of fabrics (#49007) Suggested by: alalazo Signed-off-by: Justin Cook --- .../builtin/packages/libfabric/package.py | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index 75013eb08ff..db26f29bced 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -160,9 +160,8 @@ def determine_variants(cls, exes, version): variants = [] output = Executable(exe)("--list", output=str, error=os.devnull) # fabrics - fabrics = get_options_from_variant(cls, "fabrics") used_fabrics = [] - for fabric in fabrics: + for fabric in cls.fabrics: match = re.search(r"^%s:.*\n.*version: (\S+)" % fabric, output, re.MULTILINE) if match: used_fabrics.append(fabric) @@ -219,20 +218,3 @@ def configure_args(self): def installcheck(self): fi_info = Executable(self.prefix.bin.fi_info) fi_info() - - -# This code gets all the fabric names from the variants list -# Idea taken from the AutotoolsPackage source. -def get_options_from_variant(self, name): - values = self.variants[name][0].values - explicit_values = [] - if getattr(values, "feature_values", None): - values = values.feature_values - for value in sorted(values): - if hasattr(value, "when"): - if value.when is True: - # Explicitly extract the True value for downstream use - explicit_values.append("{0}".format(value)) - else: - explicit_values.append(value) - return explicit_values