Merge pull request #18877 from boegel/20230928120259_new_pr_UCX1141

use UCX 1.14.1 instead of 1.15.0-rc4 in OpenMPI 4.1.5
easybuilders · Sep 28, 2023 · af5a0e3 · af5a0e3
2 parents b1c0663 + a54300c
commit af5a0e3
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 7 deletions.
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-GCC-13.2.0.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-4.1.5-GCC-13.2.0.eb
@@ -33,7 +33,7 @@ dependencies = [
     ('zlib', '1.2.13'),
     ('hwloc', '2.9.2'),
     ('libevent', '2.1.12'),
-    ('UCX', '1.15.0-rc4'),
+    ('UCX', '1.14.1'),
     ('libfabric', '1.19.0'),
     ('PMIx', '4.2.5'),
     ('UCC', '1.2.0'),

diff --git a/easybuild/easyconfigs/u/UCC/UCC-1.2.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/u/UCC/UCC-1.2.0-GCCcore-13.2.0.eb
@@ -26,7 +26,7 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('UCX', '1.15.0-rc4'),
+    ('UCX', '1.14.1'),
 ]
 
 preconfigopts = "./autogen.sh && "

diff --git a/...gs/u/UCX/UCX-1.15.0-rc4-GCCcore-13.2.0.eb → ...onfigs/u/UCX/UCX-1.14.1-GCCcore-13.2.0.eb b/...gs/u/UCX/UCX-1.15.0-rc4-GCCcore-13.2.0.eb → ...onfigs/u/UCX/UCX-1.14.1-GCCcore-13.2.0.eb
@@ -1,7 +1,7 @@
 easyblock = 'ConfigureMake'
 
 name = 'UCX'
-version = '1.15.0-rc4'
+version = '1.14.1'
 
 homepage = 'https://www.openucx.org/'
 description = """Unified Communication X
@@ -13,15 +13,16 @@ toolchain = {'name': 'GCCcore', 'version': '13.2.0'}
 toolchainopts = {'pic': True}
 
 source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s']
-# TODO: Uncomment when updating to final release
-# sources = ['%(namelower)s-%(version)s.tar.gz']
-sources = ['%(namelower)s-1.15.0.tar.gz']
+sources = ['%(namelower)s-%(version)s.tar.gz']
 patches = [
     'UCX-1.13.1-dynamic_modules.patch',
+    'UCX-1.14.1_fix-type-conflict-uct_md_mem_advise.patch',
 ]
 checksums = [
-    {'ucx-1.15.0.tar.gz': 'aa1e71de64dbc3061454dbe7510a38b930f7c184ec889c09f5611c2d4acaf07a'},
+    {'ucx-1.14.1.tar.gz': 'baa0634cafb269a3112f626eb226bcd2ca8c9fcf0fec3b8e2a3553baad5f77aa'},
     {'UCX-1.13.1-dynamic_modules.patch': '00874687bd90b795fff61aaa183f6c6bea2210aa1003b28f23d9ebf7066f8782'},
+    {'UCX-1.14.1_fix-type-conflict-uct_md_mem_advise.patch':
+     '9fbf26b39cd5c9e469ff152e18d79a4bf685fca175d4088b9bbe8644b74c1401'},
 ]
 
 # Uncomment when updating to final release

diff --git a/easybuild/easyconfigs/u/UCX/UCX-1.14.1_fix-type-conflict-uct_md_mem_advise.patch b/easybuild/easyconfigs/u/UCX/UCX-1.14.1_fix-type-conflict-uct_md_mem_advise.patch
@@ -0,0 +1,31 @@
+From 8d6032ec864190c9f079d96e731c5004a975e153 Mon Sep 17 00:00:00 2001
+From: Jan Ciesko <jan.ciesko@gmail.com>
+Date: Thu, 5 Jan 2023 12:31:39 -0800
+Subject: [PATCH] UCT/BASE: Fix conflicting types for 'uct_md_mem_advise'.
+
+Signed-off-by: Howard Pritchard <howardp@lanl.gov>
+---
+ src/uct/base/uct_md.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/uct/base/uct_md.c b/src/uct/base/uct_md.c
+index d7f4c326c0b..3830e16618b 100644
+--- a/src/uct/base/uct_md.c
++++ b/src/uct/base/uct_md.c
+@@ -2,6 +2,7 @@
+ * Copyright (c) NVIDIA CORPORATION & AFFILIATES, 2001-2014. ALL RIGHTS RESERVED.
+ * Copyright (C) UT-Battelle, LLC. 2015. ALL RIGHTS RESERVED.
+ * Copyright (C) ARM Ltd. 2016-2017. ALL RIGHTS RESERVED.
++* Copyright (c) Triad National Security, LLC. 2023. ALL RIGHTS RESERVED.
+ *
+ * See file LICENSE for terms.
+ */
+@@ -554,7 +555,7 @@ ucs_status_t uct_md_mem_free(uct_md_h md, uct_mem_h memh)
+
+ ucs_status_t
+ uct_md_mem_advise(uct_md_h md, uct_mem_h memh, void *addr, size_t length,
+-                  unsigned advice)
++                  uct_mem_advice_t advice)
+ {
+     if ((length == 0) || (addr == NULL)) {
+         return UCS_ERR_INVALID_PARAM;