.gitignore

@@ -1,23 +1 @@
-/ucx-1.2.2.tar.gz
-/ucx-1.3.1.tar.gz
-/ucx-1.4.0.tar.gz
-/ucx-1.5.1.tar.gz
-/ucx-1.5.2.tar.gz
-/ucx-1.6.0.tar.gz
-/ucx-1.6.1.tar.gz
-/ucx-1.8.0.tar.gz
-/ucx-1.8.1-rc4.tar.gz
-/ucx-1.8.1.tar.gz
-/ucx-1.9.0.tar.gz
-/ucx-1.10.0-rc3.tar.gz
-/ucx-1.10.0.tar.gz
-/ucx-1.10.1-rc1.tar.gz
-/ucx-1.10.1.tar.gz
-/ucx-1.11.0.tar.gz
-/ucx-1.11.2.tar.gz
-/ucx-1.12.0.tar.gz
-/ucx-1.13.0.tar.gz
-/ucx-1.13.1-1.fc36.src.rpm
-/ucx-1.13.1.tar.gz
-/ucx-1.14.1.tar.gz
-/ucx-1.15.0.tar.gz
+SOURCES/ucx-1.15.0.tar.gz

9558.patch

@@ -1,29 +0,0 @@
-From 99264b7352e9b89bfa8cfb2862a9fabd9eb5d764 Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Tue, 19 Dec 2023 13:13:25 -0500
-Subject: [PATCH] BUILD/CONFIG: Keep CFLAGS and CXXFLAGS separate
-
-If configured with CFLAGS containing flags which are specific to C and invalid in CXX, this results in errors when compiling src/tools/perf/lib/uc[pt]_tests.cc:
-
-```
-cc1plus: error: '-Werror=' argument '-Werror=implicit-function-declaration' is not valid for C++ [-Werror]
-cc1plus: error: '-Werror=' argument '-Werror=implicit-int' is not valid for C++ [-Werror]
-```
-This is currently breaking the build in Fedora 40 (rawhide) and ELN (the future RHEL 10).
----
- config/m4/compiler.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/m4/compiler.m4 b/config/m4/compiler.m4
-index 6aa3360e76a..2719e98983b 100644
---- a/config/m4/compiler.m4
-+++ b/config/m4/compiler.m4
-@@ -222,7 +222,7 @@ AC_DEFUN([CHECK_COMPILER_FLAG],
- [
-          AC_MSG_CHECKING([compiler flag $1])
-          SAVE_CFLAGS="$CFLAGS"
--         SAVE_CXXFLAGS="$CFLAGS"
-+         SAVE_CXXFLAGS="$CXXFLAGS"
-          CFLAGS="$BASE_CFLAGS $CFLAGS $2"
-          CXXFLAGS="$BASE_CXXFLAGS $CXXFLAGS $2"
-          AC_LINK_IFELSE([$3],

SPECS/ucx.spec

@@ -3,6 +3,11 @@
 %bcond_with    cuda
 %bcond_with    gdrcopy
 %bcond_without ib
+%if 0%{?fedora} >= 30 || 0%{?rhel} >= 7
+%bcond_with ib_cm
+%else
+%bcond_without ib_cm
+%endif
 %bcond_with    knem
 %bcond_without rdmacm
 %bcond_with    rocm
@@ -12,25 +17,12 @@
 
 Name: ucx
 Version: 1.15.0
-Release: 4%{?dist}
+Release: 2%{?dist}
 Summary: UCX is a communication library implementing high-performance messaging
 
-License: BSD-3-Clause AND MIT AND CC-PDDC AND (BSD-3-Clause OR Apache-2.0)
-# CC-PDDC
-# src/ucm/ptmalloc286/malloc-2.8.6.h
-# src/ucm/ptmalloc286/malloc.c
-# MIT
-# src/ucs/datastruct/khash.h
-# BSD-3-Clause or Apache-2.0
-# src/ucs/arch/aarch64/memcpy_thunderx2.S
-# BSD-3-Clause
-# All other files
-
+License: BSD
 URL: http://www.openucx.org
 Source: https://github.com/openucx/%{name}/releases/download/v%{version}/ucx-%{version}.tar.gz
-# BUILD/CONFIG: Keep CFLAGS and CXXFLAGS separate
-# Fixes build for https://fedoraproject.org/wiki/Changes/PortingToModernC
-Patch0: https://github.com/openucx/%{name}/pull/9558.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Prefix: %{_prefix}
@@ -57,6 +49,9 @@ BuildRequires: gdrcopy
 %if %{with ib}
 BuildRequires: libibverbs-devel
 %endif
+%if %{with ib_cm}
+BuildRequires: libibcm-devel
+%endif
 %if %{with knem}
 BuildRequires: knem
 %endif
@@ -83,7 +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".
 
-
 %if "%{_vendor}" == "suse"
 %debug_package
 %endif
@@ -97,11 +91,8 @@ Provides header files and examples for developing with UCX.
 
 %prep
 %setup -q
-%patch -P0 -p1
-autoreconf -fiv
 
 %build
-
 %define _with_arg()   %{expand:%%{?with_%{1}:--with-%{2}}%%{!?with_%{1}:--without-%{2}}}
 %define _enable_arg() %{expand:%%{?with_%{1}:--enable-%{2}}%%{!?with_%{1}:--disable-%{2}}}
 %configure --disable-optimizations \
@@ -114,6 +105,7 @@ autoreconf -fiv
            %_with_arg cuda cuda \
            %_with_arg gdrcopy gdrcopy \
            %_with_arg ib verbs \
+           %_with_arg ib_cm cm \
            %_with_arg knem knem \
            %_with_arg rdmacm rdmacm \
            %_with_arg rocm rocm \
@@ -147,10 +139,11 @@ rm -f %{buildroot}%{_libdir}/ucx/lib*.a
 %{_includedir}/uc*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/ucx*.pc
-%dir %{_libdir}/cmake/ucx
 %{_libdir}/cmake/ucx/*.cmake
 %{_datadir}/ucx/examples
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %if %{with cma}
 %package cma
@@ -163,7 +156,6 @@ system calls process_vm_readv/writev() for one-shot memory copy from another
 process.
 
 %files cma
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libuct_cma.so.*
 %endif
 
@@ -178,7 +170,6 @@ to UCX communication routines, and transports taking advantage of GPU-Direct
 technology for direct data transfer between GPU and RDMA devices.
 
 %files cuda
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libucx_perftest_cuda.so.*
 %{_libdir}/ucx/libucm_cuda.so.*
 %{_libdir}/ucx/libuct_cuda.so.*
@@ -194,7 +185,6 @@ Provide GDRCopy support for UCX. GDRCopy is a low-latency GPU memory copy
 library, built on top of the NVIDIA GPUDirect RDMA technology.
 
 %files gdrcopy
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libuct_cuda_gdrcopy.so.*
 %endif
 
@@ -210,10 +200,21 @@ Typically these transports provide RDMA support, which enables a fast and
 hardware-offloaded data transfer.
 
 %files ib
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libuct_ib.so.*
 %endif
 
+%if %{with ib_cm}
+%package ib-cm
+Requires: %{name}-ib%{?_isa} = %{version}-%{release}
+Summary: UCX InfiniBand connection-manager support
+
+%description ib-cm
+Provides Infiniband Connection Manager (also known as ibcm) support for UCX.
+
+%files ib-cm
+%{_libdir}/ucx/libuct_ib_cm.so.*
+%endif
+
 %if %{with knem}
 %package knem
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -225,14 +226,13 @@ kernel module that enables high-performance intra-node MPI communication
 for large messages.
 
 %files knem
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libuct_knem.so.*
 %endif
 
 %if %{with rdmacm}
 %package rdmacm
 Requires: %{name}-ib%{?_isa} = %{version}-%{release}
-Requires: ucx-ib = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: UCX RDMA connection manager support
 
 %description rdmacm
@@ -240,7 +240,6 @@ Provides RDMA connection-manager support to UCX, which enables client/server
 based connection establishment for RDMA-capable transports.
 
 %files rdmacm
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libuct_rdmacm.so.*
 %endif
 
@@ -253,7 +252,6 @@ Summary: UCX ROCm GPU support
 Provides Radeon Open Compute (ROCm) Runtime support for UCX.
 
 %files rocm
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libuct_rocm.so.*
 %{_libdir}/ucx/libucm_rocm.so.*
 
@@ -263,12 +261,10 @@ Requires: %{name}-rocm%{?_isa} = %{version}-%{release}
 Summary: UCX GDRCopy support for ROCM
 
 %description rocmgdr
-Provide GDRCopy support for UCX ROCM. GDRCopy is a low-latency GPU
-memory copy library, built on top of the NVIDIA GPUDirect RDMA
-technology.
+Provide GDRCopy support for UCX ROCM. GDRCopy is a low-latency GPU memory copy
+library, built on top of the NVIDIA GPUDirect RDMA technology.
 
 %files rocmgdr
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libuct_rocm_gdr.so.*
 %endif
 %endif
@@ -282,7 +278,6 @@ Summary: UCX Gemini/Aries transport support.
 Provides Gemini/Aries transport for UCX.
 
 %files ugni
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libuct_ugni.so.*
 %endif
 
@@ -296,7 +291,6 @@ Provides XPMEM transport for UCX. XPMEM is a Linux kernel module that enables a
 process to map the memory of another process into its virtual address space.
 
 %files xpmem
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libuct_xpmem.so.*
 %endif
 
@@ -306,82 +300,47 @@ 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.
+Provides a virtual filesystem over FUSE which allows real-time monitoring of UCX
+library internals, protocol objects, transports status, and more.
 
 %files vfs
-%dir %{_libdir}/ucx
 %{_libdir}/ucx/libucs_fuse.so.*
 %{_bindir}/ucx_vfs
 %endif
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.15.0-4
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
+* Thu Nov 09 2023 Kamal Heib <kheib@redhat.com> - 1.15.0-2
+- Fix requirement error
+- Resolves: RHEL-932
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.15.0-3
-- Bump release for June 2024 mass rebuild
+* Tue Nov 07 2023 Kamal Heib <kheib@redhat.com> - 1.15.0-1
+- Update to upstream release 1.15.0
+- Resolves: RHEL-932
 
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Dec 24 2023 Benson Muite <benson_muite@emailplus.org> - 1.15.0-1
-- Upgrade to new release
-
-* Sun Dec 24 2023 Benson Muite <benson_muite@emailplus.org> - 1.14.1-5
-- Add patch to separate C and C++ flags from yselkowitz
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 22 2023 Benson Muite <benson_muite@emailplus.org> - 1.14.1-3
-- Apply fix to enable building with GCC13
-
-* Fri Jun 02 2023 Benson Muite <benson_muite@emailplus.org> - 1.14.1-2
-- Remove changes in patches that have been applied
+* Wed Jun 07 2023 Kamal Heib <kheib@redhat.com> - 1.14.1-1.1
+- Fix rpmdeps issue.
+- Resolves: rhbz#2170072
 
 * Fri Jun 02 2023 Kamal Heib <kheib@redhat.com> - 1.14.1-1
 - Update to upstream release 1.14.1
+- Add gating tests
+- Resolves: rhbz#2170072
 
-* Sun Feb 19 2023 Benson Muite <benson_muite@emailplus.org> - 1.13.1-4
-- List additional licenses used
-- Remove unneeded ldconfig calls
+* Wed Feb 08 2023 Michal Schmidt <mschmidt@redhat.com> - 1.13.1-2
+- Update to upstream release 1.13.1
+- Resolves: rhbz#2112958
 
-* Sat Feb 18 2023 Benson Muite <benson_muite@emailplus.org> - 1.13.1-3
-- Fix type declaration error
-- Fix to enable use of GCC 13
-- Use SPDX license identifier
-- Fix build requires #RBZ2166925
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Dec 24 2022 Benson Muite <benson_muite@emailplus.org> - 1.13.1-1
+* Wed Aug 17 2022 Michal Schmidt <mschmidt@redhat.com> - 1.13.0-1
 - Update to upstream release 1.13.0
+- Resolves: rhbz#2049529
 
-* Wed Aug 03 2022 Michal Schmidt <mschmidt@redhat.com> - 1.13.0-3
-- Update to upstream release 1.13.0
-- Drop autogen.sh call. Upstream tarball does not have it anymore.
+* Thu Nov 18 2021 Honggang Li <honli@redhat.com> - 1.11.2-2
+- TOOLS/INFO: Update help message for context features
+- Resolves: rhbz#1973959
 
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Dec 13 2021 Honggang Li <honli@redhat.com> - 1.12.0-1
-- Bump version to 1.12.0
-
-* Mon Nov 01 2021 Honggang Li <honli@redhat.com> - 1.11.2-1
+* Tue Nov 09 2021 Honggang Li <honli@redhat.com> - 1.11.2-1
 - Bump version to 1.11.2
-
-* Mon Aug 09 2021 Yurii Shestakov <yuriis@nvidia.com> 1.11.0-1
-- Bump version to 1.11.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Resolves: rhbz#1982204
 
 * Thu May 27 2021 Yurii Shestakov <yuriis@nvidia.com> 1.10.1-2
 - Bump version to 1.10.1
@@ -412,37 +371,26 @@ status, and more.
 
 * Wed Jul 1 2020 Yossi Itigin <yosefe@mellanox.com> 1.8.1-1
 - Bump version to 1.8.1
-
 * Sun Sep 22 2019 Yossi Itigin <yosefe@mellanox.com> 1.8.0-1
 - Bump version to 1.8.0
-
 * Sun Mar 24 2019 Yossi Itigin <yosefe@mellanox.com> 1.7.0-1
 - Bump version to 1.7.0
-
 * Thu Jan 24 2019 Yossi Itigin <yosefe@mellanox.com> 1.6.0-1
 - Add cma, knem, and xpmem sub-packages
-
 * Tue Nov 20 2018 Yossi Itigin <yosefe@mellanox.com> 1.6.0-1
 - Bump version to 1.6.0
-
 * Tue Nov 6 2018 Andrey Maslennikov <andreyma@mellanox.com> 1.5.0-1
 - Bump version to 1.5.0
 - See NEWS for details
-
 * Tue Oct 30 2018 Andrey Maslennikov <andreyma@mellanox.com> 1.4.0-1
 - See NEWS for details
-
 * Mon Aug 20 2018 Andrey Maslennikov <andreyma@mellanox.com> 1.3.1-1
 - See NEWS for details
-
 * Thu Aug 16 2018 Andrey Maslennikov <andreyma@mellanox.com> 1.3.0-1
 - Explicitly set gcc-c++ as requirements
-
 * Wed Mar 7 2018 Andrey Maslennikov <andreyma@mellanox.com> 1.3.0-1
 - See NEWS for details
-
 * Mon Aug 21 2017 Andrey Maslennikov <andreyma@mellanox.com> 1.2.1-1
 - Spec file now complies with Fedora guidelines
-
 * Mon Jul 3 2017 Andrey Maslennikov <andreyma@mellanox.com> 1.2.0-1
 - Fedora package created

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -1 +0,0 @@
-SHA512 (ucx-1.15.0.tar.gz) = 8ad9d4bc09a890ffae74c71496221d6ad710116e25531e867f78a84ff90808fe8859d856e261f536e89fba8d7d1b6ed3f7cf5054b6e34edee1bea19d5fdd1e0b

tests/run_tests.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exit 0

tests/tests.yml

@@ -1,11 +0,0 @@
-- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-      tests:
-        - simple:
-            dir: .                                 # switch to subfolder. This parameter is REQUIRED, use `dir: .` for current folder
-            run: ./run_tests.sh                    # this is your test command, its exit code is the outcome of the test
-      required_packages:
-        - ucx