Update to upstream release 1.13.0

Resolves: rhbz#2049557

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
This commit is contained in:
Michal Schmidt 2022-08-03 10:35:45 +02:00
parent 38e802cf7a
commit 48ece8c596
4 changed files with 11 additions and 73 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/ucx-1.9.0.tar.gz /ucx-1.9.0.tar.gz
/ucx-1.10.1.tar.gz /ucx-1.10.1.tar.gz
/ucx-1.11.2.tar.gz /ucx-1.11.2.tar.gz
/ucx-1.13.0.tar.gz

View File

@ -1,64 +0,0 @@
From caa228ab400b154634a7cbe48168e05cfae91881 Mon Sep 17 00:00:00 2001
From: Yossi Itigin <yosefe@mellanox.com>
Date: Wed, 30 Jun 2021 21:23:20 +0300
Subject: [PATCH] TOOLS/INFO: Update help message for context features
---
src/tools/info/ucx_info.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/tools/info/ucx_info.c b/src/tools/info/ucx_info.c
index 2354d4626..d5795d3e9 100644
--- a/src/tools/info/ucx_info.c
+++ b/src/tools/info/ucx_info.c
@@ -41,8 +41,8 @@ static void usage() {
printf(" 'r' : remote memory access\n");
printf(" 't' : tag matching \n");
printf(" 'm' : active messages \n");
- printf(" 'w' : wakeup\n");
printf(" Modifiers to use in combination with above features:\n");
+ printf(" 'w' : wakeup\n");
printf(" 'e' : error handling\n");
printf("\nOther settings:\n");
printf(" -t <name> Filter devices information using specified transport (requires -d)\n");
@@ -66,6 +66,9 @@ static void usage() {
int main(int argc, char **argv)
{
+ const uint64_t required_ucp_features = UCP_FEATURE_AMO32 |
+ UCP_FEATURE_AMO64 | UCP_FEATURE_RMA |
+ UCP_FEATURE_TAG | UCP_FEATURE_AM;
char *ip_addr = NULL;
ucs_config_print_flags_t print_flags;
ucp_ep_params_t ucp_ep_params;
@@ -153,12 +156,12 @@ int main(int argc, char **argv)
case 't':
ucp_features |= UCP_FEATURE_TAG;
break;
- case 'w':
- ucp_features |= UCP_FEATURE_WAKEUP;
- break;
case 'm':
ucp_features |= UCP_FEATURE_AM;
break;
+ case 'w':
+ ucp_features |= UCP_FEATURE_WAKEUP;
+ break;
case 'e':
ucp_ep_params.field_mask |= UCP_EP_PARAM_FIELD_ERR_HANDLING_MODE;
ucp_ep_params.err_mode = UCP_ERR_HANDLING_MODE_PEER;
@@ -242,8 +245,9 @@ int main(int argc, char **argv)
}
if (print_opts & (PRINT_UCP_CONTEXT|PRINT_UCP_WORKER|PRINT_UCP_EP|PRINT_MEM_MAP)) {
- if (ucp_features == 0) {
- printf("Please select UCP features using -u switch: a|r|t|m|w\n");
+ if (!(ucp_features & required_ucp_features)) {
+ printf("Please select at least one of 'a','r','t','m' UCP features "
+ "using -u switch.\n");
usage();
return -1;
}
--
2.31.1

View File

@ -1 +1 @@
SHA512 (ucx-1.11.2.tar.gz) = d0cfdd578feda9fef146d88a56a9f7e4e6160844fd925f39e18031430dca88fb23515c40f3e517e9ef7081e6ea5e9138ed48d3dad45a5dfa731b053ee3ef30a5 SHA512 (ucx-1.13.0.tar.gz) = a3c002f05646766933732b510b92e2e334d177816159d2a187604ed6af26098bb7a93b9fa7563d2f3705f2047bd3e7a2ce6d73a86f37fc4f1f3bc22f1711ab40

View File

@ -16,14 +16,13 @@
%bcond_with vfs %bcond_with vfs
Name: ucx Name: ucx
Version: 1.11.2 Version: 1.13.0
Release: 2%{?dist} Release: 1%{?dist}
Summary: UCX is a communication library implementing high-performance messaging Summary: UCX is a communication library implementing high-performance messaging
License: BSD License: BSD
URL: http://www.openucx.org URL: http://www.openucx.org
Source: https://github.com/openucx/%{name}/releases/download/v1.11.2/ucx-1.11.2.tar.gz Source: https://github.com/openucx/%{name}/releases/download/v%{version}/ucx-%{version}.tar.gz
Patch1: 0001-TOOLS-INFO-Update-help-message-for-context-features.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Prefix: %{_prefix} Prefix: %{_prefix}
@ -79,8 +78,6 @@ addition, UCX provides efficient intra-node communication, by leveraging the
following shared memory mechanisms: posix, sysv, cma, knem, and xpmem. following shared memory mechanisms: posix, sysv, cma, knem, and xpmem.
The acronym UCX stands for "Unified Communication X". The acronym UCX stands for "Unified Communication X".
This package was built from '' branch, commit ef2bbcf.
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
%debug_package %debug_package
%endif %endif
@ -94,7 +91,6 @@ Provides header files and examples for developing with UCX.
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
%define _with_arg() %{expand:%%{?with_%{1}:--with-%{2}}%%{!?with_%{1}:--without-%{2}}} %define _with_arg() %{expand:%%{?with_%{1}:--with-%{2}}%%{!?with_%{1}:--without-%{2}}}
@ -142,7 +138,8 @@ rm -f %{buildroot}%{_libdir}/ucx/lib*.a
%files devel %files devel
%{_includedir}/uc* %{_includedir}/uc*
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_libdir}/pkgconfig/ucx.pc %{_libdir}/pkgconfig/ucx*.pc
%{_libdir}/cmake/ucx/*.cmake
%{_datadir}/ucx/examples %{_datadir}/ucx/examples
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
@ -311,6 +308,10 @@ library internals, protocol objects, transports status, and more.
%endif %endif
%changelog %changelog
* Wed Aug 03 2022 Michal Schmidt <mschmidt@redhat.com> - 1.13.0-1
- Update to upstream release 1.13.0
- Resolves: rhbz#2049557
* Thu Nov 18 2021 Honggang Li <honli@redhat.com> - 1.11.2-2 * Thu Nov 18 2021 Honggang Li <honli@redhat.com> - 1.11.2-2
- TOOLS/INFO: Update help message for context features - TOOLS/INFO: Update help message for context features
- Related: rhbz#1991185 - Related: rhbz#1991185