From 5c23adf622bd1533f45c5a0166c5ac4c7200f3fe Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Fri, 19 Jan 2024 18:51:02 +0100 Subject: [PATCH 1/2] patchelf libmpi_gtl_cuda to link against libcudart, libcuda for unknown reasons all gtl_cuda libraries are linked to libcudart, libcuda, but 8.1.27 isn't --- stackinator/repo/packages/cray-gtl/package.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/stackinator/repo/packages/cray-gtl/package.py b/stackinator/repo/packages/cray-gtl/package.py index 2fbe8c9..afdd385 100644 --- a/stackinator/repo/packages/cray-gtl/package.py +++ b/stackinator/repo/packages/cray-gtl/package.py @@ -59,8 +59,8 @@ class CrayGtl(Package): conflicts("+cuda", when="+rocm", msg="Pick either CUDA or ROCM") with when("+cuda"): - depends_on("cuda@11.0:11", type="link", when="@:8.1.27") - depends_on("cuda@12:", type="link", when="@8.1.28:") + depends_on("cuda@11.0:11", type="link", when="@:8.1.26") + depends_on("cuda@12.0:12", type="link", when="@8.1.27:") with when("+rocm"): # libamdhip64.so.5 @@ -109,3 +109,6 @@ def fixup_binaries(self): # __gxx_personality_v0 but wasn't linked against libstdc++. if "libmpi_gtl_cuda.so" in str(f): patchelf("--add-needed", "libstdc++.so", f, fail_on_error=False) + if "@8.1.27" in self.spec: + patchelf("--add-needed", "libcudart.so", f, fail_on_error=False) + patchelf("--add-needed", "libcuda.so", f, fail_on_error=False) From 1bd3c0081943918ee3b853562f7ba0655f01bfa0 Mon Sep 17 00:00:00 2001 From: Simon Pintarelli Date: Fri, 19 Jan 2024 21:30:31 +0100 Subject: [PATCH 2/2] update sha256 for cray-mpich 8.1.27 --- stackinator/repo/packages/cray-gtl/package.py | 2 +- stackinator/repo/packages/cray-mpich/package.py | 2 +- stackinator/repo/packages/cray-pmi/package.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stackinator/repo/packages/cray-gtl/package.py b/stackinator/repo/packages/cray-gtl/package.py index afdd385..57edc21 100644 --- a/stackinator/repo/packages/cray-gtl/package.py +++ b/stackinator/repo/packages/cray-gtl/package.py @@ -22,7 +22,7 @@ class CrayGtl(Package): ) version( "8.1.27", - sha256="c00836641c7d1f40300f8e4b068a1ba1ff4b0ca31af24b9507d768fc6fe5753c", + sha256="80c7e94d30b5a3573ac6b2cc5fb0373046760a0acdff44a178e723ab3c8fdfb9", ) version( "8.1.26", diff --git a/stackinator/repo/packages/cray-mpich/package.py b/stackinator/repo/packages/cray-mpich/package.py index 41eff56..e72c5dc 100644 --- a/stackinator/repo/packages/cray-mpich/package.py +++ b/stackinator/repo/packages/cray-mpich/package.py @@ -24,7 +24,7 @@ class CrayMpich(Package): ) version( "8.1.27", - sha256="c555f180cbe7272acd76e3e55cd9150c2b20b8ec263228f64fe2b682eec1c612", + sha256="c7f2f5366aba9ff9781084a430b5b9462427ee8120069ff530d1965065ef220b", ) version( "8.1.26", diff --git a/stackinator/repo/packages/cray-pmi/package.py b/stackinator/repo/packages/cray-pmi/package.py index 633cdfc..951cc87 100644 --- a/stackinator/repo/packages/cray-pmi/package.py +++ b/stackinator/repo/packages/cray-pmi/package.py @@ -24,7 +24,7 @@ class CrayPmi(Package): ) version( "6.1.12", - sha256="0f1caa93c881e1a5a4b5a65d1cb3a04d9c549ffdb9524b53a6e7ca9317dd90ee", + sha256="d1a4bd929b73197823dd9b4bcb3c8ef06d80326297a07291b24e5996b60330a8", ) version( "6.1.11",