-
Notifications
You must be signed in to change notification settings - Fork 183
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.
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
[TOOLFILES] Check mergebility after merging with latest cmsdist #7110
Closed
mrodozov
wants to merge
19
commits into
cms-sw:IB/CMSSW_12_0_X/master
from
mrodozov:scram-tools-change
Closed
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
f614add
Check functionality after merging with latest cmsdist
mrodozov 489f32a
typo
mrodozov 00ed1e3
add pkgreqs in init files for cmsswdata
mrodozov 8c53d25
add get_tools script in scramv1-tool-conf
mrodozov 53ccd7f
remove old lines and use last scram-tools commit
mrodozov f23cc00
add an export to cmsswdata and remove toolfiles
mrodozov 89588d1
remove toolfile string for fwlite and coral
mrodozov 3625f68
save fixes and changes for geant4data cmsswdata systemtools
mrodozov 5df88b7
bring back coral. coral builds now
mrodozov 424d7b7
numpy changes
mrodozov 3ee8880
all toolfiles deployed in cmssw-tool-conf, coral and fwlite building
mrodozov 4dbbf72
keep python_tools as they were and remove redundant lines
mrodozov 767b7a4
Merge branch 'IB/CMSSW_12_0_X/master' into scram-tools-change
mrodozov e51a811
fix cmsswdata and g4data paths and gmake-toolfile
mrodozov ed4f913
fix vectorization variables for gcc flags and update tool-conf versions
mrodozov e31c9fd
add the ppc flags in gcc/env.sh instead
mrodozov e50000c
change IMPORT to INCLUDE for scramv1
mrodozov 14e1e98
Merge branch 'IB/CMSSW_12_0_X/master' into scram-tools-change
mrodozov 5d461cf
revert to avoid rebuild of packages
smuzaffar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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,194 +1,195 @@ | ||
| ### RPM cms cmssw-tool-conf 46.0 | ||
| ### RPM cms cmssw-tool-conf 50.0 | ||
| # With cmsBuild, change the above version only when a new tool is added | ||
|
|
||
| ## NOCOMPILER | ||
| ## INSTALL_DEPENDENCIES cmsLHEtoEOSManager gcc-fixincludes cmssw-osenv cms-git-tools | ||
| ## UPLOAD_DEPENDENCIES dqmgui | ||
|
|
||
| BuildRequires: scram-tools | ||
| Requires: crab | ||
| Requires: cmssw-wm-tools | ||
| Requires: google-benchmark-toolfile | ||
| Requires: catch2-toolfile | ||
| Requires: starlight-toolfile | ||
| Requires: alpgen-toolfile | ||
| Requires: boost-toolfile | ||
| Requires: bz2lib-toolfile | ||
| Requires: charybdis-toolfile | ||
| Requires: classlib-toolfile | ||
| Requires: clhep-toolfile | ||
| Requires: coral-toolfile | ||
| Requires: cppunit-toolfile | ||
| Requires: curl-toolfile | ||
| Requires: das_client-toolfile | ||
| Requires: db6-toolfile | ||
| Requires: davix-toolfile | ||
| Requires: evtgen-toolfile | ||
| Requires: expat-toolfile | ||
| Requires: google-benchmark | ||
| Requires: catch2 | ||
| Requires: starlight | ||
| Requires: alpgen | ||
| Requires: boost | ||
| Requires: bz2lib | ||
| Requires: charybdis | ||
| Requires: classlib | ||
| Requires: clhep | ||
| Requires: coral | ||
| Requires: cppunit | ||
| Requires: curl | ||
| Requires: das_client | ||
| Requires: db6 | ||
| Requires: davix | ||
| Requires: evtgen | ||
| Requires: expat | ||
| Requires: fakesystem | ||
| Requires: fastjet-toolfile | ||
| Requires: flatbuffers-toolfile | ||
| Requires: fmt-toolfile | ||
| Requires: gbl-toolfile | ||
| Requires: gcc-toolfile | ||
| Requires: gdbm-toolfile | ||
| Requires: geant4-toolfile | ||
| Requires: geant4data-toolfile | ||
| Requires: vecgeom-toolfile | ||
| Requires: glimpse-toolfile | ||
| Requires: gmake-toolfile | ||
| Requires: gsl-toolfile | ||
| Requires: highfive-toolfile | ||
| Requires: hector-toolfile | ||
| Requires: hepmc-toolfile | ||
| Requires: heppdt-toolfile | ||
| Requires: herwig-toolfile | ||
| Requires: herwig7-toolfile | ||
| Requires: hydjet-toolfile | ||
| Requires: ittnotify-toolfile | ||
| Requires: jemalloc-toolfile | ||
| Requires: jemalloc-debug-toolfile | ||
| Requires: jimmy-toolfile | ||
| Requires: json-toolfile | ||
| Requires: ktjet-toolfile | ||
| Requires: lhapdf-toolfile | ||
| Requires: libjpeg-turbo-toolfile | ||
| Requires: libpng-toolfile | ||
| Requires: libtiff-toolfile | ||
| Requires: libungif-toolfile | ||
| Requires: libxml2-toolfile | ||
| Requires: lwtnn-toolfile | ||
| Requires: meschach-toolfile | ||
| Requires: pcre-toolfile | ||
| Requires: photos-toolfile | ||
| Requires: photospp-toolfile | ||
| Requires: pyquen-toolfile | ||
| Requires: pythia6-toolfile | ||
| Requires: pythia8-toolfile | ||
| Requires: python-toolfile | ||
| Requires: python3-toolfile | ||
| Requires: root-toolfile | ||
| Requires: sherpa-toolfile | ||
| Requires: libpciaccess-toolfile | ||
| Requires: numactl-toolfile | ||
| Requires: hwloc-toolfile | ||
| Requires: fastjet | ||
| Requires: flatbuffers | ||
| Requires: fmt | ||
| Requires: gbl | ||
| Requires: gcc | ||
| Requires: gdbm | ||
| Requires: geant4 | ||
| Requires: geant4data | ||
| Requires: vecgeom | ||
| Requires: glimpse | ||
| Requires: gmake | ||
| Requires: gsl | ||
| Requires: highfive | ||
| Requires: hector | ||
| Requires: hepmc | ||
| Requires: heppdt | ||
| Requires: herwig | ||
| Requires: herwig7 | ||
| Requires: hydjet | ||
| Requires: ittnotify | ||
| Requires: jemalloc | ||
| Requires: jemalloc-debug | ||
| Requires: jimmy | ||
| Requires: json | ||
| Requires: ktjet | ||
| Requires: lhapdf | ||
| Requires: libjpeg-turbo | ||
| Requires: libpng | ||
| Requires: libtiff | ||
| Requires: libungif | ||
| Requires: libxml2 | ||
| Requires: lwtnn | ||
| Requires: meschach | ||
| Requires: pcre | ||
| Requires: photos | ||
| Requires: photospp | ||
| Requires: pyquen | ||
| Requires: pythia6 | ||
| Requires: pythia8 | ||
| Requires: python | ||
| Requires: python3 | ||
| Requires: root | ||
| Requires: sherpa | ||
| Requires: libpciaccess | ||
| Requires: numactl | ||
| Requires: hwloc | ||
| %ifnarch aarch64 | ||
| Requires: gdrcopy-toolfile | ||
| Requires: gdrcopy | ||
| %endif | ||
| Requires: ucx-toolfile | ||
| Requires: openmpi-toolfile | ||
| Requires: sigcpp-toolfile | ||
| Requires: sqlite-toolfile | ||
| Requires: ucx | ||
| Requires: openmpi | ||
| Requires: sigcpp | ||
| Requires: sqlite | ||
| Requires: systemtools | ||
| Requires: tauola-toolfile | ||
| Requires: tauolapp-toolfile | ||
| Requires: thepeg-toolfile | ||
| Requires: toprex-toolfile | ||
| Requires: libuuid-toolfile | ||
| Requires: xerces-c-toolfile | ||
| Requires: zlib-toolfile | ||
| Requires: dcap-toolfile | ||
| Requires: frontier_client-toolfile | ||
| Requires: xrootd-toolfile | ||
| Requires: dd4hep-toolfile | ||
| Requires: graphviz-toolfile | ||
| Requires: valgrind-toolfile | ||
| Requires: cmsswdata-toolfile | ||
| Requires: zstd-toolfile | ||
| Requires: hls-toolfile | ||
| Requires: opencv-toolfile | ||
| Requires: grpc-toolfile | ||
| Requires: onnxruntime-toolfile | ||
| Requires: triton-inference-server-toolfile | ||
| Requires: hdf5-toolfile | ||
| Requires: rivet-toolfile | ||
| Requires: cascade-toolfile | ||
| Requires: yoda-toolfile | ||
| Requires: fftw3-toolfile | ||
| Requires: fftjet-toolfile | ||
| Requires: professor2-toolfile | ||
| Requires: xz-toolfile | ||
| Requires: lz4-toolfile | ||
| Requires: protobuf-toolfile | ||
| Requires: lcov-toolfile | ||
| Requires: llvm-gcc-toolfile | ||
| Requires: tbb-toolfile | ||
| Requires: mctester-toolfile | ||
| Requires: vdt-toolfile | ||
| Requires: icc-gcc-toolfile | ||
| Requires: gnuplot-toolfile | ||
| Requires: sloccount-toolfile | ||
| Requires: millepede-toolfile | ||
| Requires: pacparser-toolfile | ||
| Requires: git-toolfile | ||
| Requires: cgal-toolfile | ||
| Requires: doxygen-toolfile | ||
| Requires: yaml-cpp-toolfile | ||
| Requires: gmp-static-toolfile | ||
| Requires: mpfr-static-toolfile | ||
| Requires: fastjet-contrib-toolfile | ||
| Requires: opencl-toolfile | ||
| Requires: opencl-cpp-toolfile | ||
| Requires: qd-toolfile | ||
| Requires: blackhat-toolfile | ||
| Requires: sherpa-toolfile | ||
| Requires: geant4-parfullcms-toolfile | ||
| Requires: tauola | ||
| Requires: tauolapp | ||
| Requires: thepeg | ||
| Requires: toprex | ||
| Requires: libuuid | ||
| Requires: xerces-c | ||
| Requires: zlib | ||
| Requires: dcap | ||
| Requires: frontier_client | ||
| Requires: xrootd | ||
| Requires: dd4hep | ||
| Requires: graphviz | ||
| Requires: valgrind | ||
| Requires: cmsswdata | ||
| Requires: zstd | ||
| Requires: hls | ||
| Requires: opencv | ||
| Requires: grpc | ||
| Requires: onnxruntime | ||
| Requires: triton-inference-server | ||
| Requires: hdf5 | ||
| Requires: rivet | ||
| Requires: cascade | ||
| Requires: yoda | ||
| Requires: fftw3 | ||
| Requires: fftjet | ||
| Requires: professor2 | ||
| Requires: xz | ||
| Requires: lz4 | ||
| Requires: protobuf | ||
| Requires: lcov | ||
| Requires: llvm | ||
| Requires: tbb | ||
| Requires: mctester | ||
| Requires: vdt | ||
| Requires: icc | ||
| Requires: gnuplot | ||
| Requires: sloccount | ||
| Requires: millepede | ||
| Requires: pacparser | ||
| Requires: git | ||
| Requires: cgal | ||
| Requires: doxygen | ||
| Requires: yaml-cpp | ||
| Requires: gmp-static | ||
| Requires: mpfr-static | ||
| Requires: fastjet-contrib | ||
| Requires: opencl | ||
| Requires: opencl-cpp | ||
| Requires: qd | ||
| Requires: blackhat | ||
| Requires: sherpa | ||
| Requires: geant4-parfullcms | ||
| Requires: fasthadd | ||
| Requires: eigen-toolfile | ||
| Requires: gdb-toolfile | ||
| Requires: libxslt-toolfile | ||
| Requires: giflib-toolfile | ||
| Requires: freetype-toolfile | ||
| Requires: utm-toolfile | ||
| Requires: libffi-toolfile | ||
| Requires: CSCTrackFinderEmulation-toolfile | ||
| Requires: tinyxml2-toolfile | ||
| Requires: md5-toolfile | ||
| Requires: gosamcontrib-toolfile | ||
| Requires: gosam-toolfile | ||
| Requires: madgraph5amcatnlo-toolfile | ||
| Requires: eigen | ||
| Requires: gdb | ||
| Requires: libxslt | ||
| Requires: giflib | ||
| Requires: freetype | ||
| Requires: utm | ||
| Requires: libffi | ||
| Requires: CSCTrackFinderEmulation | ||
| Requires: tinyxml2 | ||
| Requires: md5 | ||
| Requires: gosamcontrib | ||
| Requires: gosam | ||
| Requires: madgraph5amcatnlo | ||
| Requires: python_tools | ||
| Requires: dasgoclient | ||
| Requires: OpenBLAS-toolfile | ||
| Requires: mxnet-predict-toolfile | ||
| Requires: mkfit-toolfile | ||
| Requires: dablooms-toolfile | ||
| Requires: OpenBLAS | ||
| Requires: mxnet-predict | ||
| Requires: mkfit | ||
| Requires: dablooms | ||
|
|
||
| # Only for Linux platform. | ||
| %ifos linux | ||
| Requires: openldap-toolfile | ||
| Requires: gperftools-toolfile | ||
| Requires: cuda-toolfile | ||
| Requires: alpaka-toolfile | ||
| Requires: cupla-toolfile | ||
| Requires: openldap | ||
| Requires: gperftools | ||
| Requires: cuda | ||
| Requires: alpaka | ||
| Requires: cupla | ||
|
|
||
| %if "%{cmsos}" != "slc7_aarch64" | ||
| Requires: cudnn-toolfile | ||
| Requires: cudnn | ||
| %endif | ||
|
|
||
| Requires: libunwind-toolfile | ||
| Requires: libunwind | ||
| %ifnarch ppc64le | ||
| Requires: igprof-toolfile | ||
| Requires: openloops-toolfile | ||
| Requires: igprof | ||
| Requires: openloops | ||
| %endif | ||
|
|
||
| %ifarch x86_64 | ||
| Requires: dmtcp-toolfile | ||
| Requires: tkonlinesw-toolfile | ||
| Requires: oracle-toolfile | ||
| Requires: dmtcp | ||
| Requires: tkonlinesw | ||
| Requires: oracle | ||
| Requires: intel-vtune | ||
| Requires: cmsmon-tools | ||
| Requires: dip-toolfile | ||
| Requires: dip | ||
| %else | ||
| Requires: tkonlinesw-fake-toolfile | ||
| Requires: oracle-fake-toolfile | ||
| Requires: tkonlinesw-fake | ||
| Requires: oracle-fake | ||
| %endif | ||
| %endif | ||
|
|
||
| Requires: tensorflow-toolfile | ||
| Requires: xtensor-toolfile | ||
| Requires: xtl-toolfile | ||
| Requires: xgboost-toolfile | ||
| Requires: tensorflow | ||
| Requires: xtensor | ||
| Requires: xtl | ||
| Requires: xgboost | ||
|
|
||
| %define skipreqtools jcompiler icc-cxxcompiler icc-ccompiler icc-f77compiler rivet2 opencl opencl-cpp nvidia-drivers intel-vtune jemalloc-debug | ||
|
|
||
| ## IMPORT scramv1-tool-conf | ||
| ## INCLUDE scramv1-tool-conf | ||
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.
@mrodozov , we need to keep the dependencies but should replace
<tool>-toolfilewith<tool>only.This should also be done for coral and fwlite tool-conf.spec
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.
this file is containing a short list because so I first finish pkgs with any script logic, the short list if for not deploying all xmls every time (not to build the whole cmssw-tool-conf)
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.
this type of changes are better to test locally as this will help with debugging.