From 0cc09ea438c99fbc469a37930a5352eedfafcc1c Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Mon, 22 Jun 2026 08:03:33 +0200
Subject: [PATCH] UCX version 1.20.1; enabled multi-vectorization

---
 cmssw-vectorization.file                   |  2 +-
 scram-tools.file/tools/ucx/vectorized.tmpl |  5 +++++
 ucx.spec                                   | 25 +++++++++++++---------
 3 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 scram-tools.file/tools/ucx/vectorized.tmpl

diff --git a/cmssw-vectorization.file b/cmssw-vectorization.file
index ec713e1a401..75b8438bd0b 100644
--- a/cmssw-vectorization.file
+++ b/cmssw-vectorization.file
@@ -1,5 +1,5 @@
 %if "%{?package_vectorization}" != ""
-%global vectorized_packages fastjet OpenBLAS rivet gbl lwtnn opencv
+%global vectorized_packages fastjet OpenBLAS rivet gbl lwtnn opencv ucx
 %if 0%{?without_tensorflow} <= 0
 %global vectorized_packages %{vectorized_packages} tensorflow-sources tensorflow
 %endif
diff --git a/scram-tools.file/tools/ucx/vectorized.tmpl b/scram-tools.file/tools/ucx/vectorized.tmpl
new file mode 100644
index 00000000000..dcb9e0eccbe
--- /dev/null
+++ b/scram-tools.file/tools/ucx/vectorized.tmpl
@@ -0,0 +1,5 @@
+<tool name="ucx_@TOOL_VECTORIZATION@"  revision="1">
+  <client>
+    <environment name="@TOOL_VECTORIZATION_KEY@_LIBDIR" default="$TOOL_BASE/lib"/>
+  </client>
+</tool>
diff --git a/ucx.spec b/ucx.spec
index 1135cf94577..f0585ae3036 100644
--- a/ucx.spec
+++ b/ucx.spec
@@ -1,4 +1,6 @@
-### RPM external ucx 1.19.0
+### RPM external ucx 1.20.1
+## INCLUDE microarch_flags
+## INCLUDE cuda-flags
 Source: https://github.com/openucx/%{n}/archive/refs/tags/v%{realversion}.tar.gz
 BuildRequires: autotools
 %{!?without_cuda:Requires: cuda gdrcopy}
@@ -15,6 +17,11 @@ Requires: xpmem
 
 ./configure \
   --prefix=%i \
+  --enable-mt \
+  --disable-logging \
+  --disable-debug \
+  --disable-assertions \
+  --disable-params-check \
   --disable-dependency-tracking \
   --enable-openmp \
   --enable-shared \
@@ -25,20 +32,14 @@ Requires: xpmem
   --disable-doxygen-html \
   --enable-compiler-opt \
   --enable-cma \
-  --enable-mt \
   --with-pic \
   --with-gnu-ld \
-%ifarch x86_64
-  --with-march=x86-64-v2 \
-  --with-sse41 \
-  --with-sse42 \
-  --without-avx \
-%endif
   --without-go \
   --without-java \
 %if 0%{!?without_cuda:1}
   --with-cuda=$CUDA_ROOT \
   --with-gdrcopy=$GDRCOPY_ROOT \
+  --with-nvcc-gencode='%{nvcc_flags_cuda_archs}' \
 %else
   --without-cuda \
   --without-gdrcopy \
@@ -59,14 +60,18 @@ Requires: xpmem
   --without-knem \
   --with-xpmem=$XPMEM_ROOT \
   --without-ugni \
+%ifarch x86_64
+  CFLAGS="%{selected_microarch}" \
+  CXXFLAGS="%{selected_microarch}" \
+%endif
   CPPFLAGS="-I$NUMACTL_ROOT/include" \
   LDFLAGS="-L$NUMACTL_ROOT/lib"
 
 %build
-make %{makeprocesses} 
+make %{makeprocesses} V=1
 
 %install
-make install
+make install V=1
 
 # remove pkg-config to avoid rpm-generated dependency on /usr/bin/pkg-config
 rm -rf %{i}/lib/pkgconfig