From eb29889f6eae9c415895f34023b84f1d72d01ef4 Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Wed, 1 Mar 2023 23:19:20 -0800 Subject: Detection of Cray's slingshot detection has relied on the presence of (#35779) a shared library /lib64/libcxi.so, which seems to also appear on other non-slingshot systems. This patch also checks to make sure that there is a Cray programming enviornment in /opt/cray/pe in addition to the shared library. --- lib/spack/spack/platforms/cray.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/spack/spack/platforms/cray.py b/lib/spack/spack/platforms/cray.py index 70bb45af5f..3d88285f70 100644 --- a/lib/spack/spack/platforms/cray.py +++ b/lib/spack/spack/platforms/cray.py @@ -37,7 +37,7 @@ _xc_craype_dir = "/opt/cray/pe/cdt" def slingshot_network(): - return os.path.exists("/lib64/libcxi.so") + return os.path.exists("/opt/cray/pe") and os.path.exists("/lib64/libcxi.so") def _target_name_from_craype_target_name(name): -- cgit v1.2.3-60-g2f50