diff --git a/0001-TOOLS-INFO-Update-help-message-for-context-features.patch b/0001-TOOLS-INFO-Update-help-message-for-context-features.patch deleted file mode 100644 index 3c3453c4a794fc5feccde20458e64c5736558813..0000000000000000000000000000000000000000 --- a/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.33.1 - diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8 diff --git a/download b/download index cb5fc096e6bdbd935fa525a5df1ea823bc49ddd4..2bd29468b10b61cb8e30cd5c2255db7a085e189d 100644 --- a/download +++ b/download @@ -1 +1 @@ -074f29345d2ac7636175b25e8c409044 ucx-1.11.2.tar.gz +b94e0ae7466126a99dbcd76f49270721 ucx-1.13.1.tar.gz diff --git a/ucx.spec b/ucx.spec index d9ea0b84c5e494e55dec85b263bffa23595ef4b8..702222bfbdec2850b97b9ab525a98fd591afee0a 100644 --- a/ucx.spec +++ b/ucx.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %{!?configure_options: %global configure_options %{nil}} %bcond_without cma %bcond_with cuda @@ -17,20 +16,19 @@ %bcond_with vfs Name: ucx -Version: 1.11.2 -Release: 2%{anolis_release}%{?dist} +Version: 1.13.1 +Release: 2%{?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} # UCX currently supports only the following architectures -ExclusiveArch: aarch64 ppc64le x86_64 loongarch64 +ExclusiveArch: aarch64 ppc64le x86_64 %if %{defined extra_deps} Requires: %{?extra_deps} @@ -80,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 @@ -95,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}}} @@ -143,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 @@ -312,8 +308,13 @@ library internals, protocol objects, transports status, and more. %endif %changelog -* Tue Apr 19 2022 gongwen - 1.11.2-2.0.1 -- Add support for loongarch64 +* Wed Feb 08 2023 Michal Schmidt - 1.13.1-2 +- Update to upstream release 1.13.1 +- Resolves: rhbz#2112958 + +* Wed Aug 17 2022 Michal Schmidt - 1.13.0-1 +- Update to upstream release 1.13.0 +- Resolves: rhbz#2049529 * Thu Nov 18 2021 Honggang Li - 1.11.2-2 - TOOLS/INFO: Update help message for context features