summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorBrian Van Essen <vanessen1@llnl.gov>2023-01-12 23:53:33 -0800
committerGitHub <noreply@github.com>2023-01-12 23:53:33 -0800
commit68ce49a57b5d8727fa0503d97cf3def3462c44e1 (patch)
treee047bae6a9df573871a5fad0f61473442cdd4954 /var
parent92b7f633650c4e9167d54c500685f8aece1e54e1 (diff)
downloadspack-68ce49a57b5d8727fa0503d97cf3def3462c44e1.tar.gz
spack-68ce49a57b5d8727fa0503d97cf3def3462c44e1.tar.bz2
spack-68ce49a57b5d8727fa0503d97cf3def3462c44e1.tar.xz
spack-68ce49a57b5d8727fa0503d97cf3def3462c44e1.zip
libfabric can now find external installation (#33796)
* Added support for libfabric to find an external installation and identify variants supported. * Change the fabrics definition to only include CXI when on a cray system with a libfabric-based slingshot network. * Added a conflict when trying to build the CXI fabric value since it is only available as closed source at this time.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/libfabric/package.py53
1 files changed, 52 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py
index ec205a4cfb..b2f8bbe70f 100644
--- a/var/spack/repos/builtin/packages/libfabric/package.py
+++ b/var/spack/repos/builtin/packages/libfabric/package.py
@@ -3,6 +3,10 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+import os
+import re
+
+import spack.platforms.cray
from spack.package import *
@@ -15,6 +19,8 @@ class Libfabric(AutotoolsPackage):
git = "https://github.com/ofiwg/libfabric.git"
maintainers = ["rajachan"]
+ executables = ["^fi_info$"]
+
version("main", branch="main")
version("1.16.1", sha256="53f992d33f9afe94b8a4ea3d105504887f4311cf4b68cea99a24a85fcc39193f")
version("1.15.1", sha256="cafa3005a9dc86064de179b0af4798ad30b46b2f862fe0268db03d13943e10cd")
@@ -44,6 +50,7 @@ class Libfabric(AutotoolsPackage):
version("1.4.2", sha256="5d027d7e4e34cb62508803e51d6bd2f477932ad68948996429df2bfff37ca2a5")
fabrics = (
+ conditional("cxi", when=spack.platforms.cray.slingshot_network()),
"efa",
"gni",
"mlx",
@@ -63,6 +70,9 @@ class Libfabric(AutotoolsPackage):
"xpmem",
)
+ # CXI is a closed source package and only exists when an external.
+ conflicts("fabrics=cxi")
+
variant(
"fabrics",
default="sockets,tcp,udp",
@@ -106,6 +116,30 @@ class Libfabric(AutotoolsPackage):
conflicts("@1.9.0", when="platform=darwin", msg="This distribution is missing critical files")
conflicts("fabrics=opx", when="@:1.14.99")
+ @classmethod
+ def determine_version(cls, exe):
+ output = Executable(exe)("--version", output=str, error=str)
+ match = re.search(r"libfabric: (\d+\.\d+\.\d+)(\D*\S*)", output)
+ return match.group(1) if match else None
+
+ @classmethod
+ def determine_variants(cls, exes, version):
+ results = []
+ for exe in exes:
+ variants = []
+ output = Executable(exe)("--list", output=str, error=os.devnull)
+ # fabrics
+ fabrics = get_options_from_variant(cls, "fabrics")
+ used_fabrics = []
+ for fabric in fabrics:
+ match = re.search(r"^%s:.*\n.*version: (\S+)" % fabric, output, re.MULTILINE)
+ if match:
+ used_fabrics.append(fabric)
+ if used_fabrics:
+ variants.append("fabrics=" + ",".join(used_fabrics))
+ results.append(" ".join(variants))
+ return results
+
def setup_build_environment(self, env):
if self.run_tests:
env.prepend_path("PATH", self.prefix.bin)
@@ -125,7 +159,7 @@ class Libfabric(AutotoolsPackage):
else:
args.append("--with-kdreg=no")
- for fabric in self.fabrics:
+ for fabric in [f if isinstance(f, str) else f[0].value for f in self.fabrics]:
if "fabrics=" + fabric in self.spec:
args.append("--enable-{0}=yes".format(fabric))
else:
@@ -136,3 +170,20 @@ class Libfabric(AutotoolsPackage):
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