Update Sherpa to v3 #10572
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,16 @@ | ||
| ### RPM external libzip 1.11.4 | ||
|
Contributor
There was a problem hiding this comment. @shimashimarin , @akritkbehera already have added |
||
| Source: git+https://github.com/nih-at/libzip.git?obj=main/v%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz | ||
| Requires: zlib zstd | ||
| BuildRequires: cmake | ||
|
|
||
| %prep | ||
| %setup -n %{n}-%{realversion} | ||
|
|
||
| %build | ||
| rm -rf build && mkdir build | ||
| cmake -S . -B build \ | ||
| -DCMAKE_INSTALL_PREFIX=%{i} | ||
| cmake --build build %{makeprocesses} | ||
|
|
||
| %install | ||
| cmake --install build | ||
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,10 @@ | ||
| <tool revision="1"> | ||
|
Contributor
There was a problem hiding this comment. @shimashimarin , is |
||
| <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"/> | ||
| <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/> | ||
|
Contributor
There was a problem hiding this comment.
|
||
| <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 |
|---|---|---|
| @@ -1,60 +1,43 @@ | ||
| ### RPM external sherpa 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 | ||
|
|
||
| %{!?without_openloops:Requires: openloops} | ||
|
|
||
| %prep | ||
| %setup -q -n %{n}-%{realversion} | ||
|
|
||
| %build | ||
| rm -rf build && mkdir build | ||
|
|
||
| cmake -S . -B build \ | ||
| -DCMAKE_INSTALL_PREFIX=%i \ | ||
| -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/Sherpa-generate-model | ||
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 , I think this is not needed if you use the libzip spec from https://github.com/cms-sw/cmsdist/blob/IB/CMSSW_17_0_X/devel/libzip.spec . @akritkbehera mentioned that if few flags are not explicitly turned OFF for libzip then it picks up system bz2lib and that is why rpm dependnecy fails. Please use the libzip from devel branch and remove this line
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.
@smuzaffar thanks for you comments. I've update libzip.spec and modified related things accordingly