Update Sherpa to v3 #10572
+219
−29
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| ### RPM external NNPuppiTauModel 1.0.1 | ||
| Source: https://github.com/cms-hls4ml/%{n}/archive/refs/tags/v%{realversion}.tar.gz | ||
| Requires: hls4mlEmulatorExtras hls | ||
| BuildRequires: gmake | ||
|
|
||
| %prep | ||
| %setup -n %{n}-%{realversion} | ||
|
|
||
| %build | ||
| make %{makeprocesses} EMULATOR_EXTRAS=${HLS4MLEMULATOREXTRAS_ROOT} HLS_ROOT=${HLS_ROOT} | ||
|
|
||
| %install | ||
| make PREFIX=%{i} install |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| ### RPM external libzip 1.11.4 | ||
| Source: https://github.com/nih-at/libzip/releases/download/v%{realversion}/libzip-%{realversion}.tar.gz | ||
| BuildRequires: cmake | ||
| Requires: zlib zstd | ||
| Requires: bz2lib | ||
|
|
||
| %prep | ||
| %setup -n %{n}-%{realversion} | ||
|
|
||
| %build | ||
| cmake \ | ||
| -S %{_builddir}/%{n}-%{realversion} \ | ||
| -B %{_builddir}/build \ | ||
| -DCMAKE_INSTALL_PREFIX=%{i} \ | ||
| -DCMAKE_PREFIX_PATH=%{cmake_prefix_path} \ | ||
| -DENABLE_COMMONCRYPTO=OFF \ | ||
| -DENABLE_GNUTLS=OFF \ | ||
| -DENABLE_MBEDTLS=OFF \ | ||
| -DENABLE_WINDOWS_CRYPTO=OFF \ | ||
| -DBUILD_EXAMPLES=OFF \ | ||
| -DBUILD_DOC=OFF | ||
|
|
||
| make -C %{_builddir}/build %{makeprocesses} | ||
| %install | ||
| make -C %{_builddir}/build %{makeprocesses} install | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,16 @@ | ||
| %ifarch x86_64 | ||
| %define default_microarch_name x86-64-v3 | ||
| %define default_microarch -march=%{default_microarch_name} | ||
| %if "%{?override_microarch_name:set}" == "set" | ||
| %define selected_microarch_name %{override_microarch_name} | ||
| %define selected_microarch %{override_microarch} | ||
| %else | ||
| %define selected_microarch_name %{default_microarch_name} | ||
| %define selected_microarch %{default_microarch} | ||
| %endif | ||
| %else | ||
| %define default_microarch_name %{nil} | ||
| %define default_microarch %{nil} | ||
| %define selected_microarch_name %{nil} | ||
| %define selected_microarch %{nil} | ||
| %endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| BuildRequires: py3-hatchling |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| BuildRequires: py3-hatchling py3-hatch-jupyter-builder | ||
| Requires: py3-async-lru py3-httpx py3-importlib-metadata py3-ipykernel py3-Jinja2 py3-jupyter-core | ||
| Requires: py3-jupyter-server py3-jupyter-lsp py3-jupyterlab-server py3-notebook-shim py3-packaging | ||
| Requires: py3-tomli py3-tornado py3-traitlets py3-jupyter-builder |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <tool revision="1"> | ||
| <client> | ||
| <environment name="LIBDIR" default="$TOOL_BASE/lib64"/> | ||
| </client> | ||
| </tool> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <tool revision="1"> | ||
|
Contributor
There was a problem hiding this comment. @shimashimarin , is |
||
| <lib name="zip"/> | ||
| <client> | ||
| <environment name="LIBDIR" default="$TOOL_BASE/lib"/> | ||
| <environment name="INCLUDE" default="$TOOL_BASE/include"/> | ||
| </client> | ||
| <runtime name="PATH" value="$TOOL_BASE/bin" type="path"/> | ||
| <use name="zlib"/> | ||
| <use name="zstd"/> | ||
| </tool> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| <tool revision="3"> | ||
| <client> | ||
| <environment name="LIBDIR" default="$TOOL_BASE/lib"/> | ||
| <environment name="INCLUDE" default="$TOOL_BASE/include"/> | ||
| <runtime name="CMS_OPENLOOPS_PREFIX" value="$TOOL_BASE" type="path"/> | ||
| </client> | ||
| </tool> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <tool revision="3"> | ||
| <lib name="SherpaMain"/> | ||
| <lib name="ToolsPhys"/> | ||
| <lib name="ToolsMath"/> | ||
| <lib name="ToolsYaml"/> | ||
| <lib name="ToolsOrg"/> | ||
| <lib name="SherpaSingleEvents"/> | ||
| <lib name="SherpaTools"/> | ||
| <client> | ||
| <environment name="BINDIR" default="$TOOL_BASE/bin"/> | ||
| <environment name="LIBDIR" default="$TOOL_BASE/lib64/SHERPA-MC3"/> | ||
| <environment name="INCLUDE" default="$TOOL_BASE/include/SHERPA-MC3"/> | ||
| </client> | ||
| <runtime name="CMSSW_FWLITE_INCLUDE_PATH" value="$TOOL_BASE/include" type="path"/> | ||
| <runtime name="SHERPA_SHARE_PATH" value="$TOOL_BASE/share/SHERPA-MC" type="path"/> | ||
| <runtime name="SHERPA_INCLUDE_PATH" value="$TOOL_BASE/include/SHERPA-MC3" type="path"/> | ||
| <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/> | ||
| <runtime name="SHERPA_LIBRARY_PATH" value="$TOOL_BASE/lib64/SHERPA-MC3" type="path"/> | ||
| <runtime name="SHERPA_CMAKE_PATH" value="$TOOL_BASE/share/SHERPA-MC" type="path"/> | ||
| <use name="HepMC3"/> | ||
| <use name="lhapdf"/> | ||
| <use name="blackhat"/> | ||
| <use name="fastjet"/> | ||
| <use name="openmpi"/> | ||
| <use name="rivet"/> | ||
| <use name="pythia8"/> | ||
| <use name="libzip"/> | ||
| <ifarchitecture name="!ppc64le"> | ||
| <use name="openloops"/> | ||
| </ifarchitecture> | ||
| </tool> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <tool name="ucx_@TOOL_VECTORIZATION@" revision="1"> | ||
| <client> | ||
| <environment name="@TOOL_VECTORIZATION_KEY@_LIBDIR" default="$TOOL_BASE/lib"/> | ||
| </client> | ||
| </tool> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -110,7 +110,7 @@ message(STATUS "SHERPA: CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}") | ||
| endif() | ||
| message(STATUS "SHERPA: CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}") | ||
| if (SHERPA_ENABLE_VERSIONING) | ||
| - set (VERSIONING "-${EXTERNAL_VERSION_STRING}") | ||
| + set (VERSIONING "${SHERPA_VERSION_MAJOR}") | ||
| else() | ||
| set (VERSIONING "") | ||
| endif() | ||
| @@ -966,7 +966,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Examples/V_plus_Jets/LHC_WJets/CMake | ||
| if (SHERPA_ENABLE_UFO) | ||
| SET(SHERPA_CMAKE_CONFIG_DIR ${CMAKE_INSTALL_PREFIX}/share/SHERPA-MC/) | ||
| configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MODEL/UFO/src/ufo_interface/parser.py.in ${CMAKE_CURRENT_BINARY_DIR}/MODEL/UFO/src/ufo_interface/parser.py @ONLY) | ||
| -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MODEL/UFO/bin/Sherpa-generate-model.in ${CMAKE_CURRENT_BINARY_DIR}/MODEL/UFO/bin/Sherpa-generate-model @ONLY) | ||
| +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/MODEL/UFO/bin/Sherpa-generate-model.in ${CMAKE_CURRENT_BINARY_DIR}/MODEL/UFO/bin/Sherpa${VERSIONING}-generate-model @ONLY) | ||
| if (NOT SHERPA_ENABLE_PYTHON AND SHERPA_ENABLE_TESTING) | ||
| message(FATAL_ERROR "SHERPA: UFO model generation tests requires Python Addons!") | ||
| endif() | ||
| --- a/MODEL/UFO/CMakeLists.txt | ||
| +++ b/MODEL/UFO/CMakeLists.txt | ||
| @@ -17,7 +17,7 @@ file(COPY src/ufo_interface DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src/) | ||
| file(COPY src/opt_einsum/opt_einsum DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src/) | ||
| install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/src/ | ||
| DESTINATION ${SHERPA_Python_SITEARCH}/) | ||
| -install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/Sherpa-generate-model | ||
| +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/Sherpa${VERSIONING}-generate-model | ||
| DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
|
|
||
| if(SHERPA_ENABLE_TESTING) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| ### RPM external sherpa3 3.0.4 | ||
| Source: git+https://gitlab.com/sherpa-team/sherpa.git?obj=master/v%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz | ||
| Requires: hepmc3 lhapdf blackhat fastjet openmpi rivet pythia8 libzip | ||
| BuildRequires: cmake swig | ||
|
|
||
| Patch0: sherpa-versioning | ||
|
|
||
| %{!?without_openloops:Requires: openloops} | ||
|
|
||
| %prep | ||
| %setup -q -n %{n}-%{realversion} | ||
| %patch0 -p1 | ||
|
|
||
| %build | ||
| rm -rf build && mkdir build | ||
|
|
||
| cmake -S . -B build \ | ||
| -DCMAKE_INSTALL_PREFIX=%i \ | ||
| -DSHERPA_ENABLE_VERSIONING=ON \ | ||
| -DEXTERNAL_VERSION_STRING=3 \ | ||
| -DSHERPA_ENABLE_MPI=ON -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_Fortran_COMPILER=mpifort \ | ||
| -DSHERPA_ENABLE_ANALYSIS=ON \ | ||
| -DSHERPA_ENABLE_EXAMPLES=ON \ | ||
| -DSHERPA_ENABLE_LIBZIP=ON -DLibZip_DIR=$LIBZIP_ROOT \ | ||
| -DSHERPA_ENABLE_GZIP=ON \ | ||
| -DSHERPA_ENABLE_HEPMC3=ON -DHEPMC3_DIR=$HEPMC3_ROOT -DSHERPA_ENABLE_HEPMC3_ROOT=OFF \ | ||
| -DSHERPA_ENABLE_LHAPDF=ON -DLHAPDF_DIR=$LHAPDF_ROOT -DSHERPA_ENABLE_INTERNAL_PDFS=OFF \ | ||
| -DSHERPA_ENABLE_BLACKHAT=ON -DBLACKHAT_DIR=$BLACKHAT_ROOT \ | ||
| ${OPENLOOPS_ROOT+-DSHERPA_ENABLE_OPENLOOPS=ON -DOPENLOOPS_DIR=$OPENLOOPS_ROOT} \ | ||
| -DSHERPA_ENABLE_ROOT=OFF \ | ||
| -DSHERPA_ENABLE_PYTHIA8=ON -DPYHIA8_DIR=$PYTHIA8_ROOT \ | ||
| -DSHERPA_ENABLE_RECOLA=OFF \ | ||
| -DSHERPA_ENABLE_RIVET=ON -DRIVET_DIR=$RIVET_ROOT \ | ||
| -DSHERPA_ENABLE_EWSUD=ON \ | ||
| -DSHERPA_ENABLE_PYTHON=ON \ | ||
| -DSHERPA_ENABLE_UFO=ON \ | ||
| -DSHERPA_ENABLE_THREADING=ON \ | ||
| -DSHERPA_ENABLE_DIHIGGS=OFF \ | ||
| -DSHERPA_ENABLE_MADLOOP=OFF \ | ||
| -DSHERPA_ENABLE_MCFM=OFF \ | ||
| -DSHERPA_ENABLE_TESTING=OFF \ | ||
| -DSHERPA_ENABLE_INTEGRATION_TESTS=OFF \ | ||
| -DSHERPA_ENABLE_BINRELOC=OFF | ||
| cmake --build build %{makeprocesses} | ||
|
|
||
| %install | ||
| cmake --install build | ||
| sed -i -e 's|^#!/.*|#!/usr/bin/env python3|' %{i}/bin/Sherpa3-generate-model |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@shimashimarin , @akritkbehera already have added
libzip(which was needed for xrootd 6.x series) in devel branch https://github.com/cms-sw/cmsdist/blob/IB/CMSSW_17_0_X/devel/libzip.spec . Can you please use https://github.com/cms-sw/cmsdist/blob/IB/CMSSW_17_0_X/devel/libzip.spec so that we do not have to resolve any merge conflicts