Merge 84a546b into sapling-pr-archive-ktf

bookkeeping-api.sh

@@ -1,6 +1,6 @@
 package: bookkeeping-api
-version: "v0.76.0"
-tag: "@aliceo2/bookkeeping@0.76.0"
+version: "v0.82.0"
+tag: "@aliceo2/bookkeeping@0.82.0"
 requires:
   - grpc
   - protobuf

coconut.sh

@@ -1,6 +1,6 @@
 package: coconut
 version: "%(tag_basename)s"
-tag: "v1.7.3"
+tag: "v1.8.2"
 build_requires:
   - golang
   - protobuf

control-core.sh

@@ -1,6 +1,6 @@
 package: Control-Core
 version: "%(tag_basename)s"
-tag: "v1.7.3"
+tag: "v1.8.2"
 build_requires:
   - "GCC-Toolchain:(?!osx)"
   - golang

control-occplugin.sh

@@ -1,6 +1,6 @@
 package: Control-OCCPlugin
 version: "%(tag_basename)s"
-tag: "v1.7.3"
+tag: "v1.8.2"
 requires:
   - FairMQ
   - FairLogger

control.sh

@@ -1,5 +1,5 @@
 package: Control
-version: "v1.7.3"
+version: "v1.8.2"
 requires:
   - Control-Core
   - Control-OCCPlugin

dds.sh

@@ -1,6 +1,6 @@
 package: DDS
 version: "%(tag_basename)s"
-tag: "3.7.23"
+tag: "3.8"
 source: https://github.com/FairRootGroup/DDS
 requires:
   - boost

defaults-ali.sh

@@ -0,0 +1,45 @@
+package: defaults-ali
+version: v1
+env:
+  CFLAGS: -fPIC -O2
+  CMAKE_BUILD_TYPE: RELWITHDEBINFO
+  CXXFLAGS: -fPIC -O2 -std=c++20
+  CXXSTD: '20'
+  ENABLE_VMC: 'ON'
+  GEANT4_BUILD_MULTITHREADED: 'OFF'
+  MACOSX_DEPLOYMENT_TARGET: '10.15'
+disable:
+  - mesos
+  - MySQL
+overrides:
+  AliPhysics:
+    version: '%(commit_hash)s_O2'
+  AliRoot:
+    version: '%(commit_hash)s_O2'
+    requires:
+      - ROOT
+      - DPMJET
+      - fastjet:(?!.*ppc64)
+      - GEANT3
+      - GEANT4_VMC
+      - Vc
+      - ZeroMQ
+      - JAliEn-ROOT
+  GCC-Toolchain:
+    version: v12.2.0-alice1
+    tag: v12.2.0-alice1
+  cgal:
+    version: 4.12.2
+  fastjet:
+    tag: v3.4.1_1.052-alice2
+  pythia:
+    tag: v8304-alice1
+    requires:
+      - lhapdf
+      - boost
+  ROOT:
+    tag: v6-30-05-alice1
+---
+# 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
+# "--defaults" option of alibuild.

geant4_vmc.sh

@@ -1,6 +1,6 @@
 package: GEANT4_VMC
 version: "%(tag_basename)s"
-tag: "v6-5"
+tag: "v6-6-p1"
 source: https://github.com/vmc-project/geant4_vmc
 requires:
   - ROOT

jalien-root.sh

@@ -1,18 +1,20 @@
 package: JAliEn-ROOT
 version: "%(tag_basename)s"
-tag: "0.7.7"
+tag: "0.7.10"
 source: https://gitlab.cern.ch/jalien/jalien-root.git
 requires:
   - ROOT
   - xjalienfs
   - XRootD
   - libwebsockets
+  - libuv
 build_requires:
   - json-c
   - CMake
   - "GCC-Toolchain:(?!osx)"
   - zlib
   - Alice-GRID-Utils
+  - alibuild-recipe-tools
 append_path:
   ROOT_PLUGIN_PATH: "$JALIEN_ROOT_ROOT/etc/plugins"
   ROOT_INCLUDE_PATH: "$JALIEN_ROOT_ROOT/include"
@@ -27,42 +29,36 @@ case $ARCHITECTURE in
   ;;
 esac
 
-rsync -a --exclude '**/.git' --delete $SOURCEDIR/ $BUILDDIR
-rsync -a $ALICE_GRID_UTILS_ROOT/include/ $BUILDDIR/inc
+# This is needed to support old version which did not have FindAliceGridUtils.cmake
+ALIBUILD_CMAKE_BUILD_DIR=$SOURCEDIR
+if [ ! -f $JALIEN_ROOT_ROOT/cmake/modules/FindAliceGridUtils.cmake ]; then
+  ALIBUILD_CMAKE_BUILD_DIR=$BUILDDIR
+  rsync -a --exclude '**/.git' --delete $SOURCEDIR/ $BUILDDIR
+  rsync -a $ALICE_GRID_UTILS_ROOT/include/ $BUILDDIR/inc
+fi
 
-cmake $BUILDDIR                                          \
+cmake $ALIBUILD_CMAKE_BUILD_DIR                          \
+      -G Ninja                                           \
+      -DCMAKE_BUILD_TYPE=Debug                           \
       -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"              \
       ${CXXSTD:+-DCMAKE_CXX_STANDARD=${CXXSTD}}          \
       -DROOTSYS="$ROOTSYS"                               \
       -DJSONC="$JSON_C_ROOT"                             \
+      -DALICE_GRID_UTILS_ROOT="$ALICE_GRID_UTILS_ROOT"   \
        ${OPENSSL_ROOT:+-DOPENSSL_ROOT_DIR=$OPENSSL_ROOT} \
        ${OPENSSL_ROOT:+-DOPENSSL_INCLUDE_DIRS=$OPENSSL_ROOT/include} \
        ${OPENSSL_ROOT:+-DOPENSSL_LIBRARIES=$OPENSSL_ROOT/lib/libssl.$SONAME;$OPENSSL_ROOT/lib/libcrypto.$SONAME} \
       -DZLIB_ROOT="$ZLIB_ROOT"                           \
       -DXROOTD_ROOT_DIR="$XROOTD_ROOT"                   \
       -DLWS="$LIBWEBSOCKETS_ROOT"
-make ${JOBS:+-j $JOBS} install
+cmake --build . -- ${JOBS:+-j $JOBS} install
 
 # Modulefile
 mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${GCC_TOOLCHAIN_REVISION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} \\
-                     ROOT/${ROOT_VERSION}-${ROOT_REVISION}                                                   \\
-                     ${XJALIENFS_REVISION:+xjalienfs/$XJALIENFS_VERSION-$XJALIENFS_REVISION}                 \\
-                     ${LIBJALIENWS_REVISION:+libjalienws/$LIBJALIENWS_VERSION-$LIBJALIENWS_REVISION}
-
+alibuild-generate-module --lib > etc/modulefiles/$PKGNAME
+cat >> etc/modulefiles/$PKGNAME <<EoF
 # Our environment
-set JALIEN_ROOT_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path LD_LIBRARY_PATH \$JALIEN_ROOT_ROOT/lib
-append-path ROOT_PLUGIN_PATH \$JALIEN_ROOT_ROOT/etc/plugins
-prepend-path ROOT_INCLUDE_PATH \$JALIEN_ROOT_ROOT/include
+append-path ROOT_PLUGIN_PATH \$PKGROOT/etc/plugins
+prepend-path ROOT_INCLUDE_PATH \$PKGROOT/include
 EoF
 mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

millepede-ii.sh

@@ -1,6 +1,6 @@
 package: Millepede-II
 version: "%(tag_basename)s"
-tag: "V04-12-01"
+tag: "V04-16-00"
 source: https://gitlab.desy.de/claus.kleinwort/millepede-ii.git
 requires:
   - zlib

ndmspc.sh

@@ -1,11 +1,11 @@
 package: ndmspc
 version: "%(tag_basename)s"
-tag: "v0.0.1"
+tag: "v0.20240422.0"
 requires:
   - ROOT
 build_requires:
-  - "Clang:(?!osx)"
   - CMake
+  - ninja
   - alibuild-recipe-tools
 source: https://gitlab.com/ndmspc/ndmspc.git
 incremental_recipe: |
@@ -19,12 +19,16 @@ if [[ $ALIBUILD_NDMSPC_TESTS ]]; then
   # Impose extra errors.
   CXXFLAGS="${CXXFLAGS} -Werror -Wno-error=deprecated-declarations"
 fi
-cmake --version
 
 # When O2 is built against Gandiva (from Arrow), then we need to use
 # -DLLVM_ROOT=$CLANG_ROOT, since O2's CMake calls into Gandiva's
 # -CMake, which requires it.
-cmake "$SOURCEDIR" "-DCMAKE_INSTALL_PREFIX=$INSTALLROOT"
+cmake "$SOURCEDIR" "-DCMAKE_INSTALL_PREFIX=$INSTALLROOT"          \
+      -G Ninja                                                    \
+      ${CMAKE_BUILD_TYPE:+"-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"} \
+      ${CXXSTD:+"-DCMAKE_CXX_STANDARD=$CXXSTD"}                   \
+      -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+
 cmake --build . -- ${JOBS+-j $JOBS} install
 
 # export compile_commands.json in (taken from o2.sh)
@@ -40,7 +44,7 @@ MODULEFILE="etc/modulefiles/$PKGNAME"
 alibuild-generate-module --bin --lib > "$MODULEFILE"
 cat >> "$MODULEFILE" <<EoF
 # Our environment
-set NDMSPC_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-setenv NDMSPC_ROOT \$NDMSPC_ROOT
+setenv NDMSPC_MACRO_DIR \$PKG_ROOT/macros
+prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include
 EoF
 mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles

o2-customization.sh

@@ -9,6 +9,7 @@ valid_defaults:
   - o2-dev-fairroot
   - alo
   - o2-prod
+  - ali
 ---
 # No contents. The only goal of this recipe is to provide customizations to
 # enable / disable features of the O2 builds. This cannot be done in the O2

o2-full-system-test.sh

@@ -19,7 +19,7 @@ rm -Rf $BUILDDIR/full-system-test-sim
 mkdir $BUILDDIR/full-system-test-sim
 pushd $BUILDDIR/full-system-test-sim
 export JOBUTILS_PRINT_ON_ERROR=1
-export JOBUTILS_JOB_TIMEOUT=1800
+export JOBUTILS_JOB_TIMEOUT=2400
 export PRINT_WORKFLOW=1
 export NHBPERTF=128
 export SHMSIZE=8000000000
@@ -35,28 +35,6 @@ $O2_ROOT/prodtests/full_system_test_ci_extra_tests.sh
 popd
 rm -Rf $BUILDDIR/full-system-test-sim
 
-# we also run the sim_challeng.sh script to check a basic MC workflow (including AOD)
-rm -Rf $BUILDDIR/sim-challenge
-mkdir $BUILDDIR/sim-challenge
-pushd $BUILDDIR/sim-challenge
-SIMEXITCODE=0
-# SIM_CHALLENGE_ANATESTING=ON --> reenable when we want analysis testing be part of the tests 
-{ "$O2_ROOT/prodtests/sim_challenge.sh" &> sim-challenge.log; SIMEXITCODE=$?; } || true  # don't quit immediately on error
-result=$(grep "Return status" sim-challenge.log | grep -v ": 0" || true)
-if [ ${SIMEXITCODE} != "0" ] || [ "${result}" ]; then
-  # something is wrong if we get a match here
-  # it matches if either the return code itself was != 0 or if a reported status
-  # in the log is not ok
-  echo "error detected in sim_challenge"
-  find ./ -type f \( -name "*.log" -and ! -name "pipel*" \) -exec awk ' { print FILENAME $0 } ' {} ';' || true
-  # make the recipe fail
-  false
-else
-  echo "sim_challenge passed"
-fi
-popd
-rm -Rf $BUILDDIR/sim-challenge
-
 # Dummy modulefile
 mkdir -p $INSTALLROOT/etc/modulefiles
 cat > $INSTALLROOT/etc/modulefiles/$PKGNAME <<EoF

o2-rtc-test.sh

@@ -0,0 +1,35 @@
+package: O2-RTC-test
+version: "1.0"
+requires:
+  - O2
+force_rebuild: true
+---
+#!/bin/bash -e
+
+if [[ "$G4INSTALL" != "" ]]; then
+  `$G4INSTALL/bin/geant4-config --datasets | sed 's/[^ ]* //' | sed 's/G4/export G4/' | sed 's/DATA /DATA=/'`
+fi
+
+rm -Rf $BUILDDIR/rtc-test
+mkdir $BUILDDIR/rtc-test
+pushd $BUILDDIR/rtc-test
+
+#o2-gpu-standalone-benchmark --noEvents -g --gpuType CUDA --RTCenable 1 --RTCcacheOutput 0 --RTCoptConstexpr 1 --RTCcompilePerKernel 1 --RTCrunTest 2
+o2-gpu-standalone-benchmark --noEvents -g --gpuType HIP --RTCenable 1 --RTCcacheOutput 0 --RTCoptConstexpr 1 --RTCcompilePerKernel 1 --RTCrunTest 2
+
+popd
+rm -Rf $BUILDDIR/rtc-test
+
+# Dummy modulefile
+mkdir -p $INSTALLROOT/etc/modulefiles
+cat > $INSTALLROOT/etc/modulefiles/$PKGNAME <<EoF
+#%Module1.0
+proc ModulesHelp { } {
+  global version
+  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
+}
+set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
+module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
+# Dependencies
+module load BASE/1.0 O2/$O2_VERSION-$O2_REVISION
+EoF

o2-sim-challenge-test.sh

@@ -0,0 +1,59 @@
+package: O2-sim-challenge-test
+version: "1.0"
+requires:
+  - O2
+  - O2DPG
+  - QualityControl
+  - O2sim
+  - O2Physics
+  - jq
+force_rebuild: true
+---
+#!/bin/bash -e
+
+if [[ "$G4INSTALL" != "" ]]; then
+  `$G4INSTALL/bin/geant4-config --datasets | sed 's/[^ ]* //' | sed 's/G4/export G4/' | sed 's/DATA /DATA=/'`
+fi
+
+export JOBUTILS_PRINT_ON_ERROR=1
+export JOBUTILS_JOB_TIMEOUT=2400
+export NJOBS="$JOBS"
+export DPL_REPORT_PROCESSING=1
+export XRD_CONNECTIONWINDOW=3
+export XRD_CONNECTIONRETRY=1
+export XRD_TIMEOUTRESOLUTION=1
+
+rm -Rf $BUILDDIR/sim-challenge
+mkdir $BUILDDIR/sim-challenge
+pushd $BUILDDIR/sim-challenge
+SIMEXITCODE=0
+# SIM_CHALLENGE_ANATESTING=ON --> reenable when we want analysis testing be part of the tests 
+{ "$O2_ROOT/prodtests/sim_challenge.sh" &> sim-challenge.log; SIMEXITCODE=$?; } || true  # don't quit immediately on error
+result=$(grep "Return status" sim-challenge.log | grep -v ": 0" || true)
+if [ ${SIMEXITCODE} != "0" ] || [ "${result}" ]; then
+  # something is wrong if we get a match here
+  # it matches if either the return code itself was != 0 or if a reported status
+  # in the log is not ok
+  echo "error detected in sim_challenge"
+  find ./ -type f \( -name "*.log" -and ! -name "pipel*" \) -exec awk ' { print FILENAME $0 } ' {} ';' || true
+  # make the recipe fail
+  false
+else
+  echo "sim_challenge passed"
+fi
+popd
+rm -Rf $BUILDDIR/sim-challenge
+
+# Dummy modulefile
+mkdir -p $INSTALLROOT/etc/modulefiles
+cat > $INSTALLROOT/etc/modulefiles/$PKGNAME <<EoF
+#%Module1.0
+proc ModulesHelp { } {
+  global version
+  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
+}
+set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
+module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
+# Dependencies
+module load BASE/1.0 O2/$O2_VERSION-$O2_REVISION
+EoF

o2.sh

@@ -1,6 +1,6 @@
 package: O2
 version: "%(tag_basename)s"
-tag: "daily-20240327-0101"
+tag: "daily-20240424-0200"
 requires:
   - arrow
   - FairRoot
@@ -131,6 +131,7 @@ valid_defaults:
   - o2-dev-fairroot
   - alo
   - o2-prod
+  - ali
 ---
 #!/bin/sh
 export ROOTSYS=$ROOT_ROOT

o2dpg.sh

@@ -1,6 +1,6 @@
 package: O2DPG
 version: "%(tag_basename)s"
-tag: "daily-20240327-0101"
+tag: "daily-20240424-0200"
 source: https://github.com/AliceO2Group/O2DPG.git
 build_requires:
   - alibuild-recipe-tools