Skip to content

DAOS-18017 build: update mercury to 2.4.1 #17221

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.

Sign up for GitHub

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

Draft
soumagne wants to merge 1 commit into
base: release/2.6
Choose a base branch
from
Draft

DAOS-18017 build: update mercury to 2.4.1 #17221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions site_scons/components/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright 2016-2024 Intel Corporation
# Copyright 2025 Hewlett Packard Enterprise Development LP
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -178,16 +179,12 @@ def define_mercury(reqs):
'-DBUILD_TESTING_UNIT:BOOL=OFF',
'-DMERCURY_USE_BOOST_PP:BOOL=ON',
'-DMERCURY_USE_CHECKSUMS:BOOL=OFF',
'-DMERCURY_ENABLE_DEBUG:BOOL=ON',
'-DNA_USE_SM:BOOL=ON',
'-DNA_USE_OFI:BOOL=ON',
'-DNA_USE_UCX:BOOL=ON',
'../mercury']

if reqs.target_type == 'debug':
mercury_build.append('-DMERCURY_ENABLE_DEBUG:BOOL=ON')
else:
mercury_build.append('-DMERCURY_ENABLE_DEBUG:BOOL=OFF')

reqs.define('mercury',
retriever=GitRepoRetriever(True),
commands=[mercury_build,
Expand Down
26 changes: 8 additions & 18 deletions src/cart/utils/memcheck-cart.supp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,14 @@
fun:hg_dlog_mkcount32
...
}
{
<insert_a_suppression_name_here>
Memcheck:Leak
match-leak-kinds: reachable
fun:malloc
fun:hg_dlog_mkcount64
...
}
{
FI leak 9
Memcheck:Leak
Expand All @@ -496,39 +504,21 @@
fun:HG_Init_opt
fun:crt_hg_class_init
}
{
Tcp provider
Memcheck:Param
sendmsg(msg.msg_iov[1])
...
fun:sendmsg
fun:ofi_sockapi_sendv_socket
fun:ofi_bsock_sendv
...
fun:fi_senddata
...
}
{
Tcp provider with ofi rxm
Memcheck:Param
sendmsg(msg.msg_iov[1])
...
fun:ofi_bsock_sendv
...
fun:fi_tsend
...
}
{
Tcp provider with ofi rxm 2
Memcheck:Param
sendmsg(msg.msg_iov[2])
...
fun:sendmsg
fun:ofi_sockapi_sendv_socket
fun:ofi_bsock_sendv
...
fun:fi_tsend
...
}
{
Go syscall.
Expand Down
4 changes: 2 additions & 2 deletions utils/build.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ isal=v2.30.0
isal_crypto=v2.24.0
spdk=v22.01.2
ofi=v1.22.0
mercury=v2.4.0
mercury=v2.4.1
protobufc=v1.3.3
ucx=v1.14.1

Expand All @@ -28,6 +28,6 @@ ucx=https://github.com/openucx/ucx.git
[patch_versions]
spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/445a4c808badbad3942696ecf16fa60e8129a747.diff
fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff
mercury=https://raw.githubusercontent.com/daos-stack/mercury/f3dc286fb40ec1a3a38a2e17c45497bc2aa6290d/na_ucx.patch,https://raw.githubusercontent.com/daos-stack/mercury/48df263212604336b2dbe0430dcab4482eb43437/na_ucx_ep_flush.patch
mercury=https://github.com/mercury-hpc/mercury/commit/0a7756d4ef2f329fa7caa8e4052a099a91816f2f.diff
pmdk=https://github.com/pmem/pmdk/commit/2abe15ac0b4eed894b6768cd82a3b0a7c4336284.diff
argobots=https://github.com/pmodels/argobots/pull/397/commits/411e5b344642ebc82190fd8b125db512e5b449d1.diff,https://github.com/pmodels/argobots/commit/bb0c908abfac4bfe37852eee621930634183c6aa.diff
20 changes: 5 additions & 15 deletions utils/test_memcheck.supp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,11 @@
...
}
{
Tcp provider
Memcheck:Param
sendmsg(msg.msg_iov[1])
...
fun:sendmsg
fun:ofi_sockapi_sendv_socket
fun:ofi_bsock_sendv
...
fun:fi_senddata
<insert_a_suppression_name_here>
Memcheck:Leak
match-leak-kinds: reachable
fun:malloc
fun:hg_dlog_mkcount64
...
}
{
Expand All @@ -265,20 +261,14 @@
...
fun:ofi_bsock_sendv
...
fun:fi_tsend
...
}
{
Tcp provider with ofi rxm 2
Memcheck:Param
sendmsg(msg.msg_iov[2])
...
fun:sendmsg
fun:ofi_sockapi_sendv_socket
fun:ofi_bsock_sendv
...
fun:fi_tsend
...
}
{
par_init mpi or dlopen leak
Expand Down
Loading