Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use UCX 1.14.1 instead of 1.15.0-rc4 in OpenMPI 4.1.5 #18877

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/u/UCC/UCC-1.2.0-GCCcore-13.2.0.eb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ builddependencies = [
]

dependencies = [
('UCX', '1.15.0-rc4'),
('UCX', '1.14.1'),
]

preconfigopts = "./autogen.sh && "
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Loading