diff --git a/.gitignore b/.gitignore index 4b80ee4..d3d2512 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ucx-1.10.1.tar.gz +SOURCES/ucx-1.11.2.tar.gz diff --git a/.ucx.metadata b/.ucx.metadata index a379c19..466cc51 100644 --- a/.ucx.metadata +++ b/.ucx.metadata @@ -1 +1 @@ -a9b8a15bf3975cab16553d6eff19270b0bb42876 SOURCES/ucx-1.10.1.tar.gz +47a560f7334ba17ac3342969e74af9169ed75d57 SOURCES/ucx-1.11.2.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 new file mode 100644 index 0000000..3c3453c --- /dev/null +++ b/SOURCES/0001-TOOLS-INFO-Update-help-message-for-context-features.patch @@ -0,0 +1,64 @@ +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/SPECS/ucx.spec b/SPECS/ucx.spec index bf15895..02add94 100644 --- a/SPECS/ucx.spec +++ b/SPECS/ucx.spec @@ -13,15 +13,17 @@ %bcond_with rocm %bcond_with ugni %bcond_with xpmem +%bcond_with vfs Name: ucx -Version: 1.10.1 +Version: 1.11.2 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.10.1/ucx-1.10.1.tar.gz +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 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Prefix: %{_prefix} @@ -63,6 +65,9 @@ BuildRequires: hsa-rocr-dev %if %{with xpmem} BuildRequires: xpmem-devel %endif +%if %{with vfs} +BuildRequires: fuse3-devel +%endif %description UCX is an optimized communication framework for high-performance distributed @@ -74,7 +79,7 @@ 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 c334359. +This package was built from '' branch, commit ef2bbcf. %if "%{_vendor}" == "suse" %debug_package @@ -89,6 +94,7 @@ 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}}} @@ -108,6 +114,7 @@ Provides header files and examples for developing with UCX. %_with_arg rdmacm rdmacm \ %_with_arg rocm rocm \ %_with_arg xpmem xpmem \ + %_with_arg vfs fuse3 \ %_with_arg ugni ugni \ %{?configure_options} make %{?_smp_mflags} V=1 @@ -122,7 +129,9 @@ rm -f %{buildroot}%{_libdir}/ucx/lib*.a %files %{_libdir}/lib*.so.* -%{_bindir}/uc* +%{_bindir}/ucx_info +%{_bindir}/ucx_perftest +%{_bindir}/ucx_read_profile %{_bindir}/io_demo %{_datadir}/ucx %exclude %{_datadir}/ucx/examples @@ -287,8 +296,29 @@ process to map the memory of another process into its virtual address space. %{_libdir}/ucx/libuct_xpmem.so.* %endif +%if %{with vfs} +%package vfs +Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: UCX Virtual Filesystem support. + +%description vfs +Provides a virtual filesystem over FUSE which allows real-time monitoring of UCX +library internals, protocol objects, transports status, and more. + +%files vfs +%{_libdir}/ucx/libucs_fuse.so.* +%{_bindir}/ucx_vfs +%endif %changelog +* Thu Nov 18 2021 Honggang Li - 1.11.2-2 +- TOOLS/INFO: Update help message for context features +- Resolves: rhbz#1973959 + +* Tue Nov 09 2021 Honggang Li - 1.11.2-1 +- Bump version to 1.11.2 +- Resolves: rhbz#1982204 + * Thu May 27 2021 Yurii Shestakov 1.10.1-2 - Bump version to 1.10.1