From ac7b46789785abb07eb8d74770f9f6f060919c4d Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Thu, 27 Mar 2025 11:22:15 -0600 Subject: [PATCH] libfabric: add v2.0.0, v2.1.0, and lnx fabric (#49549) --- var/spack/repos/builtin/packages/libfabric/package.py | 4 ++++ var/spack/repos/builtin/packages/mercury/package.py | 1 + 2 files changed, 5 insertions(+) diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index e1f88ab3c86..85e27e658f4 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -22,6 +22,8 @@ class Libfabric(AutotoolsPackage, CudaPackage): license("GPL-2.0-or-later") version("main", branch="main") + version("2.1.0", sha256="97df312779e2d937246d2f46385b700e0958ed796d6fed7aae77e2d18923e19f") + version("2.0.0", sha256="1a8e40f1f331d6ee2e9ace518c0088a78c8a838968f8601c2b77fd012a7bf0f5") version("1.22.0", sha256="485e6cafa66c9e4f6aa688d2c9526e274c47fda3a783cf1dd8f7c69a07e2d5fe") version("1.21.1", sha256="54befa6697352f3179c79c4a79225ae71694f29eefad5d0d5a14b5444ff986dd") version("1.21.0", sha256="0c1b7b830d9147f661e5d7f359250b85b5a9885c330464cd3b5e5d35b86551c7") @@ -70,6 +72,7 @@ class Libfabric(AutotoolsPackage, CudaPackage): "cxi", "efa", "gni", + "lnx", "mlx", "mrail", "opx", @@ -138,6 +141,7 @@ class Libfabric(AutotoolsPackage, CudaPackage): conflicts("@1.9.0", when="platform=darwin", msg="This distribution is missing critical files") conflicts("fabrics=opx", when="@:1.14.99") + conflicts("fabrics=lnx", when="@:1") conflicts( "fabrics=opx", when="@1.20.0", diff --git a/var/spack/repos/builtin/packages/mercury/package.py b/var/spack/repos/builtin/packages/mercury/package.py index b7796fe1a6b..dbc4860907c 100644 --- a/var/spack/repos/builtin/packages/mercury/package.py +++ b/var/spack/repos/builtin/packages/mercury/package.py @@ -65,6 +65,7 @@ class Mercury(CMakePackage): with when("+ofi"): depends_on("libfabric@1.5:", when="@:2.0.1") depends_on("libfabric@1.7:", when="@2.1.0:") + conflicts("libfabric@2:", when="@:2.4.0") # openpa dependency is removed in 2.1.0 depends_on("openpa@1.0.3:", when="@:2.0.1%gcc@:4.8") # We only need Boost preprocessor headers