Skip to content

[Sherpa] Update Sherpa to 2.2.16 and add Recola #10200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shimashimarin wants to merge 5 commits into
base: IB/CMSSW_17_0_X/master
Choose a base branch
from
Open

[Sherpa] Update Sherpa to 2.2.16 and add Recola #10200

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
357cbb7
add recola
shimashimarin Nov 16, 2025
30db943
add cmake config of collier.spec
shimashimarin Nov 16, 2025
e6fb775
add collierConfigVersion.cmake
shimashimarin Nov 16, 2025
45dee59
add recola to sherpa
shimashimarin Nov 16, 2025
df2229b
update recola cmake
shimashimarin Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion collier.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,13 @@ cmake ../ \
make -j1

%install
mkdir -p %{i}/lib %{i}/include
mkdir -p %{i}/lib %{i}/include %{i}/cmake
cp libcollier.a %{i}/lib
cp modules/*.mod %{i}/include/
cp collierConfig.cmake %{i}/cmake
cp collierConfigVersion.cmake %{i}/cmake
sed -i 's;^.*set(COLLIER_LIBRARY_DIR.*$;get_filename_component(COLLIER_LIBRARY_DIR "${CMAKE_CURRENT_LIST_DIR}/../lib" ABSOLUTE);' %{i}/cmake/collierConfig.cmake
sed -i 's;^.*set(COLLIER_INCLUDE_DIR.*$;get_filename_component(COLLIER_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../include" ABSOLUTE);' %{i}/cmake/collierConfig.cmake



25 changes: 25 additions & 0 deletions recola.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
### RPM external recola 1.5.0
Source: https://recola.hepforge.org/downloads/%{n}-%{realversion}.tar.gz
Requires: collier
BuildRequires: cmake

%define keep_archives true

%prep
%setup -q -n recola-%{realversion}

%build
rm -rf build && mkdir build
cmake -S . -B build \
-DCMAKE_INSTALL_PREFIX=%{i} \
-Dcollier_path=${COLLIER_ROOT} \
-Dwith_smtests=ON
cmake --build build %{makeprocesses}


%install
cmake --install build
mkdir %{i}/cmake
cp %{i}/lib/cmake/recolaConfig.cmake %{i}/cmake
sed -i 's;^.*set(RECOLA_LIBRARY_DIR.*$;get_filename_component(RECOLA_LIBRARY_DIR "${CMAKE_CURRENT_LIST_DIR}/../lib" ABSOLUTE);' %{i}/cmake/recolaConfig.cmake
sed -i 's;^.*set(RECOLA_INCLUDE_DIR.*$;get_filename_component(RECOLA_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../include" ABSOLUTE);' %{i}/cmake/recolaConfig.cmake
Copy link
Copy Markdown
Contributor

@smuzaffar smuzaffar Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shimashimarin , you are copying %{i}/lib/cmake/recolaConfig.cmake in to %{i}/cmake ? is this needed? I would suggest to leave the cmake files lib/cmake path and run sed command directly on %{i}/lib/cmake/recolaConfig.cmake. If you really want cmake files in top level directory then please delete the one from %{i}/lib/cmake

Copy link
Copy Markdown
Contributor

@smuzaffar smuzaffar Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shimashimarin , can you please take care of it. As expected , we see build paths in lib/cmake files https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-0817e1/49482/external_checks/relocate/recola.txt

lib/cmake/recolaConfig.cmake:set(RECOLA_LIBRARY_DIR "/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/tmp/BUILDROOT/6e292a6c44125ef340634bfdd66fa7ea/opt/cmssw/el8_amd64_gcc13/external/recola/1.5.0-6e292a6c44125ef340634bfdd66fa7ea/lib")
lib/cmake/recolaConfig.cmake:set(RECOLA_INCLUDE_DIR "/data/cmsbld/jenkins/workspace/ib-run-pr-tests/testBuildDir/tmp/BUILDROOT/6e292a6c44125ef340634bfdd66fa7ea/opt/cmssw/el8_amd64_gcc13/external/recola/1.5.0-6e292a6c44125ef340634bfdd66fa7ea/include")

Copy link
Copy Markdown
Contributor Author

@shimashimarin shimashimarin Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing out this. I have updated it

8 changes: 8 additions & 0 deletions scram-tools.file/tools/recola/recola.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<tool name="recola" version="@TOOL_VERSION@" revision="1">
<client>
<environment name="RECOLA_BASE" default="@TOOL_ROOT@"/>
<environment name="LIBDIR" default="$RECOLA_BASE/lib"/>
<environment name="INCLUDE" default="$RECOLA_BASE/include"/>
</client>
<use name="collier"/>
</tool>
18 changes: 10 additions & 8 deletions sherpa-2.2.10-hepmcshort.patch → sherpa-2.2.16-hepmcshort.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
diff -Naur a/SHERPA/Main/Sherpa.C b/SHERPA/Main/Sherpa.C
--- a/SHERPA/Main/Sherpa.C 2020-08-24 10:09:46.822502996 +0200
+++ b/SHERPA/Main/Sherpa.C 2020-08-24 10:15:36.098836763 +0200
@@ -294,21 +294,23 @@
diff --git a/SHERPA/Main/Sherpa.C b/SHERPA/Main/Sherpa.C
index 0a16d23..ecb58e0 100644
--- a/SHERPA/Main/Sherpa.C
+++ b/SHERPA/Main/Sherpa.C
@@ -300,21 +300,23 @@ bool Sherpa::GenerateOneEvent(bool reset)
}

#ifdef USING__HEPMC2
Expand Down Expand Up @@ -29,10 +30,11 @@ diff -Naur a/SHERPA/Main/Sherpa.C b/SHERPA/Main/Sherpa.C
p_hepmc3->AddCrossSection(event, TotalXS(), TotalErr());
}
#endif
diff -Naur a/SHERPA/Main/Sherpa.H b/SHERPA/Main/Sherpa.H
--- a/SHERPA/Main/Sherpa.H 2020-08-24 10:09:46.822502996 +0200
+++ b/SHERPA/Main/Sherpa.H 2020-08-24 10:11:27.751754145 +0200
@@ -54,10 +54,10 @@
diff --git a/SHERPA/Main/Sherpa.H b/SHERPA/Main/Sherpa.H
index 599178b..d654d2c 100644
--- a/SHERPA/Main/Sherpa.H
+++ b/SHERPA/Main/Sherpa.H
@@ -54,10 +54,10 @@ namespace SHERPA {

bool GenerateOneEvent(bool reset=true);
#ifdef USING__HEPMC2
Expand Down
35 changes: 0 additions & 35 deletions sherpa-cpp20.patch
View file
Open in desktop

This file was deleted.

15 changes: 7 additions & 8 deletions sherpa.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
### RPM external sherpa 2.2.15
Source: http://www.hepforge.org/archive/sherpa/SHERPA-MC-%{realversion}.tar.gz
Requires: hepmc lhapdf blackhat sqlite python3 fastjet openmpi
### RPM external sherpa 2.2.16
Source: git+https://gitlab.com/sherpa-team/sherpa.git?obj=master/v%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
Requires: hepmc lhapdf blackhat sqlite python3 fastjet openmpi recola
BuildRequires: mcfm swig autotools
Patch0: sherpa-2.2.10-hepmcshort
Patch1: sherpa-cpp20
Patch0: sherpa-2.2.16-hepmcshort
#Avoid calling setenv: https://gitlab.com/sherpa-team/sherpa/-/commit/6ead62d7a2758612f8965fb5b61df8c012cf9cae.diff
Patch2: sherpa-setenv
Patch1: sherpa-setenv

%{!?without_openloops:Requires: openloops}

%prep
%setup -q -n SHERPA-MC-%{realversion}
%setup -q -n sherpa-%{realversion}

autoreconf -i --force

Expand All @@ -25,7 +24,6 @@ perl -p -i -e 's|-rdynamic||g' configure AddOns/Analysis/Scripts/Makefile.in

%patch0 -p1
%patch1 -p1
%patch2 -p1

%build
export PYTHON=$(which python3)
Expand All @@ -37,6 +35,7 @@ export PYTHON=$(which python3)
--enable-pyext \
--enable-ufo \
${OPENLOOPS_ROOT+--enable-openloops=$OPENLOOPS_ROOT} \
${RECOLA_ROOT+--enable-recola=$RECOLA_ROOT} \
--enable-mpi \
--with-sqlite3=$SQLITE_ROOT \
--enable-analysis \
Expand Down