mx/MX_Pmodule
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove oss libfabric/1.22.0 in favor of Cray. Update OpenMPI modules with new libfbric

Browse Source
This commit is contained in:
caubet_m
2025-07-24 13:50:23 +02:00
parent 75e3b6a519
commit 737be54866
22 changed files with 572 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/shs-libcxi/patch/cassini_csr_defs-v12.0.1.patch
+63
View File
@@ -0,0 +1,63 @@
diff --git a/Makefile.am b/Makefile.am
index 4c47094..60432b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,7 @@ utils_cxi_dump_csrs_SOURCES = utils/cxi_dump_csrs.c
utils_cxi_dump_csrs_LDADD = src/libcxi.la
utils/cxi_dump_csrs.c: utils/cxi_dump_csrs.h
utils/cxi_dump_csrs.h: utils/cxi_dump_csrs.py
- utils/cxi_dump_csrs.py > utils/cxi_dump_csrs.h
+ CASSINI_CSR_DEFS=$(cassinicsrdefs) utils/cxi_dump_csrs.py > utils/cxi_dump_csrs.h
utils_MANS = \
man/man1/cxi_atomic_bw.1 \
diff --git a/configure.ac b/configure.ac
index 5b65683..2eba805 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,13 @@ AS_IF([test -d $withval],
AC_CHECK_DECL(HAVE_HIP_SUPPORT, [], [LDFLAGS="$LDFLAGS -ldl"], []),
[AC_MSG_RESULT([No CUDA])])
+AC_ARG_WITH([cassini-csr_defs],
+ [AS_HELP_STRING([--with-cassini-csr_defs=PATH], [Path to csr_defs.json])],
+ [cassinicsrdefs="$withval"],
+ [cassinicsrdefs="/usr/share/cassini-headers/csr_defs.json"])
+
+AC_SUBST([cassinicsrdefs])
+
AC_ARG_ENABLE([asan],
[AS_HELP_STRING([--enable-asan],
[Enable address sanitizer @<:@default=no@:>@])
@@ -205,6 +212,7 @@ AC_MSG_RESULT([
includedir: ${includedir}
systemdunitdir: ${systemdsystemunitdir}
udevrulesdir: ${udevrulesdir}
+ cassinicsrdefs: ${cassinicsrdefs}
compiler: ${CC}
cflags: ${CFLAGS}
diff --git a/utils/cxi_dump_csrs.py b/utils/cxi_dump_csrs.py
index 24a4ad4..cb63e73 100755
--- a/utils/cxi_dump_csrs.py
+++ b/utils/cxi_dump_csrs.py
@@ -7,13 +7,15 @@
"""
import json
+import os
+
+json_path = os.environ.get("CASSINI_CSR_DEFS", "/usr/share/cassini-headers/csr_defs.json")
try:
- with open('/usr/share/cassini-headers/csr_defs.json', 'r') as f:
- csrdefs = json.load(f)
-except FileNotFoundError:
- with open('../cassini-headers/install/share/cassini-headers/csr_defs.json', 'r') as f:
+ with open(json_path, 'r') as f:
csrdefs = json.load(f)
+except FileNotFoundError as e:
+ raise RuntimeError(f"CSR defs file not found at '{json_path}'. Set CASSINI_CSR_DEFS to override.") from e
print("/* Autogenerated file. Do not modify. */")
Libraries/shs-libcxi/patch/cassini_csr_defs-v2.1.0.patch
+77
View File
@@ -0,0 +1,77 @@
From 1a1b8f008db00b38547ae8bcd28e12f7f7525390 Mon Sep 17 00:00:00 2001
From: Caubet Serrabou Marc <mcaubet@gmail.com>
Date: Tue, 8 Apr 2025 14:11:59 +0200
Subject: [PATCH] Add --with-cassini_csr_defs option
---
Makefile.am | 2 +-
configure.ac | 8 ++++++++
utils/cxi_dump_csrs.py | 10 ++++++----
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4c47094..60432b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,7 @@ utils_cxi_dump_csrs_SOURCES = utils/cxi_dump_csrs.c
utils_cxi_dump_csrs_LDADD = src/libcxi.la
utils/cxi_dump_csrs.c: utils/cxi_dump_csrs.h
utils/cxi_dump_csrs.h: utils/cxi_dump_csrs.py
- utils/cxi_dump_csrs.py > utils/cxi_dump_csrs.h
+ CASSINI_CSR_DEFS=$(cassinicsrdefs) utils/cxi_dump_csrs.py > utils/cxi_dump_csrs.h
utils_MANS = \
man/man1/cxi_atomic_bw.1 \
diff --git a/configure.ac b/configure.ac
index 5b65683..2eba805 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,13 @@ AS_IF([test -d $withval],
AC_CHECK_DECL(HAVE_HIP_SUPPORT, [], [LDFLAGS="$LDFLAGS -ldl"], []),
[AC_MSG_RESULT([No CUDA])])
+AC_ARG_WITH([cassini-csr_defs],
+ [AS_HELP_STRING([--with-cassini-csr_defs=PATH], [Path to csr_defs.json])],
+ [cassinicsrdefs="$withval"],
+ [cassinicsrdefs="/usr/share/cassini-headers/csr_defs.json"])
+
+AC_SUBST([cassinicsrdefs])
+
AC_ARG_ENABLE([asan],
[AS_HELP_STRING([--enable-asan],
[Enable address sanitizer @<:@default=no@:>@])
@@ -205,6 +212,7 @@ AC_MSG_RESULT([
includedir: ${includedir}
systemdunitdir: ${systemdsystemunitdir}
udevrulesdir: ${udevrulesdir}
+ cassinicsrdefs: ${cassinicsrdefs}
compiler: ${CC}
cflags: ${CFLAGS}
diff --git a/utils/cxi_dump_csrs.py b/utils/cxi_dump_csrs.py
index 24a4ad4..cb63e73 100755
--- a/utils/cxi_dump_csrs.py
+++ b/utils/cxi_dump_csrs.py
@@ -7,13 +7,15 @@
"""
import json
+import os
+
+json_path = os.environ.get("CASSINI_CSR_DEFS", "/usr/share/cassini-headers/csr_defs.json")
try:
- with open('/usr/share/cassini-headers/csr_defs.json', 'r') as f:
- csrdefs = json.load(f)
-except FileNotFoundError:
- with open('../cassini-headers/install/share/cassini-headers/csr_defs.json', 'r') as f:
+ with open(json_path, 'r') as f:
csrdefs = json.load(f)
+except FileNotFoundError as e:
+ raise RuntimeError(f"CSR defs file not found at '{json_path}'. Set CASSINI_CSR_DEFS to override.") from e
print("/* Autogenerated file. Do not modify. */")
--
2.35.3