From ece681a1c8e4012a88057fd81661dd52fecc77b4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 27 Sep 2022 06:50:43 -0400 Subject: [PATCH] import ucx-1.13.0-1.el9 --- .gitignore | 2 +- .ucx.metadata | 2 +- ...te-help-message-for-context-features.patch | 64 ------------------- SPECS/ucx.spec | 17 ++--- 4 files changed, 11 insertions(+), 74 deletions(-) delete mode 100644 SOURCES/0001-TOOLS-INFO-Update-help-message-for-context-features.patch diff --git a/.gitignore b/.gitignore index d3d2512..4057237 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ucx-1.11.2.tar.gz +SOURCES/ucx-1.13.0.tar.gz diff --git a/.ucx.metadata b/.ucx.metadata index 466cc51..0c80ada 100644 --- a/.ucx.metadata +++ b/.ucx.metadata @@ -1 +1 @@ -47a560f7334ba17ac3342969e74af9169ed75d57 SOURCES/ucx-1.11.2.tar.gz +00ea25329d1c4a22b7eca8bbd09d9d0a05ac6dfb SOURCES/ucx-1.13.0.tar.gz diff --git a/SOURCES/0001-TOOLS-INFO-Update-help-message-for-context-features.patch b/SOURCES/0001-TOOLS-INFO-Update-help-message-for-context-features.patch deleted file mode 100644 index 4fe9289..0000000 --- a/SOURCES/0001-TOOLS-INFO-Update-help-message-for-context-features.patch +++ /dev/null @@ -1,64 +0,0 @@ -From caa228ab400b154634a7cbe48168e05cfae91881 Mon Sep 17 00:00:00 2001 -From: Yossi Itigin -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 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 - diff --git a/SPECS/ucx.spec b/SPECS/ucx.spec index f0fa705..1f0ab05 100644 --- a/SPECS/ucx.spec +++ b/SPECS/ucx.spec @@ -16,14 +16,13 @@ %bcond_with vfs Name: ucx -Version: 1.11.2 -Release: 2%{?dist} +Version: 1.13.0 +Release: 1%{?dist} Summary: UCX is a communication library implementing high-performance messaging License: BSD URL: http://www.openucx.org -Source: https://github.com/openucx/%{name}/releases/download/v1.11.2/ucx-1.11.2.tar.gz -Patch1: 0001-TOOLS-INFO-Update-help-message-for-context-features.patch +Source: https://github.com/openucx/%{name}/releases/download/v%{version}/ucx-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) 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. The acronym UCX stands for "Unified Communication X". -This package was built from '' branch, commit ef2bbcf. - %if "%{_vendor}" == "suse" %debug_package %endif @@ -94,7 +91,6 @@ Provides header files and examples for developing with UCX. %prep %setup -q -%patch1 -p1 %build %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 %{_includedir}/uc* %{_libdir}/lib*.so -%{_libdir}/pkgconfig/ucx.pc +%{_libdir}/pkgconfig/ucx*.pc +%{_libdir}/cmake/ucx/*.cmake %{_datadir}/ucx/examples %post -p /sbin/ldconfig @@ -311,6 +308,10 @@ library internals, protocol objects, transports status, and more. %endif %changelog +* Wed Aug 03 2022 Michal Schmidt - 1.13.0-1 +- Update to upstream release 1.13.0 +- Resolves: rhbz#2049557 + * Thu Nov 18 2021 Honggang Li - 1.11.2-2 - TOOLS/INFO: Update help message for context features - Related: rhbz#1991185