From 2b5a1582e449c8d0c64f7f0bb2ecc34f9465ceb1 Mon Sep 17 00:00:00 2001 From: Marco Rovere Date: Tue, 7 Oct 2025 10:28:25 +0200 Subject: [PATCH 1/3] Move CLUE to V_1_1_0. - Include the patch related to clamp - Improve performance of makeClustersCMSSW --- clue-gcc14.patch | 27 --------------------------- clue.spec | 3 +-- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 clue-gcc14.patch diff --git a/clue-gcc14.patch b/clue-gcc14.patch deleted file mode 100644 index c687b8e5f48..00000000000 --- a/clue-gcc14.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/clueLib/include/TilesAlpaka.h b/clueLib/include/TilesAlpaka.h -index b6ba9e50006616adcb2fee8642420a14fc698aba..0e7bcfd15f867a04c9e25e3534cfc199a01ece94 100644 ---- a/clueLib/include/TilesAlpaka.h -+++ b/clueLib/include/TilesAlpaka.h -@@ -30,13 +30,20 @@ class TilesAlpaka { - - ALPAKA_FN_HOST_ACC int getDim1Bin(float x) const { - int dim1Bin = (x - T::minDim1) * T::invDim1BinSize; -- dim1Bin = std::clamp(dim1Bin, 0, T::nColumns - 1); -+ // Equivalent of std::clamp(dim1Bin, 0, T::nColumns - 1); -+ // which doesn't compile with gcc14 due to reference to __glibcxx_assert -+ // See https://github.com/llvm/llvm-project/issues/95183 -+ // and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115740 -+ int new_max = std::max(dim1Bin, 0); -+ dim1Bin = std::min(T::nColumns - 1, new_max); - return dim1Bin; - } - - ALPAKA_FN_HOST_ACC int getDim2Bin(float y) const { - int dim2Bin = (y - T::minDim2) * T::invDim2BinSize; -- dim2Bin = std::clamp(dim2Bin, 0, T::nRows - 1); -+ // See comment in getDim1Bin -+ int new_max = std::max(dim2Bin, 0); -+ dim2Bin = std::min(T::nRows - 1, new_max); - return dim2Bin; - } - diff --git a/clue.spec b/clue.spec index 8a3483d6800..3a34c4efdee 100644 --- a/clue.spec +++ b/clue.spec @@ -1,10 +1,9 @@ -### RPM external clue 1.0.0 +### RPM external clue 1.1.0 ## NOCOMPILER %define git_commit V_%(echo %{realversion} | tr '.' '_') Source: https://gitlab.cern.ch/kalos/%{n}/-/archive/%{git_commit}/%{n}-%{git_commit}.tar.gz -Patch0: clue-gcc14 Requires: alpaka %prep From d25e154129f877e1c149747049dc33b76a6e6194 Mon Sep 17 00:00:00 2001 From: iarspider Date: Tue, 7 Oct 2025 10:54:57 +0200 Subject: [PATCH 2/3] Update clue.spec --- clue.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/clue.spec b/clue.spec index 3a34c4efdee..895f01e4cdf 100644 --- a/clue.spec +++ b/clue.spec @@ -8,7 +8,6 @@ Requires: alpaka %prep %setup -n %{n}-%{git_commit} -%patch0 -p1 %build From 7e1240ce0e9274b85fd2d9b02fc7ba8f96192db4 Mon Sep 17 00:00:00 2001 From: Marco Rovere Date: Wed, 8 Oct 2025 10:03:24 +0200 Subject: [PATCH 3/3] Update CLUE version to 1.1.1 Extend the Tile initialization to also cover the search extensions. --- clue.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clue.spec b/clue.spec index 895f01e4cdf..a97594c5ee5 100644 --- a/clue.spec +++ b/clue.spec @@ -1,4 +1,4 @@ -### RPM external clue 1.1.0 +### RPM external clue 1.1.1 ## NOCOMPILER %define git_commit V_%(echo %{realversion} | tr '.' '_')