From f48c2fb84795d2a60dc72626b94c339d19d21ce5 Mon Sep 17 00:00:00 2001 From: Oliver Lantwin Date: Fri, 6 Dec 2024 09:14:36 +0100 Subject: [PATCH 1/3] Update ROOT prefer system check --- defaults-release.sh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/defaults-release.sh b/defaults-release.sh index f19ec941..0dc5db07 100644 --- a/defaults-release.sh +++ b/defaults-release.sh @@ -31,18 +31,19 @@ overrides: which cc && test -f $(dirname $(which cc))/c++ && printf "#define GCCVER ((__GNUC__ << 16)+(__GNUC_MINOR__ << 8)+(__GNUC_PATCHLEVEL__))\n#if (GCCVER < 0x060000 || GCCVER > 0x100000)\n#error \"System's GCC cannot be used: we need GCC 6.X. We are going to compile our own version.\"\n#endif\n" | cc -xc++ - -c -o /dev/null ROOT: prefer_system_check: | - ls $ROOT_ROOT/bin > /dev/null && \ - ls $ROOT_ROOT/cmake > /dev/null && \ - ls $ROOT_ROOT/config > /dev/null && \ - ls $ROOT_ROOT/etc > /dev/null && \ - ls $ROOT_ROOT/fonts > /dev/null && \ - ls $ROOT_ROOT/geom > /dev/null && \ - ls $ROOT_ROOT/icons > /dev/null && \ - ls $ROOT_ROOT/include > /dev/null && \ - ls $ROOT_ROOT/lib > /dev/null && \ - ls $ROOT_ROOT/macros > /dev/null && \ - ls $ROOT_ROOT/man > /dev/null && \ - true + VERSION=$(root-config --version) + REQUESTED_VERSION=${REQUESTED_VERSION#v} + REQUESTED_VERSION=${REQUESTED_VERSION//-/.} + if [ $(printf "${VERSION}\n${REQUESTED_VERSION}" | sort -V | head -1) != "${VERSION}" ]; then + echo "ROOT version $VERSION sufficient" + else + echo "ROOT version $VERSION insufficient" + exit 1 + fi + FEATURES="builtin_pcre mathmore xml ssl opengl http gdml pythia8 roofit soversion vdt xrootd" + for FEATURE in $FEATURES; do + root-config --has-$FEATURE | grep -q yes || { echo "$FEATURE missing"; exit 1; } + done GSL: version: "v1.16%(defaults_upper)s" source: https://github.com/alisw/gsl From 7b978ad31f7b19001eaab39fcf31a33dd7781a5e Mon Sep 17 00:00:00 2001 From: Oliver Lantwin Date: Wed, 18 Dec 2024 16:15:36 +0100 Subject: [PATCH 2/3] WIP: Changes for lcg --- defaults-release.sh | 130 +++++++++++++++++++++++++++++--------------- fmt.sh | 14 +++++ xrootd.sh | 15 +++++ 3 files changed, 114 insertions(+), 45 deletions(-) diff --git a/defaults-release.sh b/defaults-release.sh index 0dc5db07..c7b8b2b4 100644 --- a/defaults-release.sh +++ b/defaults-release.sh @@ -86,14 +86,20 @@ overrides: tag: v10.7.3 source: https://github.com/geant4/geant4.git prefer_system_check: | - ls $GEANT4_ROOT/bin > /dev/null && \ - ls $GEANT4_ROOT/bin/geant4-config > /dev/null && \ - ls $GEANT4_ROOT/bin/geant4.csh > /dev/null && \ - ls $GEANT4_ROOT/bin/geant4.sh > /dev/null && \ - ls $GEANT4_ROOT/include > /dev/null && \ - ls $GEANT4_ROOT/include/Geant4 > /dev/null && \ - ls $GEANT4_ROOT/lib/ > /dev/null && \ - true + VERSION=$(geant4-config --version) + REQUESTED_VERSION=${REQUESTED_VERSION#v} + verlte() { + printf '%s\n' "$1" "$2" | sort -C -V + } + verlt() { + ! verlte "$2" "$1" + } + if ! verlt $VERSION $REQUESTED_VERSION; then + echo "GEANT4 version $VERSION sufficient" + else + echo "GEANT4 version $VERSION insufficient" + exit 1 + fi requires: - "GCC-Toolchain:(?!osx)" - opengl @@ -150,10 +156,19 @@ overrides: apfel: tag: 3.0.6 prefer_system_check: | - ls $APFEL_ROOT/bin > /dev/null && \ - ls $APFEL_ROOT/lib > /dev/null && \ - ls $APFEL_ROOT/include > /dev/null && \ - true + VERSION=$(apfel-config --version) + verlte() { + printf '%s\n' "$1" "$2" | sort -C -V + } + verlt() { + ! verlte "$2" "$1" + } + if ! verlt $VERSION $REQUESTED_VERSION; then + echo "apfel version $VERSION sufficient" + else + echo "apfel version $VERSION insufficient" + exit 1 + fi pythia: version: "%(tag_basename)s" source: https://github.com/ShipSoft/pythia8 @@ -163,15 +178,22 @@ overrides: - HepMC - boost prefer_system_check: | - ls $PYTHIA_ROOT/bin > /dev/null && \ - ls $PYTHIA_ROOT/bin/pythia8-config > /dev/null && \ - ls $PYTHIA_ROOT/include/ > /dev/null && \ - ls $PYTHIA_ROOT/include/Pythia8 > /dev/null && \ - ls $PYTHIA_ROOT/include/Pythia8Plugins > /dev/null && \ - ls $PYTHIA_ROOT/lib/libpythia8.a > /dev/null && \ - ls $PYTHIA_ROOT/lib/libpythia8lhapdf6.so > /dev/null && \ - ls $PYTHIA_ROOT/lib/libpythia8.so > /dev/null && \ - true + VERSION=$(pythia8-config --version) + REQUESTED_VERSION=${REQUESTED_VERSION#v} + VERSION=${VERSION//.} + verlte() { + printf '%s\n' "$1" "$2" | sort -C -V + } + verlt() { + ! verlte "$2" "$1" + } + if ! verlt $VERSION $REQUESTED_VERSION; then + echo "pythia8 version $VERSION sufficient" + else + echo "pythia8 version $VERSION insufficient" + exit 1 + fi + pythia8-config --with-lhapdf6 || { echo "lhapdf6 support missing."; exit 1; } vgm: version: "%(tag_basename)s" tag: "4.4" @@ -227,12 +249,20 @@ overrides: grep "2.06" $HEPMC_ROOT/include/HepMC/HepMCDefs.h > /dev/null lhapdf: prefer_system_check: | - ls $LHAPDF_ROOT/ > /dev/null && \ - ls $LHAPDF_ROOT/bin > /dev/null && \ - ls $LHAPDF_ROOT/include > /dev/null && \ - ls $LHAPDF_ROOT/include/LHAPDF > /dev/null && \ - ls $LHAPDF_ROOT/lib > /dev/null && \ - ls $LHAPDF_ROOT/share/LHAPDF > /dev/null + VERSION=$(lhapdf-config --version) + REQUESTED_VERSION=${REQUESTED_VERSION#lhapdf-} + verlte() { + printf '%s\n' "$1" "$2" | sort -C -V + } + verlt() { + ! verlte "$2" "$1" + } + if ! verlt $VERSION $REQUESTED_VERSION; then + echo "lhapdf version $VERSION sufficient" + else + echo "lhapdf version $VERSION insufficient" + exit 1 + fi lhapdf5: prefer_system_check: | ls $LHAPDF5_ROOT/ > /dev/null && \ @@ -264,26 +294,36 @@ overrides: ls $VGM_ROOT/lib/libXmlVGM.a > /dev/null XercesC: prefer_system_check: | - ls $XERCESC_ROOT/ > /dev/null && \ - ls $XERCESC_ROOT/bin > /dev/null && \ - ls $XERCESC_ROOT/include > /dev/null && \ - ls $XERCESC_ROOT/include/xercesc/ > /dev/null && \ - ls $XERCESC_ROOT/lib > /dev/null && \ - ls $XERCESC_ROOT/lib/libxerces-c-3.1.so > /dev/null && \ - ls $XERCESC_ROOT/lib/libxerces-c.a > /dev/null && \ - ls $XERCESC_ROOT/lib/libxerces-c.la > /dev/null && \ - ls $XERCESC_ROOT/lib/libxerces-c.so > /dev/null + VERSION=$(pkg-config xerces-c --modversion) + REQUESTED_VERSION=${REQUESTED_VERSION#v} + verlte() { + printf '%s\n' "$1" "$2" | sort -C -V + } + verlt() { + ! verlte "$2" "$1" + } + if ! verlt $VERSION $REQUESTED_VERSION; then + echo "xerces-c version $VERSION sufficient" + else + echo "xerces-c version $VERSION insufficient" + exit 1 + fi googletest: prefer_system_check: | - ls $GOOGLETEST_ROOT/ > /dev/null && \ - ls $GOOGLETEST_ROOT/include > /dev/null && \ - ls $GOOGLETEST_ROOT/include/gmock > /dev/null && \ - ls $GOOGLETEST_ROOT/include/gtest > /dev/null && \ - ls $GOOGLETEST_ROOT/lib/libgmock.a > /dev/null && \ - ls $GOOGLETEST_ROOT/lib/libgmock_main.a > /dev/null && \ - ls $GOOGLETEST_ROOT/lib/libgtest.a > /dev/null && \ - ls $GOOGLETEST_ROOT/lib/libgtest_main.a > /dev/null && \ - true + VERSION=$(pkg-config gtest --modversion) + REQUESTED_VERSION=${REQUESTED_VERSION#v} + verlte() { + printf '%s\n' "$1" "$2" | sort -C -V + } + verlt() { + ! verlte "$2" "$1" + } + if ! verlt $VERSION $REQUESTED_VERSION; then + echo "googletest version $VERSION sufficient" + else + echo "googletest version $VERSION insufficient" + exit 1 + fi --- # This file is included in any build recipe and it's only used to set # environment variables. Which file to actually include can be defined by the diff --git a/fmt.sh b/fmt.sh index dd02d864..84130fd9 100644 --- a/fmt.sh +++ b/fmt.sh @@ -8,6 +8,20 @@ build_requires: - CMake prepend_path: ROOT_INCLUDE_PATH: "$FMT_ROOT/include" +prefer_system_check: | + VERSION=$(pkg-config fmt --modversion) + verlte() { + printf '%s\n' "$1" "$2" | sort -C -V + } + verlt() { + ! verlte "$2" "$1" + } + if ! verlt $VERSION $REQUESTED_VERSION; then + echo "fmt version $VERSION sufficient" + else + echo "fmt version $VERSION insufficient" + exit 1 + fi --- #!/bin/bash -e cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT -DFMT_TEST=OFF diff --git a/xrootd.sh b/xrootd.sh index ca89ebb9..619a2749 100644 --- a/xrootd.sh +++ b/xrootd.sh @@ -15,6 +15,21 @@ build_requires: - alibuild-recipe-tools prepend_path: PYTHONPATH: "${XROOTD_ROOT}/lib/python/site-packages" +prefer_system_check: | + VERSION=$(xrootd-config --version) + REQUESTED_VERSION=${REQUESTED_VERSION#v} + verlte() { + printf '%s\n' "$1" "$2" | sort -C -V + } + verlt() { + ! verlte "$2" "$1" + } + if ! verlt $VERSION $REQUESTED_VERSION; then + echo "XRootD version $VERSION sufficient" + else + echo "XRootD version $VERSION insufficient" + exit 1 + fi --- #!/bin/bash -e From b2cbbfa346b2060037c870f428cc0254156cbc03 Mon Sep 17 00:00:00 2001 From: Mark E Smith Date: Fri, 29 Aug 2025 12:02:38 +0200 Subject: [PATCH 3/3] Changes for LCG105 --- cgal.sh | 1 - configuration.sh | 1 - curl.sh | 35 ++++++++++++++++++------ defaults-release.sh | 30 ++++++++++---------- dim.sh | 1 - evtgen.sh | 19 +++++++++---- fairlogger.sh | 2 +- fairmq.sh | 4 +-- fairship.sh | 10 ++++--- freetype.sh | 1 - geant4_vmc.sh | 2 +- genie.sh | 13 +++++---- glog.sh | 2 +- hepmc.sh | 2 +- igprof-packaging.sh | 8 +++--- lhapdf.sh | 2 +- monitoring.sh | 1 - pythia.sh | 4 +-- python-modules-list.sh | 62 ++++++++++++++++++++++++++++-------------- python-modules.sh | 3 +- python.sh | 1 - sherpa.sh | 1 - sqlite.sh | 1 - tauolapp.sh | 2 +- vgm.sh | 10 +++++-- vmc.sh | 2 +- xrootd.sh | 4 +-- 27 files changed, 135 insertions(+), 89 deletions(-) diff --git a/cgal.sh b/cgal.sh index 16d70d65..4170d396 100644 --- a/cgal.sh +++ b/cgal.sh @@ -6,7 +6,6 @@ build_requires: - GMP - MPFR - CMake - - curl --- #!/bin/bash -e case $ARCHITECTURE in diff --git a/configuration.sh b/configuration.sh index 1be4f9f9..28b88ecd 100644 --- a/configuration.sh +++ b/configuration.sh @@ -1,6 +1,5 @@ package: Configuration requires: - - curl - boost - "GCC-Toolchain:(?!osx)" - protobuf diff --git a/curl.sh b/curl.sh index adf6fb01..3ea0f643 100644 --- a/curl.sh +++ b/curl.sh @@ -1,10 +1,29 @@ package: curl -version: "1.0" -system_requirement_missing: | - curl and its development package are missing from your system. - * RHEL-compatible systems: you will probably need "curl" and "curl-devel" packages. - * Ubuntu-compatible systems: you will probably need "curl" and "libcurl4-openssl-dev" (or "libcurl4-gnutls-dev"). -system_requirement: ".*" -system_requirement_check: | - curl --version > /dev/null; if test $? = 127; then exit 1; else printf "#include \nint main() {}\n" | cc -xc -lcurl - -o /dev/null || exit 2; fi; exit 0 +version: "7.76.1" +tag: curl-7_76_1 +source: https://github.com/curl/curl.git +build_requires: + - "OpenSSL:(?!osx)" + - alibuild-recipe-tools --- +#!/bin/bash -e + +if [[ $ARCHITECTURE = osx* ]]; then + OPENSSL_ROOT=$(brew --prefix openssl@3) +else + ${OPENSSL_ROOT:+env LDFLAGS=-Wl,-R$OPENSSL_ROOT/lib} +fi +rsync -a --chmod=ug=rwX --delete --exclude="**/.git" --delete-excluded $SOURCEDIR/ . + +sed -i.deleteme 's/CPPFLAGS="$CPPFLAGS $SSL_CPPFLAGS"/CPPFLAGS="$SSL_CPPFLAGS $CPPFLAGS"/' configure.ac +sed -i.deleteme 's/LDFLAGS="$LDFLAGS $SSL_LDFLAGS"/LDFLAGS="$SSL_LDFLAGS $LDFLAGS"/' configure.ac + +./buildconf +./configure --prefix=$INSTALLROOT --disable-ldap ${OPENSSL_ROOT:+--with-ssl=$OPENSSL_ROOT} --disable-static +make ${JOBS:+-j$JOBS} +make install + +# Modulefile +mkdir -p etc/modulefiles +alibuild-generate-module --bin --lib > etc/modulefiles/$PKGNAME +mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles diff --git a/defaults-release.sh b/defaults-release.sh index c7b8b2b4..7a5f5b04 100644 --- a/defaults-release.sh +++ b/defaults-release.sh @@ -19,7 +19,7 @@ overrides: tag: "v1.70.0" requires: - "GCC-Toolchain:(?!osx)" - - Python + - Pytho64n prefer_system_check: | printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106400)\n#error \"Cannot use system's boost. Boost > 1.64.00 required.\"\n#endif\nint main(){}" \ | gcc -I$BOOST_ROOT/include -xc++ - -o /dev/null @@ -34,13 +34,13 @@ overrides: VERSION=$(root-config --version) REQUESTED_VERSION=${REQUESTED_VERSION#v} REQUESTED_VERSION=${REQUESTED_VERSION//-/.} - if [ $(printf "${VERSION}\n${REQUESTED_VERSION}" | sort -V | head -1) != "${VERSION}" ]; then + if [ "$(printf '%s\n' "$REQUESTED_VERSION" "VERSION" | sort -V | head -n1)" = "$REQUESTED_VERSION" ]; then echo "ROOT version $VERSION sufficient" else echo "ROOT version $VERSION insufficient" exit 1 fi - FEATURES="builtin_pcre mathmore xml ssl opengl http gdml pythia8 roofit soversion vdt xrootd" + FEATURES="builtin_pcre mathmore xml ssl opengl http gdml roofit vdt xrootd pythia6" for FEATURE in $FEATURES; do root-config --has-$FEATURE | grep -q yes || { echo "$FEATURE missing"; exit 1; } done @@ -65,17 +65,17 @@ overrides: ls $FAIRROOT_ROOT/ > /dev/null && \ ls $FAIRROOT_ROOT/lib > /dev/null && \ ls $FAIRROOT_ROOT/include > /dev/null && \ - grep v18.6.10 $FAIRROOT_ROOT/include/FairVersion.h + grep v19.0.0 $FAIRROOT_ROOT/include/FairVersion.h FairMQ: version: "%(tag_basename)s" - tag: "v1.4.38" + tag: "v1.10.0" prefer_system_check: | ls $FAIRMQ_ROOT/ > /dev/null && \ ls $FAIRMQ_ROOT/lib > /dev/null && \ ls $FAIRMQ_ROOT/include > /dev/null && \ FairLogger: version: "%(tag_basename)s" - tag: "v1.9.0" + tag: "v2.2.0" prefer_system_check: | ls $FAIRLOGGER_ROOT/ > /dev/null && \ ls $FAIRLOGGER_ROOT/lib > /dev/null && \ @@ -121,7 +121,7 @@ overrides: G4SAIDXSDATA : "`find ${G4INSTALL} $G4DATASEARCHOPT '*data*G4SAIDDATA*'`" GEANT4_VMC: version: "%(tag_basename)s" - tag: v5-4 + tag: v6-6-p3 prefer_system_check: | ls $GEANT4_VMC_ROOT/bin > /dev/null && \ ls $GEANT4_VMC_ROOT/lib/libg4root.so > /dev/null && \ @@ -133,7 +133,7 @@ overrides: true VMC: version: "%(tag_basename)s" - tag: v1-1-p1 + tag: v2-0 prefer_system_check: | ls $VMC_ROOT/include > /dev/null && \ true @@ -199,13 +199,13 @@ overrides: tag: "4.4" evtGen: version: "%(tag_basename)s" - source: https://github.com/ShipSoft/evtgen - tag: R01-06-00-ship + source: https://github.com/alisw/EVTGEN # https://github.com/ShipSoft/evtgen + tag: R02-02-00-alice2 prefer_system_check: | ls $EVTGEN_ROOT/include > /dev/null && \ - ls $EVTGEN_ROOT/lib > /dev/null && \ - ls $EVTGEN_ROOT/lib/libEvtGenExternal.so > /dev/null && \ - ls $EVTGEN_ROOT/lib/libEvtGen.so > /dev/null && \ + ls $EVTGEN_ROOT/lib64 > /dev/null && \ + ls $EVTGEN_ROOT/lib64/libEvtGenExternal.so > /dev/null && \ + ls $EVTGEN_ROOT/lib64/libEvtGen.so > /dev/null && \ ls $EVTGEN_ROOT/include/EvtGen > /dev/null && \ ls $EVTGEN_ROOT/include/EvtGenBase > /dev/null && \ ls $EVTGEN_ROOT/include/EvtGenExternal > /dev/null && \ @@ -217,12 +217,12 @@ overrides: ls $PHOTOSPP_ROOT/lib > /dev/null && \ ls $PHOTOSPP_ROOT/lib/libPhotospp.a > /dev/null && \ ls $PHOTOSPP_ROOT/lib/libPhotosppHEPEVT.so > /dev/null && \ - ls $PHOTOSPP_ROOT/lib/libPhotosppHepMC.so > /dev/null && \ + ls $PHOTOSPP_ROOT/lib/libPhotosppHepMC3.so > /dev/null && \ ls $PHOTOSPP_ROOT/lib/libPhotospp.so > /dev/null Tauolapp: version: "%(tag_basename)s" source: https://github.com/ShipSoft/Tauolapp - tag: v1.1.5-ship + tag: 1.1.8.atlas1 prefer_system_check: | ls "$TAUOLAPP_ROOT"/lib > /dev/null && \ ls "$TAUOLAPP_ROOT"/etc > /dev/null && \ diff --git a/dim.sh b/dim.sh index d2df50e0..2464896c 100644 --- a/dim.sh +++ b/dim.sh @@ -1,7 +1,6 @@ package: dim version: "v20r20" build_requires: - - curl - "GCC-Toolchain:(?!osx)" - motif --- diff --git a/evtgen.sh b/evtgen.sh index 0927e3f1..6671402d 100644 --- a/evtgen.sh +++ b/evtgen.sh @@ -1,7 +1,7 @@ package: EvtGen version: "%(tag_basename)s-ship%(defaults_upper)s" -source: https://github.com/ShipSoft/evtgen -tag: fairshipdev +source: https://github.com/alisw/EVTGEN/ # https://github.com/ShipSoft/evtgen +tag: R02-02-00-alice2 requires: - HepMC - pythia @@ -16,10 +16,17 @@ export HEPMCLOCATION="$HEPMC_ROOT" rsync -a $SOURCEDIR/* . -./configure --hepmcdir=$HEPMC_ROOT --pythiadir=$PYTHIA_ROOT --tauoladir=$TAUOLAPP_ROOT --photosdir=$PHOTOSPP_ROOT --prefix=$INSTALLROOT CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" - -make -make install +cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DEVTGEN_HEPMC3=OFF \ + -DHEPMC2_ROOT_DIR=$HEPMC_ROOT \ + -DEVTGEN_PYTHIA=ON \ + -DPYTHIA8_ROOT_DIR=$PYTHIA_ROOT \ + -DEVTGEN_PHOTOS=ON \ + -DPHOTOSPP_ROOT_DIR=$PHOTOS_ROOT \ + -DEVTGEN_TAUOLA=ON \ + -DTAUOLAPP_ROOT_DIR=$TAUOLA_ROOT +make ${JOBS:+-j$JOBS} install # Modulefile MODULEDIR="$INSTALLROOT/etc/modulefiles" diff --git a/fairlogger.sh b/fairlogger.sh index 4e88261b..1469d3aa 100644 --- a/fairlogger.sh +++ b/fairlogger.sh @@ -1,6 +1,6 @@ package: FairLogger version: "%(tag_basename)s" -tag: v1.9.0 +tag: v2.2.0 source: https://github.com/FairRootGroup/FairLogger requires: - fmt diff --git a/fairmq.sh b/fairmq.sh index 0987fcb1..b7331db2 100644 --- a/fairmq.sh +++ b/fairmq.sh @@ -1,6 +1,6 @@ package: FairMQ version: "%(tag_basename)s" -tag: v1.4.49 +tag: v1.10.0 source: https://github.com/FairRootGroup/FairMQ requires: - boost @@ -31,7 +31,7 @@ case $ARCHITECTURE in ;; *) BUILD_OFI=ON - if [[ $(printf '%s\n' "1.4.2" "${PKGVERSION:1}" | sort -V | head -n1) != "1.4.2" ]]; then + if [[ $(printf '%s\n' "1.10.0" "${PKGVERSION:1}" | sort -V | head -n1) != "1.10.0" ]]; then BUILD_OFI=OFF fi ;; diff --git a/fairship.sh b/fairship.sh index f4328635..67b1d1c9 100644 --- a/fairship.sh +++ b/fairship.sh @@ -7,9 +7,11 @@ requires: - simulation - FairRoot - FairLogger + - apfel - GENIE - GenFit - GEANT4 + - vgm - PHOTOSPP - EvtGen - ROOT @@ -100,13 +102,13 @@ cmake $SOURCEDIR \ -DHEPMC_DIR=$HEPMC_ROOT \ -DHEPMC_INCLUDE_DIR=$HEPMC_ROOT/include/HepMC \ -DEVTGEN_INCLUDE_DIR=$EVTGEN_ROOT/include \ - -DEVTGEN_LIBRARY_DIR=$EVTGEN_ROOT/lib \ + -DEVTGEN_LIBRARY_DIR=$EVTGEN_ROOT/lib64 \ ${PYTHON_ROOT:+-DPYTHON_LIBRARY=$PYTHON_ROOT/lib} \ ${PYTHON_ROOT:+-DPYTHON_INCLUDE_DIR=$PYTHON_ROOT/include/python3.6m/} \ -DPYTHIA8_DIR=$PYTHIA_ROOT \ -DPYTHIA8_INCLUDE_DIR=$PYTHIA_ROOT/include \ - -DGEANT4_ROOT=$GEANT4_ROOT \ - -DGEANT4_INCLUDE_DIR=$GEANT4_ROOT/include/Geant4 \ + -DGEANT4_ROOT=$Geant4_DIR \ + -DGEANT4_INCLUDE_DIR=$Geant4_INC_DIR/Geant4 \ -DGEANT4_VMC_INCLUDE_DIR=$GEANT4_VMC_ROOT/include/geant4vmc \ ${CMAKE_VERBOSE_MAKEFILE:+-DCMAKE_VERBOSE_MAKEFILE=ON} \ ${BOOST_ROOT:+-DBOOST_ROOT=$BOOST_ROOT} \ @@ -156,7 +158,7 @@ prepend-path ROOT_INCLUDE_PATH \$::env(FAIRSHIP_ROOT)/include append-path ROOT_INCLUDE_PATH \$::env(GEANT4_ROOT)/include append-path ROOT_INCLUDE_PATH \$::env(GEANT4_ROOT)/include/Geant4 append-path ROOT_INCLUDE_PATH \$::env(PYTHIA_ROOT)/include -append-path ROOT_INCLUDE_PATH \$::env(PYTHIA_ROOT)/include/Pythia8 +append-path ROOT_INCLUDE_PATH \$::env(PYTHIA_ROOT)/include/Pythia8Plugins append-path ROOT_INCLUDE_PATH \$::env(GEANT4_VMC_ROOT)/include append-path ROOT_INCLUDE_PATH \$::env(GEANT4_VMC_ROOT)/include/geant4vmc prepend-path PYTHONPATH \$::env(FAIRSHIP_ROOT)/python diff --git a/freetype.sh b/freetype.sh index 742bc2fa..2edaf7ef 100644 --- a/freetype.sh +++ b/freetype.sh @@ -4,7 +4,6 @@ requires: - AliEn-Runtime:(?!.*ppc64) build_requires: - autotools - - curl prefer_system: (?!slc5) prefer_system_check: | printf "#include \n" | c++ -xc++ - `freetype-config --cflags 2>/dev/null` `pkg-config freetype2 --cflags 2>/dev/null` -c -M 2>&1; diff --git a/geant4_vmc.sh b/geant4_vmc.sh index 5eaf8c60..db0b1d2a 100644 --- a/geant4_vmc.sh +++ b/geant4_vmc.sh @@ -1,6 +1,6 @@ package: GEANT4_VMC version: "%(tag_basename)s" -tag: "v5-4" +tag: "v6-6-p3" source: https://github.com/vmc-project/geant4_vmc requires: - ROOT diff --git a/genie.sh b/genie.sh index 5a928de7..e0a5599b 100644 --- a/genie.sh +++ b/genie.sh @@ -1,6 +1,6 @@ package: GENIE -version: v3.4.2 -tag: R-3_04_02 +version: v3.6.2 +tag: R-3_06_02 source: https://github.com/GENIE-MC/Generator.git requires: - GCC-Toolchain @@ -16,12 +16,13 @@ env: PATH: "$PATH:$GENIE_ROOT/genie/bin" LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$GENIE_ROOT/genie/lib" ROOT_INCLUDE_PATH: "$ROOT_INCLUDE_PATH:$GENIE_ROOT/genie/inc:$GENIE_ROOT/genie/src" ---- +--- #/bin/bash -ex export GENIE="$BUILDDIR" rsync -a $SOURCEDIR/* $BUILDDIR ls -alh $BUILDDIR +APFEL_ROOT=/vols/lhcb/masmith/SHiP/LCG_build/sw/rocky9_x86-64/apfel/3.0.6-local1/ $BUILDDIR/configure --prefix=$INSTALLROOT \ --enable-lhapdf6 \ --enable-apfel \ @@ -34,7 +35,7 @@ $BUILDDIR/configure --prefix=$INSTALLROOT \ --enable-rwght \ --enable-pyhia6 \ --enable-mathmore \ - --with-pythia6-lib=$PYTHIA6_ROOT/lib/ \ + --with-pythia6-lib=$PYTHIA6_ROOT/lib/ \ --with-lhapdf-lib=$LHAPDF_ROOT/lib/ \ --with-lhapdf-inc=$LHAPDF_ROOT/include/ \ --with-libxml2-lib=$LIBXML2_ROOT/lib/ \ @@ -42,7 +43,9 @@ $BUILDDIR/configure --prefix=$INSTALLROOT \ --with-log4cpp-inc=$LOG4CPP_ROOT/include/ \ --with-log4cpp-lib=$LOG4CPP_ROOT/lib/ \ --with-apfel-inc=$APFEL_ROOT/include/ \ - --with-apfel-lib=$APFEL_ROOT/lib/ + --with-apfel-lib=$APFEL_ROOT/lib/ \ + --with-lhapdf6-lib=$LHAPDF_ROOT/lib/ \ + --with-lhapdf6-inc=$LHAPDF_ROOT/include/ make CXXFLAGS="-Wall $CXXFLAGS" CFLAGS="-Wall $CFLAGS" diff --git a/glog.sh b/glog.sh index 7cd35e99..222e7726 100644 --- a/glog.sh +++ b/glog.sh @@ -4,7 +4,7 @@ source: https://github.com/google/glog build_requires: - autotools - "GCC-Toolchain:(?!osx)" ---- +--- rsync -av --delete --exclude="**/.git" $SOURCEDIR/ . autoreconf -ivf ./configure --prefix="$INSTALLROOT" diff --git a/hepmc.sh b/hepmc.sh index 2455260c..dc86290a 100644 --- a/hepmc.sh +++ b/hepmc.sh @@ -1,7 +1,7 @@ package: HepMC version: "%(tag_basename)s%(defaults_upper)s" source: https://github.com/alisw/hepmc -tag: alice/v2.06.09 +tag: 2.06.11 build_requires: - CMake - GCC-Toolchain:(?!osx.*) diff --git a/igprof-packaging.sh b/igprof-packaging.sh index 9a77df51..9f7b871f 100644 --- a/igprof-packaging.sh +++ b/igprof-packaging.sh @@ -14,21 +14,21 @@ tar xzf /sw/TARS/$ARCHITECTURE/libatomic_ops/libatomic_ops-$LIBATOMIC_OPS_VERSIO RPM_LIBATOMIC_OPS_VERSION=`echo $LIBATOMIC_OPS_VERSION | tr - _` case $ARCHITECTURE in - ubuntu*) + ubuntu*) RPM_LIBATOMIC_OPS_VERSION=$LIBATOMIC_OPS_VERSION RPM_LIBATOMIC_OPS_NAME=libatomic-ops - PACKAGE_FORMAT=deb + PACKAGE_FORMAT=deb ARCH_SEP=_ VERSION_SEP=_ RPM_ARCH=amd64 apt-get install -y python-requests ruby-dev gem install --no-ri --no-rdoc fpm ;; - *) + *) RPM_LIBATOMIC_OPS_VERSION=`echo $LIBATOMIC_OPS_VERSION | tr - _` RPM_LIBUNWIND_VERSION=`echo $LIBUNWIND_VERSION | tr - _` RPM_LIBATOMIC_OPS_NAME=libatomic_ops - PACKAGE_FORMAT=rpm + PACKAGE_FORMAT=rpm ARCH_SEP=. VERSION_SEP=- RPM_ARCH=x86_64 diff --git a/lhapdf.sh b/lhapdf.sh index 5e1e4fce..e5293b46 100644 --- a/lhapdf.sh +++ b/lhapdf.sh @@ -1,6 +1,6 @@ package: lhapdf version: "%(tag_basename)s%(defaults_upper)s" -tag: lhapdf-6.5.3-snd +tag: 6.5.3 source: https://github.com/SND-LHC/lhapdf requires: - Python-modules diff --git a/monitoring.sh b/monitoring.sh index 81a20267..9ef06ccf 100644 --- a/monitoring.sh +++ b/monitoring.sh @@ -1,7 +1,6 @@ package: Monitoring requires: - Configuration - - curl - boost - "GCC-Toolchain:(?!osx)" - ApMon-CPP diff --git a/pythia.sh b/pythia.sh index 995a3dd5..869d5a38 100644 --- a/pythia.sh +++ b/pythia.sh @@ -1,11 +1,11 @@ package: pythia version: "%(tag_basename)s%(defaults_upper)s" -source: https://github.com/alisw/pythia8 +source: https://gitlab.com/Pythia8/releases # https://github.com/alisw/pythia8 requires: - lhapdf - HepMC - boost -tag: v8223 +tag: v8310 env: PYTHIA8DATA: "$PYTHIA_ROOT/share/Pythia8/xmldoc" PYTHIA8: "$PYTHIA_ROOT" diff --git a/python-modules-list.sh b/python-modules-list.sh index 02959b51..2b7f5377 100644 --- a/python-modules-list.sh +++ b/python-modules-list.sh @@ -2,18 +2,18 @@ package: Python-modules-list version: "1.0" env: PIP_BASE_REQUIREMENTS: | - pip==21.3.1 - setuptools==59.6.0 + pip==23.3.1 + setuptools==57.1.0 wheel==0.37.1 PIP_REQUIREMENTS: | - requests==2.27.1 - ipykernel==5.1.0 - ipython==7.4.0 - ipywidgets==7.4.2 - metakernel==0.20.14 - mock==2.0.0 - notebook==5.7.8 - scons==4.1.0 + requests==2.31.0 + ipykernel==6.0.2 + ipython==7.25.0 + ipywidgets==7.6.3 + metakernel==0.24.2 + mock==3.0.5 + notebook==6.4.0 + scons==4.6.0 PIP36_REQUIREMENTS: | PyYAML==6.0.1 psutil==5.8.0 @@ -49,18 +49,18 @@ env: PIP39_REQUIREMENTS: | PyYAML==6.0.1 psutil==5.8.0 - uproot==4.1.0 - numpy==1.21.6 - scipy==1.7.3 - Cython==0.29.21 - seaborn==0.11.0 - scikit-learn==0.24.1 - sklearn-evaluation==0.5.2 - Keras==2.4.3 - xgboost==1.2.0 + uproot==4.3.7 + numpy==1.23.5 + scipy==1.11.3 + Cython==0.29.33 + seaborn==0.11.2 + scikit-learn==1.2.2 + sklearn-evaluation==0.12.2 + Keras==2.13.1 + xgboost==2.0.2 dryable==1.0.5 responses==0.10.6 - pandas==1.1.5 + pandas==1.5.3 future "PIP39_REQUIREMENTS_ubuntu2110_x86_64": | PyYAML==6.0.1 @@ -91,7 +91,7 @@ env: Cython==0.29.21 seaborn==0.11.0 scikit-learn==1.2.2 - sklearn-evaluation==0.12.0 + sklearn-evaluation==0.12.2 Keras==2.13.1 xgboost==1.7.5 dryable==1.0.5 @@ -127,6 +127,26 @@ env: dryable==1.0.5 responses==0.10.6 pandas==1.5.3 + PIP312_REQUIREMENTS: | + PyYAML==6.0.2 + psutil==5.9.8 + uproot==5.6.0 + numpy==2.1.3 + scipy==1.15.3 + Cython==3.0.12 + seaborn==0.13.2 + scikit-learn==1.5.2 + sklearn-evaluation==0.12.0 + Keras==3.7.0 + xgboost==2.1.3 + dryable==1.0.5 + responses==0.10.6 + pandas==2.2.3 + dask[array,dataframe,distributed]==2025.2.0 + dask_jobqueue==0.9.0 + + gnureadline + build_requires: - alibuild-recipe-tools --- diff --git a/python-modules.sh b/python-modules.sh index 4b7224d7..9ccd9d77 100644 --- a/python-modules.sh +++ b/python-modules.sh @@ -6,7 +6,6 @@ requires: - "FreeType:(?!osx)" - libpng build_requires: - - curl - Python-modules-list - alibuild-recipe-tools prepend_path: @@ -45,7 +44,7 @@ case $ARCHITECTURE in esac # Major.minor version of Python -pyver="$(python3 -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_version())')" +pyver="$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')" # These are the basic requirements needed for all installation and platform # and it should represent the common denominator (working) for all packages/platforms diff --git a/python.sh b/python.sh index 836d1bd8..a8d76375 100644 --- a/python.sh +++ b/python.sh @@ -10,7 +10,6 @@ requires: - "GCC-Toolchain:(?!osx)" - libffi build_requires: - - curl - alibuild-recipe-tools env: SSL_CERT_FILE: "$(export PATH=$PYTHON_ROOT/bin:$PATH; export LD_LIBRARY_PATH=$PYTHON_ROOT/lib:$LD_LIBRARY_PATH; python -c \"import certifi; print(certifi.where())\")" diff --git a/sherpa.sh b/sherpa.sh index c482a240..4cb0b955 100644 --- a/sherpa.sh +++ b/sherpa.sh @@ -3,7 +3,6 @@ version: "%(tag_basename)s%(defaults_upper)s" source: https://github.com/alisw/SHERPA tag: "alice/v2.1.1" build_requires: - - curl - autotools - GCC-Toolchain - HepMC diff --git a/sqlite.sh b/sqlite.sh index fd8dd960..7b17ff5d 100644 --- a/sqlite.sh +++ b/sqlite.sh @@ -7,7 +7,6 @@ prefer_system_check: | printf '#include \nint main(){}\n' | cc -xc - -lsqlite3 -o /dev/null; if [ $? -ne 0 ]; then printf "SQLite not found.\n * On RHEL-compatible systems you probably need: sqlite sqlite-devel\n * On Ubuntu-compatible systems you probably need: libsqlite3-0 libsqlite3-dev\n"; exit 1; fi build_requires: - - curl - autotools --- #!/bin/bash -ex diff --git a/tauolapp.sh b/tauolapp.sh index 714cd915..ef47751f 100644 --- a/tauolapp.sh +++ b/tauolapp.sh @@ -1,7 +1,7 @@ package: Tauolapp version: "%(tag_basename)s-ship%(defaults_upper)s" source: https://github.com/ShipSoft/Tauolapp -tag: v1.1.5 +tag: 1.1.8.atlas1 requires: - HepMC - ROOT diff --git a/vgm.sh b/vgm.sh index 094ee8ff..e19e8dd6 100644 --- a/vgm.sh +++ b/vgm.sh @@ -1,7 +1,7 @@ package: vgm version: "%(tag_basename)s%(defaults_upper)s" -tag: "4.3-alice1" -source: https://github.com/alisw/vgm.git +tag: "v5-3-1" +source: https://github.com/vmc-project/vgm.git requires: - ROOT - GEANT4 @@ -9,6 +9,7 @@ requires: build_requires: - CMake --- +Geant4_DIR=/cvmfs/sft.cern.ch/lcg/releases/Geant4/11.2.0-52c79/x86_64-el9-gcc12-opt/lib64/cmake/Geant4/ #!/bin/bash -e cmake "$SOURCEDIR" \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ @@ -16,8 +17,11 @@ cmake "$SOURCEDIR" \ -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \ -DWITH_EXAMPLES=OFF \ -DWITH_TEST=OFF \ - -DBUILD_SHARED_LIBS=OFF + -DBUILD_SHARED_LIBS=OFF \ + -DGeant4_DIR=/cvmfs/sft.cern.ch/lcg/releases/Geant4/11.2.0-52c79/x86_64-el9-gcc12-opt/lib64/cmake/Geant4/ \ + -DCLHEP_DIR=/cvmfs/sft.cern.ch/lcg/releases/clhep/2.4.7.1-b7a7d/x86_64-el9-gcc12-opt/ +Geant4_DIR=/cvmfs/sft.cern.ch/lcg/releases/Geant4/11.2.0-52c79/x86_64-el9-gcc12-opt/lib64/Geant4-11.2.0/Linux-g++/cmake/Geant4/ make ${JOBS+-j $JOBS} install # Modulefile diff --git a/vmc.sh b/vmc.sh index b95d8609..a9346c6f 100644 --- a/vmc.sh +++ b/vmc.sh @@ -1,6 +1,6 @@ package: VMC version: "%(tag_basename)s" -tag: "v1-1-p1" +tag: "v2-0" source: https://github.com/vmc-project/vmc requires: - ROOT diff --git a/xrootd.sh b/xrootd.sh index 619a2749..60c1f844 100644 --- a/xrootd.sh +++ b/xrootd.sh @@ -1,6 +1,6 @@ package: XRootD version: "%(tag_basename)s" -tag: "v5.7.1" +tag: "v5.6.3" source: https://github.com/xrootd/xrootd requires: - "OpenSSL:(?!osx)" @@ -14,7 +14,7 @@ build_requires: - UUID - alibuild-recipe-tools prepend_path: - PYTHONPATH: "${XROOTD_ROOT}/lib/python/site-packages" + PYTHONPATH: "${XROOTD_ROOT}/lib/python3.9/site-packages" prefer_system_check: | VERSION=$(xrootd-config --version) REQUESTED_VERSION=${REQUESTED_VERSION#v}