From ad7bc07c8caa087805fe4662e5800faac6a3c705 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 4 May 2024 20:12:53 +0200 Subject: [PATCH 01/58] Update the latest commit --- .latest-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.latest-commit b/.latest-commit index 9924e8d0..649b85fa 100644 --- a/.latest-commit +++ b/.latest-commit @@ -1 +1 @@ -12963c894f59bf03f2f8ab94536019d9f82d3527 \ No newline at end of file +f5946c4621035dd466953c8d2664ff5f82f38138 \ No newline at end of file From 1cd7fcb22181c07af8ad68d0bf21ee90f01417af Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 4 May 2024 23:01:00 +0200 Subject: [PATCH 02/58] Update compiler for alma9 --- environments/key4hep-common/compilers.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/key4hep-common/compilers.yaml b/environments/key4hep-common/compilers.yaml index bc42f789..12af88ad 100644 --- a/environments/key4hep-common/compilers.yaml +++ b/environments/key4hep-common/compilers.yaml @@ -26,7 +26,7 @@ compilers: environment: {} extra_rpaths: [] - compiler: - spec: gcc@11.3.1 + spec: gcc paths: cc: /usr/bin/gcc cxx: /usr/bin/g++ From 20b7ed82b3fc246c7603aca29791549db0658677 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 4 May 2024 23:02:56 +0200 Subject: [PATCH 03/58] Use a newer version for ROOT --- environments/key4hep-common/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index 951f915e..ad6daf1b 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -78,7 +78,7 @@ packages: root: - require: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20 + require: @6.30+davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20 py-tensorflow: require: ~cuda~nccl whizard: From 6f5165a94da2611b8334c6b0815c6f9059f3c1ed Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 4 May 2024 23:04:12 +0200 Subject: [PATCH 04/58] Fix string --- environments/key4hep-common/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index ad6daf1b..062c66d7 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -78,7 +78,7 @@ packages: root: - require: @6.30+davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20 + require: '@6.30+davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20' py-tensorflow: require: ~cuda~nccl whizard: From 0c328e4797172494c5e42239e03be72fbb133bb9 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 4 May 2024 23:08:25 +0200 Subject: [PATCH 05/58] Fix compiler --- environments/key4hep-common/compilers.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/key4hep-common/compilers.yaml b/environments/key4hep-common/compilers.yaml index 12af88ad..830ae883 100644 --- a/environments/key4hep-common/compilers.yaml +++ b/environments/key4hep-common/compilers.yaml @@ -26,7 +26,7 @@ compilers: environment: {} extra_rpaths: [] - compiler: - spec: gcc + spec: gcc@11.4.1 paths: cc: /usr/bin/gcc cxx: /usr/bin/g++ From e9c7e4a34cc6da172b0b119175bde4121b5a3e9f Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 6 May 2024 15:59:59 +0200 Subject: [PATCH 06/58] Add a .cherry-pick file --- .cherry-pick | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .cherry-pick diff --git a/.cherry-pick b/.cherry-pick new file mode 100644 index 00000000..62074d51 --- /dev/null +++ b/.cherry-pick @@ -0,0 +1,37 @@ +git remote add jmcarcell https://github.com/jmcarcell/spack +git fetch jmcarcell -q + +# add a recent version of madgraph, remove when https://github.com/spack/spack/pull/41128 is merged +git cherry-pick 61f925ac8016ba27eefec596dc7023ac0ac45a9f -X theirs --no-commit + +# add vdt for CPATH, needed for podio+rntuple +git cherry-pick f97fabc3ff12527e5220ea6917719a73f8bd4315 -X theirs --no-commit + +# Add a patch to fix whizard (re pythia8), remove when https://github.com/spack/spack/pull/43045 is merged +git cherry-pick 643026356bc15f77ea8a09f53aa92a49dc7320a7 -X theirs --no-commit + +# podio: add rpath, remove when https://github.com/spack/spack/pull/42844 is merged +git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit + +# gaudi: add missing std::list +git cherry-pick 6b02e009664c6effb581023982dcb7863da5fb88 -X theirs --no-commit + + +if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]]; then + + # patch for intel-tbb for CentOS 7, see https://github.com/oneapi-src/oneTBB/issues/859 + # because we use binutils from the system which is old + git cherry-pick d8a0b0426a1c97c33c4b8f133d38e7dc03816a8c -X theirs --no-commit + + # Make py-onnxruntime depend on git for CentOS 7 because the + # system git is too old and fails at fetching, remove when https://github.com/spack/spack/pull/43076 is merged + git cherry-pick b330252d082dc2865fa169af831b7b7c2affa8a5 -X theirs --no-commit + +fi + +if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID=ubuntu' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="22.04"' ]]; then + + # patch to rename libz so texlive can be built + git cherry-pick f8c6f240ba9b99218eb72bfadce9f99952fec1de -X theirs --no-commit + +fi \ No newline at end of file From 845314b1c5711b0b5caa6cc703cce015e0739f72 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 6 May 2024 17:38:05 +0200 Subject: [PATCH 07/58] Fix cherry picks for whizard and madgraph --- .cherry-pick | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cherry-pick b/.cherry-pick index 62074d51..09b37e9d 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -2,13 +2,13 @@ git remote add jmcarcell https://github.com/jmcarcell/spack git fetch jmcarcell -q # add a recent version of madgraph, remove when https://github.com/spack/spack/pull/41128 is merged -git cherry-pick 61f925ac8016ba27eefec596dc7023ac0ac45a9f -X theirs --no-commit +curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/41128.diff | git apply -p1 # add vdt for CPATH, needed for podio+rntuple git cherry-pick f97fabc3ff12527e5220ea6917719a73f8bd4315 -X theirs --no-commit # Add a patch to fix whizard (re pythia8), remove when https://github.com/spack/spack/pull/43045 is merged -git cherry-pick 643026356bc15f77ea8a09f53aa92a49dc7320a7 -X theirs --no-commit +curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43045.diff | git apply -p1 # podio: add rpath, remove when https://github.com/spack/spack/pull/42844 is merged git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit From 9a3a8ae08fcd9cc4c9aef45ed7f8209dd5d216f5 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 6 May 2024 19:32:58 +0200 Subject: [PATCH 08/58] Add a patch for babayaga --- packages/babayaga/cross-section.patch | 160 ++++++++++++++++++++++++++ packages/babayaga/package.py | 4 + 2 files changed, 164 insertions(+) create mode 100644 packages/babayaga/cross-section.patch diff --git a/packages/babayaga/cross-section.patch b/packages/babayaga/cross-section.patch new file mode 100644 index 00000000..19cbc11e --- /dev/null +++ b/packages/babayaga/cross-section.patch @@ -0,0 +1,160 @@ +--- babayaga-fcc/main.f 2021-04-29 13:03:58.000000000 +0200 ++++ main.f 2024-05-06 18:47:18.296583800 +0200 +@@ -93,6 +93,8 @@ + character*20 hstnm + common/hostandpid/hstnm,idproc + ++ common/crosssections/xsec,var ++ + idproc = getpid() + call hostnm(hstnm) + +@@ -484,6 +486,22 @@ + endif + endif + ++ if (isnan(sdif)) then ++ print*,'NAN found (pos 2) setting sdif to 0!!!!' ++ print*,'pid,hostnm,ord,k,ng,emtx,sv,sdif,phsp,w' ++ print*,idproc,hstnm,ord,k,ng,emtx,sv,sdif,phsp,w ++ sdif = 0.d0 ++ w = 0.d0 ++ phsp = 0.d0 ++ ie = 1 ++ print*,'end ----!!!' ++ if (iverbose.gt.0) then ++ call printstatus(5,k,p1,p2,qph,xsec,var,varbefore, ++ . sdif,sdifmax,fmax) ++ endif ++ endif ++ ++ + !! unweightening for unweighted events... + if (k.gt.nsearch) then + istopsearch = 1 +@@ -517,24 +535,12 @@ + endif + endif + endif +- +- if (isnan(sdif)) then +- print*,'NAN found (pos 2) setting sdif to 0!!!!' +- print*,'pid,hostnm,ord,k,ng,emtx,sv,sdif,phsp,w' +- print*,idproc,hstnm,ord,k,ng,emtx,sv,sdif,phsp,w +- sdif = 0.d0 +- w = 0.d0 +- phsp = 0.d0 +- ie = 1 +- print*,'end ----!!!' +- if (iverbose.gt.0) then +- call printstatus(5,k,p1,p2,qph,xsec,var,varbefore, +- . sdif,sdifmax,fmax) +- endif +- endif + + sum = sum + sdif + sum2 = sum2 + sdif**2 ++ varbefore = var ++ xsec = sum/k ++ var = sqrt(abs((sum2/k-xsec**2)/k)) + + if (ng.eq.0) then + sumborn = sumborn + sdif/sv +@@ -547,9 +553,6 @@ + sump(ng) = sump(ng) + sdif + sum2p(ng) = sum2p(ng) + sdif**2 + +- varbefore = var +- xsec = sum/k +- var = sqrt(abs((sum2/k-xsec**2)/k)) + c tollerate = 1.2d0 + tollerate = 1.8d0 + if (var.gt.tollerate*varbefore +@@ -628,8 +631,8 @@ + endif + !! + xsec = sum/k +- var = sqrt((abs(sum2/k-xsec**2))/k) +- ++ var = sqrt((abs(sum2/k-xsec**2))/k) ++ + xsecborn = sumborn/k + varborn = sqrt((abs(sum2born/k-xsecborn**2))/k) + +--- babayaga-fcc/storage.F 2021-04-29 13:03:58.000000000 +0200 ++++ storage.F 2024-05-06 18:47:21.846583712 +0200 +@@ -9,7 +9,10 @@ + implicit double precision (a-h,o-z) + character*(*) storfile + integer i,istmod ++ character*100 storagefile ++ common/storagef/storagefile + include 'LesHouches.h' ++ storagefile = storfile + istorunit = 61 + if (i.eq.0) return + +@@ -52,8 +55,12 @@ + + write(ist,111)idbmup(1),idbmup(2),ebmup(1),ebmup(2), + . pdfgup(1),pdfgup(2),pdfsup(1),pdfsup(2),idwtup,nprup +- write(ist,222)xsecup(1),xerrup(1),xmaxup(1),lprup(1) +- ++ ++ ++*-- modified 27/4/2024 ++c write(ist,222)xsecup(1),xerrup(1),xmaxup(1),lprup(1) ++ write(ist,'(a)')'TOBECHANGED' ++*-- + write(ist,'(a)')'' + + 111 format(2(2x,I3),2(2x,G16.9),6(2x,I3)) +@@ -72,6 +79,13 @@ + common/storedevents/nstored + data nstored /0/ + ++ common/crosssections/xsec,var ++ common/realinput/anpoints,sdifmax ++ ++ xsecup(1) = xsec ++ xerrup(1) = var ++ xmaxup(1) = sdifmax ++ + nstored = nstored + 1 + + ccc counting extra photons +@@ -160,9 +174,6 @@ + + return + end +-******************************************* +- +- + ********************************************************* + subroutine eventstorage_unweighted(p3,p4,qph) + implicit double precision (a-h,o-z) +@@ -244,13 +255,21 @@ + end + ******************************************* + subroutine finalizestorageLHA(i) +- integer istorunit,i +- common/storageunit/istorunit ++ integer i,k ++ character*200 stringa ++ character*100 storagefile ++ common/storagef/storagefile ++ include 'LesHouches.h' + if (i.eq.0) return + write(istorunit,'(a)')'' + close(istorunit) ++*-- modified 27/4/2024 ++ write(stringa,222)xsecup(1),xerrup(1),xmaxup(1),lprup(1) ++ call EXECUTE_COMMAND_LINE("sed -i '0,/TOBECHANGED/ s/TOBECHANGED/" ++ .//trim(stringa)//"/' "//trim(storagefile)) ++ 222 format(3(2x,G16.9),1(2x,I3)) ++*__ + end +- + ******************************************* + subroutine finalizestorage(i) + integer istorunit,i diff --git a/packages/babayaga/package.py b/packages/babayaga/package.py index 79e20f52..b9e3116a 100644 --- a/packages/babayaga/package.py +++ b/packages/babayaga/package.py @@ -34,6 +34,10 @@ class Babayaga(MakefilePackage): # See https://stackoverflow.com/questions/44308577/ieee-underflow-flag-ieee-denormal-in-fortran-77 patch("main_stop.patch") + # Write the cross sections to the LHE files, patch provided by the authors + # in a mail + patch("cross-section.patch") + def build(self, spec, prefix): with working_dir("."): make("-f", "Makefile", "babayaga-fcc") From 9ebae75356c88cab15fea413eebbf265c15fca8d Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 6 May 2024 22:40:53 +0200 Subject: [PATCH 09/58] Use version 3 of madgraph --- environments/key4hep-common/packages.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index 062c66d7..2e63d867 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -24,6 +24,8 @@ packages: variants: ~flang~lldb~lld~lua~mlir~internal_unwind~polly~libomptarget~libomptarget_debug~gold~split_dwarf~llvm_dylib~link_llvm_dylib~omp_tsan~omp_as_runtime~code_signing~python~version_suffix~shlib_symbol_version~z3~zstd compiler-rt="none" libcxx="none" targets="x86" marlin: require: +lccd + madgraph5amc: + require: '@3:' podio: require: +rntuple+rpath+sio py-numpy: From c8d973904259573d7c8b0de4f2061987a7debf21 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 7 May 2024 08:35:07 +0200 Subject: [PATCH 10/58] Add gaudi v38.1 --- .cherry-pick | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.cherry-pick b/.cherry-pick index 09b37e9d..0f8b0383 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -16,6 +16,10 @@ git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit # gaudi: add missing std::list git cherry-pick 6b02e009664c6effb581023982dcb7863da5fb88 -X theirs --no-commit +# gaudi: Add v38.1 +git cherry-pick a1e485fe201036c35e2eace9f53acdf6c1fb550b -X theirs --no-commit + + if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]]; then From 9e3780beb1e8792fc565890a35ecf892abe4bdae Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 7 May 2024 16:08:42 +0200 Subject: [PATCH 11/58] Fix commit --- .cherry-pick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cherry-pick b/.cherry-pick index 0f8b0383..390b4520 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -17,7 +17,7 @@ git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit git cherry-pick 6b02e009664c6effb581023982dcb7863da5fb88 -X theirs --no-commit # gaudi: Add v38.1 -git cherry-pick a1e485fe201036c35e2eace9f53acdf6c1fb550b -X theirs --no-commit +git cherry-pick 64df3df040c71ce2f31f718df1afb373bcf68368 -X theirs --no-commit From 495d3186b030d4511c993918e77591c40512f832 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 7 May 2024 16:18:13 +0200 Subject: [PATCH 12/58] Add comment --- .cherry-pick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cherry-pick b/.cherry-pick index 390b4520..c7e93034 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -16,7 +16,7 @@ git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit # gaudi: add missing std::list git cherry-pick 6b02e009664c6effb581023982dcb7863da5fb88 -X theirs --no-commit -# gaudi: Add v38.1 +# gaudi: Add v38.1, remove when https://github.com/spack/spack/pull/44055 is merged git cherry-pick 64df3df040c71ce2f31f718df1afb373bcf68368 -X theirs --no-commit From 4896005e102fba6cf89d9d2680e5f751dbaf4c5b Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 7 May 2024 18:12:01 +0200 Subject: [PATCH 13/58] Add comment --- .cherry-pick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cherry-pick b/.cherry-pick index c7e93034..57c5d82d 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -13,7 +13,7 @@ curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43045 # podio: add rpath, remove when https://github.com/spack/spack/pull/42844 is merged git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit -# gaudi: add missing std::list +# gaudi: add missing std::list, remove when building 38.2 git cherry-pick 6b02e009664c6effb581023982dcb7863da5fb88 -X theirs --no-commit # gaudi: Add v38.1, remove when https://github.com/spack/spack/pull/44055 is merged From bfa912cd267e24e160dd3ed134714b999946574c Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 7 May 2024 19:26:21 +0200 Subject: [PATCH 14/58] Add fix for pythia 8.311 --- .cherry-pick | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cherry-pick b/.cherry-pick index 57c5d82d..12ed4566 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -19,6 +19,8 @@ git cherry-pick 6b02e009664c6effb581023982dcb7863da5fb88 -X theirs --no-commit # gaudi: Add v38.1, remove when https://github.com/spack/spack/pull/44055 is merged git cherry-pick 64df3df040c71ce2f31f718df1afb373bcf68368 -X theirs --no-commit +# pythia8: Add fix for 8.311, remove when https://github.com/spack/spack/pull/43803 is merged +curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43803.diff | git apply -p1 if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]]; then From 09e6845f6567d923c467aba42a0b8d05bada7e09 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 08:44:55 +0200 Subject: [PATCH 15/58] Change comment --- .cherry-pick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cherry-pick b/.cherry-pick index 12ed4566..c0364517 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -16,7 +16,7 @@ git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit # gaudi: add missing std::list, remove when building 38.2 git cherry-pick 6b02e009664c6effb581023982dcb7863da5fb88 -X theirs --no-commit -# gaudi: Add v38.1, remove when https://github.com/spack/spack/pull/44055 is merged +# gaudi: Add v38.1, remove! git cherry-pick 64df3df040c71ce2f31f718df1afb373bcf68368 -X theirs --no-commit # pythia8: Add fix for 8.311, remove when https://github.com/spack/spack/pull/43803 is merged From 8e4678a9e8b6d3420b80c2c2ddd5427e609aab56 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 10:49:52 +0200 Subject: [PATCH 16/58] Add a cxxstd variant for fastjet --- .cherry-pick | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.cherry-pick b/.cherry-pick index c0364517..b413e8b3 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -22,6 +22,9 @@ git cherry-pick 64df3df040c71ce2f31f718df1afb373bcf68368 -X theirs --no-commit # pythia8: Add fix for 8.311, remove when https://github.com/spack/spack/pull/43803 is merged curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43803.diff | git apply -p1 +# fastjet: Add a cxxstd variant, remove when https://github.com/spack/spack/pull/44072 is merged +curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44072.diff | git apply -p1 + if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]]; then From 6a89b9276cea944c8d93bb9c6e1cc32bf8d474d8 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 10:50:41 +0200 Subject: [PATCH 17/58] Add cxxstd=20 with fastjet --- environments/key4hep-common/packages.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index 2e63d867..cc43894e 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -127,6 +127,8 @@ packages: variants: build_type=Release cxxstd=20 edm4hep: variants: build_type=Release cxxstd=20 + fastjet: + variants: build_type=Release cxxstd=20 fcalclusterer: variants: build_type=Release cxxstd=20 fccanalyses: From 0cd2d93939a79b940cd27cc428a8cdd19b36ced3 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 14:43:39 +0200 Subject: [PATCH 18/58] Add a cxxstd variant for pythia8 --- .cherry-pick | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.cherry-pick b/.cherry-pick index b413e8b3..50e87096 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -25,6 +25,9 @@ curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43803 # fastjet: Add a cxxstd variant, remove when https://github.com/spack/spack/pull/44072 is merged curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44072.diff | git apply -p1 +# pythia8: Add a cxxstd, remove when https://github.com/spack/spack/pull/44077 is merged +curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44077.diff | git apply -p1 + if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]]; then From 68af5b0eadc16727530bfec7c1e8f29acd467f2f Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 15:03:48 +0200 Subject: [PATCH 19/58] Fix cherry pick --- .cherry-pick | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.cherry-pick b/.cherry-pick index 50e87096..87b43376 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -2,13 +2,13 @@ git remote add jmcarcell https://github.com/jmcarcell/spack git fetch jmcarcell -q # add a recent version of madgraph, remove when https://github.com/spack/spack/pull/41128 is merged -curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/41128.diff | git apply -p1 +curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/41128.diff | patch -p1 # add vdt for CPATH, needed for podio+rntuple git cherry-pick f97fabc3ff12527e5220ea6917719a73f8bd4315 -X theirs --no-commit # Add a patch to fix whizard (re pythia8), remove when https://github.com/spack/spack/pull/43045 is merged -curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43045.diff | git apply -p1 +curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43045.diff | patch -p1 # podio: add rpath, remove when https://github.com/spack/spack/pull/42844 is merged git cherry-pick 4d3b81d73b9dcbbe176d6baf3c00a4032307f6a8 -X theirs --no-commit @@ -20,13 +20,13 @@ git cherry-pick 6b02e009664c6effb581023982dcb7863da5fb88 -X theirs --no-commit git cherry-pick 64df3df040c71ce2f31f718df1afb373bcf68368 -X theirs --no-commit # pythia8: Add fix for 8.311, remove when https://github.com/spack/spack/pull/43803 is merged -curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43803.diff | git apply -p1 +curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43803.diff | patch -p1 # fastjet: Add a cxxstd variant, remove when https://github.com/spack/spack/pull/44072 is merged -curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44072.diff | git apply -p1 +curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44072.diff | patch -p1 # pythia8: Add a cxxstd, remove when https://github.com/spack/spack/pull/44077 is merged -curl -s -o - https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44077.diff | git apply -p1 +curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44077.diff | patch -p1 if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]]; then From c02398f9d7204207cf715f0bf80648356c797709 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 15:10:16 +0200 Subject: [PATCH 20/58] Add cxxstd=20 for pythia8 --- environments/key4hep-common/packages.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index cc43894e..3537123a 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -203,6 +203,8 @@ packages: variants: build_type=Release cxxstd=20 physsim: variants: build_type=Release + pythia8: + variants: build_type=Release cxxstd=20 raida: variants: build_type=Release sio: From 810cb8050802f5af493162cd50da805712b7ccf4 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 15:50:44 +0200 Subject: [PATCH 21/58] Add pythia8 to madgraph5amc --- environments/key4hep-common/packages.yaml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index 3537123a..a5a01d15 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -1,4 +1,10 @@ packages: + all: + target: [x86_64] + variants: build_type=Release cxxstd=20 + buildable: true + compiler: [] + acts: require: +dd4hep cxxstd=20 +json boost: @@ -25,7 +31,7 @@ packages: marlin: require: +lccd madgraph5amc: - require: '@3:' + require: '@3: +pythia8' podio: require: +rntuple+rpath+sio py-numpy: @@ -78,7 +84,6 @@ packages: - spec: openssh@99 prefix: /usr - root: require: '@6.30+davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20' py-tensorflow: @@ -95,14 +100,8 @@ packages: require: ~openmp gperftools: require: ~libunwind - all: - target: [x86_64] - variants: build_type=Release cxxstd=20 - buildable: true - compiler: [] - - # C++20 + # C++20 that don't appear above aidatt: variants: build_type=Release cxxstd=20 ced: @@ -128,7 +127,7 @@ packages: edm4hep: variants: build_type=Release cxxstd=20 fastjet: - variants: build_type=Release cxxstd=20 + variants: cxxstd=20 fcalclusterer: variants: build_type=Release cxxstd=20 fccanalyses: @@ -204,7 +203,7 @@ packages: physsim: variants: build_type=Release pythia8: - variants: build_type=Release cxxstd=20 + variants: cxxstd=20 raida: variants: build_type=Release sio: From 860903a879f27d874d598e43c4aa1ec383037cab Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 15:55:48 +0200 Subject: [PATCH 22/58] Use cxxstd from ROOT in k4Clue --- packages/k4clue/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/k4clue/package.py b/packages/k4clue/package.py index 0f69c7e3..c594fd49 100644 --- a/packages/k4clue/package.py +++ b/packages/k4clue/package.py @@ -57,6 +57,7 @@ class K4clue(CMakePackage, Ilcsoftpackage): def cmake_args(self): args = [] args.append(self.define("cupla_DIR", self.spec["cupla"].prefix)) + args.append(f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}") return args def setup_run_environment(self, env): From 35d8a691508d97884c9ae01d1cc9ce82f1a91392 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 15:57:49 +0200 Subject: [PATCH 23/58] Use the cxxstd from ROOT in k4MarlinWrapper --- packages/k4marlinwrapper/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/k4marlinwrapper/package.py b/packages/k4marlinwrapper/package.py index de7f786d..29efefc3 100644 --- a/packages/k4marlinwrapper/package.py +++ b/packages/k4marlinwrapper/package.py @@ -40,6 +40,7 @@ class K4marlinwrapper(CMakePackage, Ilcsoftpackage): def cmake_args(self): args = [self.define("FORCE_COLORED_OUTPUT", False)] + args.append(f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}") return args def setup_run_environment(self, env): From aeb0cfe77186c79a1d672295566206f49f62d947 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:04:39 +0200 Subject: [PATCH 24/58] Simplify recipe --- packages/marlinutil/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/marlinutil/package.py b/packages/marlinutil/package.py index ebd059f5..91457b61 100644 --- a/packages/marlinutil/package.py +++ b/packages/marlinutil/package.py @@ -59,10 +59,9 @@ class Marlinutil(CMakePackage, Ilcsoftpackage): def cmake_args(self): spec = self.spec - cxxstd = spec["root"].variants["cxxstd"].value # Make sure that we pick the right GSL return [ - self.define("CMAKE_CXX_STANDARD", cxxstd), + self.define("CMAKE_CXX_STANDARD", spec["root"].variants["cxxstd"].value), self.define("GSL_DIR", self.spec["gsl"].prefix), self.define("BUILD_TESTING", self.run_tests), ] From 10e051397d87adca2d81faa76ee1e7611dc6960b Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:05:30 +0200 Subject: [PATCH 25/58] Fix style --- packages/k4clue/package.py | 4 +++- packages/k4marlinwrapper/package.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/k4clue/package.py b/packages/k4clue/package.py index c594fd49..8be3b26b 100644 --- a/packages/k4clue/package.py +++ b/packages/k4clue/package.py @@ -57,7 +57,9 @@ class K4clue(CMakePackage, Ilcsoftpackage): def cmake_args(self): args = [] args.append(self.define("cupla_DIR", self.spec["cupla"].prefix)) - args.append(f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}") + args.append( + f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}" + ) return args def setup_run_environment(self, env): diff --git a/packages/k4marlinwrapper/package.py b/packages/k4marlinwrapper/package.py index 29efefc3..0de9d99f 100644 --- a/packages/k4marlinwrapper/package.py +++ b/packages/k4marlinwrapper/package.py @@ -40,7 +40,9 @@ class K4marlinwrapper(CMakePackage, Ilcsoftpackage): def cmake_args(self): args = [self.define("FORCE_COLORED_OUTPUT", False)] - args.append(f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}") + args.append( + f"-DCMAKE_CXX_STANDARD={self.spec['root'].variants['cxxstd'].value}" + ) return args def setup_run_environment(self, env): From 5ed2efb210a391cc7bc13b3f1b21e6c72c7017ef Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:06:27 +0200 Subject: [PATCH 26/58] Remove unneeded cxxstd=20 --- environments/key4hep-common/packages.yaml | 76 +++++++++++------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index a5a01d15..c1c9f13f 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -103,13 +103,13 @@ packages: # C++20 that don't appear above aidatt: - variants: build_type=Release cxxstd=20 + variants: build_type=Release ced: - variants: build_type=Release cxxstd=20 + variants: build_type=Release cedviewer: - variants: build_type=Release cxxstd=20 + variants: build_type=Release cepcsw: - variants: build_type=Release cxxstd=20 + variants: build_type=Release clicperformance: variants: build_type=Release conformaltracking: @@ -119,25 +119,25 @@ packages: ddkaltest: variants: build_type=Release ddmarlinpandora: - variants: build_type=Release cxxstd=20 + variants: build_type=Release delphes: - variants: build_type=Release cxxstd=20 + variants: build_type=Release dual-readout: - variants: build_type=Release cxxstd=20 + variants: build_type=Release edm4hep: variants: build_type=Release cxxstd=20 fastjet: variants: cxxstd=20 fcalclusterer: - variants: build_type=Release cxxstd=20 + variants: build_type=Release fccanalyses: - variants: build_type=Release cxxstd=20 + variants: build_type=Release fccdetectors: - variants: build_type=Release cxxstd=20 + variants: build_type=Release fccsw: - variants: build_type=Release cxxstd=20 + variants: build_type=Release forwardtracking: - variants: build_type=Release cxxstd=20 + variants: build_type=Release gear: variants: build_type=Release cxxstd=20 ilcutil: @@ -145,61 +145,61 @@ packages: ildperformance: variants: build_type=Release cxxstd=20 k4clue: - variants: build_type=Release cxxstd=20 + variants: build_type=Release k4edm4hep2lcioconv: - variants: build_type=Release cxxstd=20 + variants: build_type=Release k4fwcore: - variants: build_type=Release cxxstd=20 + variants: build_type=Release k4gen: - variants: build_type=Release cxxstd=20 + variants: build_type=Release k4geo: - variants: build_type=Release cxxstd=20 + variants: build_type=Release k4marlinwrapper: - variants: build_type=Release cxxstd=20 + variants: build_type=Release k4projecttemplate: - variants: build_type=Release cxxstd=20 + variants: build_type=Release k4reccalorimeter: - variants: build_type=Release cxxstd=20 + variants: build_type=Release k4reco: - variants: build_type=Release cxxstd=20 + variants: build_type=Release k4rectracker: - variants: build_type=Release cxxstd=20 + variants: build_type=Release k4simgeant4: - variants: build_type=Release cxxstd=20 + variants: build_type=Release kaltest: - variants: build_type=Release cxxstd=20 + variants: build_type=Release kitrack: - variants: build_type=Release cxxstd=20 + variants: build_type=Release kitrackmarlin: - variants: build_type=Release cxxstd=20 + variants: build_type=Release lcfiplus: - variants: build_type=Release cxxstd=20 + variants: build_type=Release lcio: variants: build_type=Release cxxstd=20 lctuple: - variants: build_type=Release cxxstd=20 + variants: build_type=Release marlindd4hep: - variants: build_type=Release cxxstd=20 + variants: build_type=Release marlinfastjet: - variants: build_type=Release cxxstd=20 + variants: build_type=Release marlinkinfit: - variants: build_type=Release cxxstd=20 + variants: build_type=Release marlinkinfitprocessors: - variants: build_type=Release cxxstd=20 + variants: build_type=Release marlinreco: - variants: build_type=Release cxxstd=20 + variants: build_type=Release marlintrk: variants: build_type=Release marlintrkprocessors: - variants: build_type=Release cxxstd=20 + variants: build_type=Release marlinutil: - variants: build_type=Release cxxstd=20 + variants: build_type=Release opendatadetector: - variants: build_type=Release cxxstd=20 + variants: build_type=Release overlay: - variants: build_type=Release cxxstd=20 + variants: build_type=Release pandoraanalysis: - variants: build_type=Release cxxstd=20 + variants: build_type=Release physsim: variants: build_type=Release pythia8: From 1bcd797a1fe529b320dc64bf5b6bb8648257ff28 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:06:58 +0200 Subject: [PATCH 27/58] Remove build_type=Release since it's the default --- environments/key4hep-common/packages.yaml | 90 ----------------------- 1 file changed, 90 deletions(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index c1c9f13f..83e10669 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -102,109 +102,19 @@ packages: require: ~libunwind # C++20 that don't appear above - aidatt: - variants: build_type=Release - ced: - variants: build_type=Release - cedviewer: - variants: build_type=Release - cepcsw: - variants: build_type=Release - clicperformance: - variants: build_type=Release - conformaltracking: - variants: build_type=Release - ddfastshowerml: - variants: build_type=Release - ddkaltest: - variants: build_type=Release - ddmarlinpandora: - variants: build_type=Release - delphes: - variants: build_type=Release - dual-readout: - variants: build_type=Release edm4hep: variants: build_type=Release cxxstd=20 fastjet: variants: cxxstd=20 - fcalclusterer: - variants: build_type=Release - fccanalyses: - variants: build_type=Release - fccdetectors: - variants: build_type=Release - fccsw: - variants: build_type=Release - forwardtracking: - variants: build_type=Release gear: variants: build_type=Release cxxstd=20 ilcutil: variants: build_type=Release cxxstd=20 ildperformance: variants: build_type=Release cxxstd=20 - k4clue: - variants: build_type=Release - k4edm4hep2lcioconv: - variants: build_type=Release - k4fwcore: - variants: build_type=Release - k4gen: - variants: build_type=Release - k4geo: - variants: build_type=Release - k4marlinwrapper: - variants: build_type=Release - k4projecttemplate: - variants: build_type=Release - k4reccalorimeter: - variants: build_type=Release - k4reco: - variants: build_type=Release - k4rectracker: - variants: build_type=Release - k4simgeant4: - variants: build_type=Release - kaltest: - variants: build_type=Release - kitrack: - variants: build_type=Release - kitrackmarlin: - variants: build_type=Release - lcfiplus: - variants: build_type=Release lcio: variants: build_type=Release cxxstd=20 - lctuple: - variants: build_type=Release - marlindd4hep: - variants: build_type=Release - marlinfastjet: - variants: build_type=Release - marlinkinfit: - variants: build_type=Release - marlinkinfitprocessors: - variants: build_type=Release - marlinreco: - variants: build_type=Release - marlintrk: - variants: build_type=Release - marlintrkprocessors: - variants: build_type=Release - marlinutil: - variants: build_type=Release - opendatadetector: - variants: build_type=Release - overlay: - variants: build_type=Release - pandoraanalysis: - variants: build_type=Release - physsim: - variants: build_type=Release pythia8: variants: cxxstd=20 - raida: - variants: build_type=Release sio: variants: build_type=Release cxxstd=20 From 76592f2b1cd66e2b7c66133c7f2acd455782a154 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:11:38 +0200 Subject: [PATCH 28/58] Update script --- scripts/fetch_nightly_versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fetch_nightly_versions.py b/scripts/fetch_nightly_versions.py index b074d688..9b547c4d 100755 --- a/scripts/fetch_nightly_versions.py +++ b/scripts/fetch_nightly_versions.py @@ -163,7 +163,7 @@ def get_latest_commit( text_extra["packages"][package]["require"] = line + original continue - if not text["packages"][package]: + if package not in text["packages"] or not text["packages"][package]: print(f"Adding {package}@{commit} to the key4hep-stack package.py") else: print(f"Updating {package}@{commit} in the key4hep-stack package.py") From 6e6263cef1a00ca41017fc932d0f60dff2f131ba Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:22:28 +0200 Subject: [PATCH 29/58] Fix script --- scripts/fetch_nightly_versions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/fetch_nightly_versions.py b/scripts/fetch_nightly_versions.py index 9b547c4d..77e88a3e 100755 --- a/scripts/fetch_nightly_versions.py +++ b/scripts/fetch_nightly_versions.py @@ -167,6 +167,8 @@ def get_latest_commit( print(f"Adding {package}@{commit} to the key4hep-stack package.py") else: print(f"Updating {package}@{commit} in the key4hep-stack package.py") + if package not in text["packages"]: + text["packages"][package] = {} text["packages"][package]["require"] = line with open(args.path, "w") as recipe: From f9ef66e558e5f2b6651864993a6af9609709410a Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:29:52 +0200 Subject: [PATCH 30/58] Remove the remaining build_type=Release --- environments/key4hep-common/packages.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index 83e10669..99ce9788 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -103,18 +103,18 @@ packages: # C++20 that don't appear above edm4hep: - variants: build_type=Release cxxstd=20 + variants: cxxstd=20 fastjet: variants: cxxstd=20 gear: - variants: build_type=Release cxxstd=20 + variants: cxxstd=20 ilcutil: - variants: build_type=Release cxxstd=20 + variants: cxxstd=20 ildperformance: - variants: build_type=Release cxxstd=20 + variants: cxxstd=20 lcio: - variants: build_type=Release cxxstd=20 + variants: cxxstd=20 pythia8: variants: cxxstd=20 sio: - variants: build_type=Release cxxstd=20 + variants: cxxstd=20 From 199b8b81ce27da44f428918db4e440b5d02aff24 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:32:26 +0200 Subject: [PATCH 31/58] Fix version requirement --- environments/key4hep-common/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index 99ce9788..ee5cc5db 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -85,7 +85,7 @@ packages: prefix: /usr root: - require: '@6.30+davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20' + require: '@6.30: +davix+fftw+gsl+math+minuit+mlp+opengl~postgres~pythia6+pythia8+python+r+root7+roofit+rpath~shadow+sqlite+ssl+tbb+threads+tmva+unuran+vc+vdt+x+xml+xrootd cxxstd=20' py-tensorflow: require: ~cuda~nccl whizard: From ab1ffd9802eea9c50c37f9c8966ea7c22e415691 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:35:51 +0200 Subject: [PATCH 32/58] Clean up pandorapfa --- packages/pandorapfa/package.py | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/packages/pandorapfa/package.py b/packages/pandorapfa/package.py index 656c757c..1028bdcd 100644 --- a/packages/pandorapfa/package.py +++ b/packages/pandorapfa/package.py @@ -18,6 +18,10 @@ class Pandorapfa(Package): maintainers = ["vvolkl"] version("master", branch="master") + version( + "4.8.1", + sha256sum="3b9e224196f09f3ce59062e73e1d05d4e8821d8163025263eee4448f7529f780", + ) version( "4.4.1", sha256="98c628b5063695fa73649136ded0aaa8e40cb34d06000096117606d926599f3b", @@ -42,30 +46,6 @@ class Pandorapfa(Package): "4.0.0", sha256="80fdb60ac53ebada9d6ed2c6d0cefe79174586ce82e2e3bee7eefb4dbacbfba3", ) - version( - "3.25.3", - sha256="b390d85ef8081e3fe090862b084298344fc2a6f3c67e29cb4f2cdced7fa25628", - ) - version( - "3.25.2", - sha256="43eb43fd25bcba95ca391aa349058a3946551771e4373862a7b1a328cbfe3f4d", - ) - version( - "3.25.1", - sha256="dc1b4e910d27bc892be72a66696034bf63f9e5f4aa07d8c1799677b1a8261645", - ) - version( - "3.24.0", - sha256="a5a9d091e032a3bbdb383eb3bc5609fd3e57367907f3d07e3270f21ef6758074", - ) - version( - "3.21.01", - sha256="36dd20235d924b975c167a450943d5f70c9e76d95eea0f55c68b0eead6c99e47", - ) - version( - "3.21.00", - sha256="c36070916691bd4137a6a21aced2efd730cfe31a17819cf94511351b6edfec8d", - ) patch("path.patch") From fbe9a46f5523532e2d09702bbf683b9377f95c6a Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:36:51 +0200 Subject: [PATCH 33/58] Clean up k4geo --- packages/k4geo/package.py | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/packages/k4geo/package.py b/packages/k4geo/package.py index 008bfa63..6224fc6d 100644 --- a/packages/k4geo/package.py +++ b/packages/k4geo/package.py @@ -35,23 +35,6 @@ class K4geo(CMakePackage): "0.18", sha256="50cd058e80baba21748156f3603a45a2388c6f3a8823d9aaa3f419eb58038fc9", ) - version( - "0.17", - sha256="4b515895df7a65b0c1f4061a8947b1bbb4c727b924ad73a1f03722de31327c3f", - ) - version( - "0.16.8", - sha256="6ce3ec018aa2b86a50f7c2dd868c0bd9d46b413bdde70139fcbe2f8167bb835a", - ) - version("0.16.7", tag="v00-16-07") - version( - "0.16.6", - sha256="76593d4f339c5e89acdb878de1f48eb46d9a9faf9c7e1bcac8346c235c2508c6", - ) - version( - "0.16.5", - sha256="e6d88dcca5440632241c30cab7bc0d314afef42a7a7ff15b68fc59cf997cda08", - ) variant("compact", default=True, description="Install compact files") @@ -62,17 +45,6 @@ class K4geo(CMakePackage): depends_on("python", type="build") depends_on("ninja", type="build") - patch( - "https://patch-diff.githubusercontent.com/raw/key4hep/k4geo/pull/255.diff", - sha256="fc39117d3b579ab383077fd7274d321f1e954cefa9e481b45310cd36b35aa3dd", - when="@0.16.8", - ) - patch( - "https://github.com/key4hep/k4geo/commit/cb87609446255c3a94da867ad7801a62ff3b6b05.patch", - sha256="3e02ca5c89558342d8fd2489463c285af5a5500baeba2faf8d41f8ec3ae2f487", - when="@0.16.7", - ) - def cmake_args(self): args = [] args.append( From b8d9196034aa781ed047179f902bbbaf88189e94 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:42:08 +0200 Subject: [PATCH 34/58] Clean up larcontent --- packages/larcontent/package.py | 21 +++++------------ packages/larcontent/path.patch | 40 +++++++++++++++++++++++++++++++++ packages/larcontent/path1.patch | 14 ------------ packages/larcontent/path2.patch | 13 ----------- packages/larcontent/path3.patch | 14 ------------ packages/larcontent/path4.patch | 13 ----------- 6 files changed, 45 insertions(+), 70 deletions(-) create mode 100644 packages/larcontent/path.patch delete mode 100644 packages/larcontent/path1.patch delete mode 100644 packages/larcontent/path2.patch delete mode 100644 packages/larcontent/path3.patch delete mode 100644 packages/larcontent/path4.patch diff --git a/packages/larcontent/package.py b/packages/larcontent/package.py index da28e2d7..5a69b540 100644 --- a/packages/larcontent/package.py +++ b/packages/larcontent/package.py @@ -16,6 +16,10 @@ class Larcontent(CMakePackage): maintainers = ["vvolkl"] version("master", branch="master") + version( + "4.8.1", + sha256="b15ffe74cf95f61901ec389ca9c763dc767464fc35c2a6ed800126c2d4d13017", + ) version( "4.4.0", sha256="2a495a3e6c322035c4fa99e66152fc9eb48a516533fd1870a18c889310dbe223", @@ -28,23 +32,8 @@ class Larcontent(CMakePackage): "4.0.0", sha256="01a28828a92daa4a95fd7399ec9df3c7be9ac2b33f40c5a031707894a44951cd", ) - version( - "3.27.0", - sha256="0aecf7e39fa96654bd19257e481997f0c9ee5871b97f587fa1b37046f909c4e0", - ) - version( - "3.24.1", - sha256="2cd11a05e87b32af06c27f1fea8d54d67141881b1ae4be72b2068a4f546fde5a", - ) - version( - "3.24.0", - sha256="02cb1533787f341823763de81478a6cb9be8971fc69be4cb1999f711fbb32f73", - ) - patch("path1.patch") - patch("path2.patch") - patch("path3.patch") - patch("path4.patch") + patch("path.patch") depends_on("pandorapfa") depends_on("pandorasdk") diff --git a/packages/larcontent/path.patch b/packages/larcontent/path.patch new file mode 100644 index 00000000..678a8d7c --- /dev/null +++ b/packages/larcontent/path.patch @@ -0,0 +1,40 @@ +diff --git a/cmake/LArContentConfig.cmake.in b/cmake/LArContentConfig.cmake.in +index 8d102df7..7d4abc38 100644 +--- a/cmake/LArContentConfig.cmake.in ++++ b/cmake/LArContentConfig.cmake.in +@@ -42,7 +42,7 @@ FIND_PATH( LArContent_INCLUDE_DIRS + + + # ---------- libraries -------------------------------------------------------- +-INCLUDE( "@PANDORA_CMAKE_MODULES_PATH@/MacroCheckPackageLibs.cmake" ) ++INCLUDE( "MacroCheckPackageLibs" ) + + # only standard libraries should be passed as arguments to CHECK_PACKAGE_LIBS + # additional components are set by cmake in variable PKG_FIND_COMPONENTS + +diff --git a/cmake/LArContentConfigVersion.cmake.in b/cmake/LArContentConfigVersion.cmake.in +index 605bc880..464638b6 100644 +--- a/cmake/LArContentConfigVersion.cmake.in ++++ b/cmake/LArContentConfigVersion.cmake.in +@@ -10,6 +10,6 @@ SET( ${PACKAGE_FIND_NAME}_VERSION_MINOR @LArContent_VERSION_MINOR@ ) + SET( ${PACKAGE_FIND_NAME}_VERSION_PATCH @LArContent_VERSION_PATCH@ ) + + +-INCLUDE( "@PANDORA_CMAKE_MODULES_PATH@/MacroCheckPackageVersion.cmake" ) ++INCLUDE( "MacroCheckPackageVersion" ) + CHECK_PACKAGE_VERSION( ${PACKAGE_FIND_NAME} @LArContent_VERSION@ ) + +diff --git a/cmake/LArPandoraContentConfig.cmake.in b/cmake/LArPandoraContentConfig.cmake.in +index bd078884..498db896 100644 +--- a/cmake/LArPandoraContentConfig.cmake.in ++++ b/cmake/LArPandoraContentConfig.cmake.in +@@ -42,7 +42,7 @@ FIND_PATH( LArPandoraContent_INCLUDE_DIRS + + + # ---------- libraries -------------------------------------------------------- +-INCLUDE( "@PANDORA_CMAKE_MODULES_PATH@/MacroCheckPackageLibs.cmake" ) ++INCLUDE( "MacroCheckPackageLibs" ) + + # only standard libraries should be passed as arguments to CHECK_PACKAGE_LIBS + # additional components are set by cmake in variable PKG_FIND_COMPONENTS + diff --git a/packages/larcontent/path1.patch b/packages/larcontent/path1.patch deleted file mode 100644 index 2cd0c062..00000000 --- a/packages/larcontent/path1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake/LArContentConfig.cmake.in b/cmake/LArContentConfig.cmake.in -index 8d102df7..7d4abc38 100644 ---- a/cmake/LArContentConfig.cmake.in -+++ b/cmake/LArContentConfig.cmake.in -@@ -42,7 +42,7 @@ FIND_PATH( LArContent_INCLUDE_DIRS - - - # ---------- libraries -------------------------------------------------------- --INCLUDE( "@PANDORA_CMAKE_MODULES_PATH@/MacroCheckPackageLibs.cmake" ) -+INCLUDE( "MacroCheckPackageLibs" ) - - # only standard libraries should be passed as arguments to CHECK_PACKAGE_LIBS - # additional components are set by cmake in variable PKG_FIND_COMPONENTS - diff --git a/packages/larcontent/path2.patch b/packages/larcontent/path2.patch deleted file mode 100644 index 60a75017..00000000 --- a/packages/larcontent/path2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/LArContentConfigVersion.cmake.in b/cmake/LArContentConfigVersion.cmake.in -index 605bc880..464638b6 100644 ---- a/cmake/LArContentConfigVersion.cmake.in -+++ b/cmake/LArContentConfigVersion.cmake.in -@@ -10,6 +10,6 @@ SET( ${PACKAGE_FIND_NAME}_VERSION_MINOR @LArContent_VERSION_MINOR@ ) - SET( ${PACKAGE_FIND_NAME}_VERSION_PATCH @LArContent_VERSION_PATCH@ ) - - --INCLUDE( "@PANDORA_CMAKE_MODULES_PATH@/MacroCheckPackageVersion.cmake" ) -+INCLUDE( "MacroCheckPackageVersion" ) - CHECK_PACKAGE_VERSION( ${PACKAGE_FIND_NAME} @LArContent_VERSION@ ) - - diff --git a/packages/larcontent/path3.patch b/packages/larcontent/path3.patch deleted file mode 100644 index f3f8f15e..00000000 --- a/packages/larcontent/path3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake/LArPandoraContentConfig.cmake.in b/cmake/LArPandoraContentConfig.cmake.in -index bd078884..498db896 100644 ---- a/cmake/LArPandoraContentConfig.cmake.in -+++ b/cmake/LArPandoraContentConfig.cmake.in -@@ -42,7 +42,7 @@ FIND_PATH( LArPandoraContent_INCLUDE_DIRS - - - # ---------- libraries -------------------------------------------------------- --INCLUDE( "@PANDORA_CMAKE_MODULES_PATH@/MacroCheckPackageLibs.cmake" ) -+INCLUDE( "MacroCheckPackageLibs" ) - - # only standard libraries should be passed as arguments to CHECK_PACKAGE_LIBS - # additional components are set by cmake in variable PKG_FIND_COMPONENTS - diff --git a/packages/larcontent/path4.patch b/packages/larcontent/path4.patch deleted file mode 100644 index 73012010..00000000 --- a/packages/larcontent/path4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/LArPandoraContentConfigVersion.cmake.in b/cmake/LArPandoraContentConfigVersion.cmake.in -index b444ffd7..ac0ae061 100644 ---- a/cmake/LArPandoraContentConfigVersion.cmake.in -+++ b/cmake/LArPandoraContentConfigVersion.cmake.in -@@ -10,6 +10,6 @@ SET( ${PACKAGE_FIND_NAME}_VERSION_MINOR @LArPandoraContent_VERSION_MINOR@ ) - SET( ${PACKAGE_FIND_NAME}_VERSION_PATCH @LArPandoraContent_VERSION_PATCH@ ) - - --INCLUDE( "@PANDORA_CMAKE_MODULES_PATH@/MacroCheckPackageVersion.cmake" ) -+INCLUDE( "MacroCheckPackageVersion" ) - CHECK_PACKAGE_VERSION( ${PACKAGE_FIND_NAME} @LArPandoraContent_VERSION@ ) - - From 2df24e1d5f625cf0db138c5c8bc826a69171c55a Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Wed, 8 May 2024 16:44:12 +0200 Subject: [PATCH 35/58] Clean up fccanalyses --- packages/fccanalyses/package.py | 38 ++------------------------------- 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/packages/fccanalyses/package.py b/packages/fccanalyses/package.py index 9b39e897..10795494 100644 --- a/packages/fccanalyses/package.py +++ b/packages/fccanalyses/package.py @@ -29,40 +29,6 @@ class Fccanalyses(CMakePackage, Key4hepPackage): "0.6.0", sha256="a740c1818cc9e02ce44306b9a4f828b3ce85d2afaed1fc06d8f8a41f89f9abe2", ) - version( - "0.5.1", - sha256="2d5493340e21e8a24cbbfec9a465616fca736c5058bd27acf79eb07f8948ea2b", - ) - version( - "0.5.0", - sha256="6c4b68d15fbae3793473dc4475f216b65c1962ed5de7979e75b024cb6d05d541", - ) - version( - "0.4.1", - sha256="60db645152326775e9ce0f8c5017bd68d83d0024ac71e3266dac2f83d96ffce3", - ) - version( - "0.4.0", - sha256="0089d8dd71e45f31afb531f4bdd3140f78eb5484cc126746fff51d750b317a1f", - ) - version( - "0.3.7", - sha256="523e7c6d8db73028356b468afb01bd1f077ff4268817afe56df92fc47d492fd2", - ) - version( - "0.3.6", - sha256="ec673e22b44c6c7b4e947ba16e3c0f12c08ee4443433fcdfd2c09a6795ddb0b7", - ) - version( - "0.3.5", - sha256="efc08ea107d2fe10c24486d549e8ad8f6457c9c9003d2d12d1c44ebcdbd9664c", - ) - - patch( - "https://patch-diff.githubusercontent.com/raw/HEP-FCC/FCCAnalyses/pull/176.patch", - when="@0.4.0", - sha256="bff4be96d0c177caccc3642bc1b3538004a8d3e5a19b472563ac867281a65bd6", - ) patch( "https://github.com/HEP-FCC/FCCAnalyses/commit/f645584b81aacd0b0f8141b28bcbfa139aecad5c.patch?full_index=1", @@ -86,13 +52,13 @@ class Fccanalyses(CMakePackage, Key4hepPackage): depends_on("acts", when="+acts") depends_on("acts@:29", when="@:0.8.0 +acts") depends_on("acts@19.6.0:28", when="@0.7.0 +acts") - depends_on("acts@6.00.0:19.5.0", when="@0.3.5:0.6.0 +acts") + depends_on("acts@6.00.0:19.5.0", when="@:0.6.0 +acts") depends_on("eigen") depends_on("dd4hep", when="+dd4hep") depends_on("py-pyyaml", type=("build", "run")) depends_on("py-onnxruntime", when="+onnx") depends_on("delphes@3.5.1pre07:", when="@0.7.0:") - depends_on("catch2@3:", type=("test"), when="@0.4:") + depends_on("catch2@3:", type=("test")) def cmake_args(self): args = [ From ea0befe9314b20305c643573b3b459a847b63bc0 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 9 May 2024 08:08:56 +0200 Subject: [PATCH 36/58] Fix recipe --- packages/pandorapfa/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pandorapfa/package.py b/packages/pandorapfa/package.py index 1028bdcd..5c029bbe 100644 --- a/packages/pandorapfa/package.py +++ b/packages/pandorapfa/package.py @@ -20,7 +20,7 @@ class Pandorapfa(Package): version("master", branch="master") version( "4.8.1", - sha256sum="3b9e224196f09f3ce59062e73e1d05d4e8821d8163025263eee4448f7529f780", + sha256="3b9e224196f09f3ce59062e73e1d05d4e8821d8163025263eee4448f7529f780", ) version( "4.4.1", From 66d444584386f5ab9a8b80582bd221043ad8271b Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 9 May 2024 08:17:36 +0200 Subject: [PATCH 37/58] Remove cxxstd=20 for ced --- environments/key4hep-nightly/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/key4hep-nightly/packages.yaml b/environments/key4hep-nightly/packages.yaml index 8c9202df..7a49614b 100644 --- a/environments/key4hep-nightly/packages.yaml +++ b/environments/key4hep-nightly/packages.yaml @@ -4,7 +4,7 @@ packages: aidatt: variants: build_type=RelWithDebInfo cxxstd=20 ced: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo cedviewer: variants: build_type=RelWithDebInfo cxxstd=20 cepcsw: From 00dab15dedce31b890288d9e193af106facd649e Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 9 May 2024 09:02:02 +0200 Subject: [PATCH 38/58] Remove a few unnecessary cxxstd=20 --- environments/key4hep-common/packages.yaml | 2 - environments/key4hep-nightly/packages.yaml | 82 +++++++++++----------- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index ee5cc5db..daa71b2d 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -110,8 +110,6 @@ packages: variants: cxxstd=20 ilcutil: variants: cxxstd=20 - ildperformance: - variants: cxxstd=20 lcio: variants: cxxstd=20 pythia8: diff --git a/environments/key4hep-nightly/packages.yaml b/environments/key4hep-nightly/packages.yaml index 7a49614b..a1303b48 100644 --- a/environments/key4hep-nightly/packages.yaml +++ b/environments/key4hep-nightly/packages.yaml @@ -2,13 +2,13 @@ packages: acts: variants: build_type=RelWithDebInfo aidatt: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo ced: variants: build_type=RelWithDebInfo cedviewer: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo cepcsw: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo clicperformance: variants: build_type=RelWithDebInfo conformaltracking: @@ -20,25 +20,25 @@ packages: ddkaltest: variants: build_type=RelWithDebInfo ddmarlinpandora: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo delphes: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo dual-readout: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo edm4hep: variants: build_type=RelWithDebInfo cxxstd=20 fcalclusterer: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo fccanalyses: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo fccdetectors: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo fccsw: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo forwardtracking: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo gaudi: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo geant4: variants: build_type=RelWithDebInfo gear: @@ -46,69 +46,69 @@ packages: ilcutil: variants: build_type=RelWithDebInfo cxxstd=20 ildperformance: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4clue: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4edm4hep2lcioconv: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4fwcore: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4gen: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4geo: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4marlinwrapper: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4projecttemplate: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4reccalorimeter: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4reco: variants: build_type=RelWithDebInfo k4rectracker: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4simdelphes: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo k4simgeant4: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo kaltest: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo kitrack: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo kitrackmarlin: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo lccd: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo lcfiplus: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo lcio: variants: build_type=RelWithDebInfo cxxstd=20 lctuple: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo marlin: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo marlindd4hep: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo marlinfastjet: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo marlinkinfit: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo marlinkinfitprocessors: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo marlinreco: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo marlintrk: variants: build_type=RelWithDebInfo marlintrkprocessors: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo marlinutil: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo opendatadetector: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo overlay: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo pandoraanalysis: - variants: build_type=RelWithDebInfo cxxstd=20 + variants: build_type=RelWithDebInfo physsim: variants: build_type=RelWithDebInfo podio: From 5a6e211cc713e73fb9efb5c44f3188aa2eb107b1 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 9 May 2024 09:13:51 +0200 Subject: [PATCH 39/58] Update order --- environments/key4hep-nightly/spack.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/environments/key4hep-nightly/spack.yaml b/environments/key4hep-nightly/spack.yaml index 20452762..d6f6210f 100644 --- a/environments/key4hep-nightly/spack.yaml +++ b/environments/key4hep-nightly/spack.yaml @@ -2,9 +2,10 @@ spack: view: false include: - ../key4hep-common/config-nightlies.yaml - - ../key4hep-common/packages.yaml - # Put packages after the common packages so that it doesn't get overwritten + # Put packages before the common packages so that it doesn't get overwritten + # See https://github.com/spack/spack/blob/master/lib/spack/docs/environments.rst?plain=1#L528 - ./packages.yaml + - ../key4hep-common/packages.yaml - ../key4hep-common/compilers.yaml repos: - ../.. From f22f5cdaebe6bb66e7da578d68e0b36fca22903b Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 9 May 2024 14:43:19 +0200 Subject: [PATCH 40/58] Add requirements for onnx, py-onnx and py-onnxruntime --- environments/key4hep-common/packages.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index daa71b2d..0b7aeb26 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -116,3 +116,13 @@ packages: variants: cxxstd=20 sio: variants: cxxstd=20 + + # onnx and py-onnx should have the same versions + # And all should be consistent based on this table: + # https://onnxruntime.ai/docs/reference/compatibility.html#onnx-opset-support + onnx: + require: '@1.15.0' + py-onnx: + require: '@1.15.0' + py-onnxruntime: + require: '@1.17.1' \ No newline at end of file From 6f87d7520517d2ce4bedf771b80c0cf1bf9191b8 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 9 May 2024 14:49:54 +0200 Subject: [PATCH 41/58] Add a madgraph+pythia test --- scripts/run_usability_tests.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/scripts/run_usability_tests.sh b/scripts/run_usability_tests.sh index eddac71f..f9cc11d3 100755 --- a/scripts/run_usability_tests.sh +++ b/scripts/run_usability_tests.sh @@ -162,6 +162,27 @@ EOF run_test "Sherpa test" "Sherpa -f sherpa.txt || ./makelibs" +cat > madgraph.txt < mu- mu+ +output Output +launch +shower=Pythia8 +set iseed 4714 +set EBEAM 175.0 +set MZ 91.1876 +set WZ 2.4952 +set nevents 100 +set pdlabel isronlyll +set lpp1 3 +set lpp2 -3 +set pt_min_pdg 13: 20 +set pt_max_pdg 13: 175 +EOF + +run_test "MadGraph test" "mg5_aMC madgraph.txt" + + # Report results echo "Tests completed:" From 8a1b6dc4e74b856d893a7aa15c527e3745a611eb Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 9 May 2024 18:37:30 +0200 Subject: [PATCH 42/58] Change comment --- .cherry-pick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cherry-pick b/.cherry-pick index 87b43376..8b3967ed 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -22,7 +22,7 @@ git cherry-pick 64df3df040c71ce2f31f718df1afb373bcf68368 -X theirs --no-commit # pythia8: Add fix for 8.311, remove when https://github.com/spack/spack/pull/43803 is merged curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43803.diff | patch -p1 -# fastjet: Add a cxxstd variant, remove when https://github.com/spack/spack/pull/44072 is merged +# fastjet: Add a cxxstd variant, remove! curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44072.diff | patch -p1 # pythia8: Add a cxxstd, remove when https://github.com/spack/spack/pull/44077 is merged From df366c5ea46ef428831dec05507a2fe2069de5d9 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 9 May 2024 22:20:14 +0200 Subject: [PATCH 43/58] Build whizard with latex --- environments/key4hep-nightly/packages.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/environments/key4hep-nightly/packages.yaml b/environments/key4hep-nightly/packages.yaml index a1303b48..6d58ba6b 100644 --- a/environments/key4hep-nightly/packages.yaml +++ b/environments/key4hep-nightly/packages.yaml @@ -117,3 +117,7 @@ packages: variants: build_type=RelWithDebInfo sio: variants: build_type=RelWithDebInfo cxxstd=20 + + whizard: + require: ~fastjet+latex+lcio~lhapdf+openloops~openmp+pythia8 hepmc=3 + From f19224bfa4848c8af83ac26f300c44ffe0fa7abc Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Fri, 10 May 2024 08:09:56 +0200 Subject: [PATCH 44/58] Update script --- scripts/delete-unused.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/delete-unused.sh b/scripts/delete-unused.sh index 111439c7..ce76d29f 100755 --- a/scripts/delete-unused.sh +++ b/scripts/delete-unused.sh @@ -3,4 +3,5 @@ spack -e . python -c 'from spack.cmd import uninstall; uninstall.do_uninstall([x for x in spack.store.STORE.db.query_local() if not any(x.satisfies(y) for y in spack.environment.active_environment().all_specs_generator())], False)' # Same command but only print what would be deleted -# spack -e . python -c 'print([x for x in spack.store.STORE.db.query_local() if not any(x.satisfies(y) for y in spack.environment.active_environment().all_specs_generator())])' +# spack -e . python -c 'print([x.name for x in spack.store.STORE.db.query_local() if not any(x.satisfies(y) for y in spack.environment.active_environment().all_specs_generator())])' + From bddb97bfa737c192ce7627fd9b5b446c7dce0206 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Fri, 10 May 2024 16:05:25 +0200 Subject: [PATCH 45/58] Go back to using multiple specs --- scripts/fetch_nightly_versions.py | 100 ++++++++++++++++++------------ 1 file changed, 61 insertions(+), 39 deletions(-) diff --git a/scripts/fetch_nightly_versions.py b/scripts/fetch_nightly_versions.py index 77e88a3e..3fffe72f 100755 --- a/scripts/fetch_nightly_versions.py +++ b/scripts/fetch_nightly_versions.py @@ -53,13 +53,23 @@ def get_latest_commit( parser = argparse.ArgumentParser( description="Add latest commits to a spack environment" ) + + # There are commented blocks to write to the packages.yaml directly and + # having a single spec instead of having multiple However, spack keeps + # having issues when concretizing on top of an existing installation (that may not be complete) + # so I'm reverting back to the previous approach of having multiple specs + + # parser.add_argument( + # "--path", + # help="path to a yaml file with spack packages", + # ) + # parser.add_argument( + # "--extra-path", + # help="path to a yaml file with spack packages", + # ) parser.add_argument( - "--path", - help="path to a yaml file with spack packages", - ) - parser.add_argument( - "--extra-path", - help="path to a yaml file with spack packages", + "--spack", + help="path to the spack.yaml in the nightly environment", ) parser.add_argument( "date", @@ -69,16 +79,23 @@ def get_latest_commit( args = parser.parse_args() date = args.date - try: - with open(args.path, "r") as recipe: - text = yaml.safe_load(recipe) - except FileNotFoundError: - print("Please run this script from the key4hep-spack repository.") - raise + # try: + # with open(args.path, "r") as recipe: + # text = yaml.safe_load(recipe) + # except FileNotFoundError: + # print("Please run this script from the key4hep-spack repository.") + # raise + + # try: + # with open(args.extra_path, "r") as recipe: + # text_extra = yaml.safe_load(recipe) + # except FileNotFoundError: + # print("Please run this script from the key4hep-spack repository.") + # raise try: - with open(args.extra_path, "r") as recipe: - text_extra = yaml.safe_load(recipe) + with open(args.spack, "r") as config: + text = yaml.safe_load(config) except FileNotFoundError: print("Please run this script from the key4hep-spack repository.") raise @@ -150,28 +167,33 @@ def get_latest_commit( line = f"@{commit}" if package not in ["cepcsw"]: line += "=develop" - original = " " - if package in text["packages"] and "require" in text["packages"][package]: - original = text["packages"][package]["require"] - text["packages"][package]["require"] = line + original - continue - elif ( - package in text_extra["packages"] - and "require" in text_extra["packages"][package] - ): - original = text_extra["packages"][package]["require"] - text_extra["packages"][package]["require"] = line + original - continue - - if package not in text["packages"] or not text["packages"][package]: - print(f"Adding {package}@{commit} to the key4hep-stack package.py") - else: - print(f"Updating {package}@{commit} in the key4hep-stack package.py") - if package not in text["packages"]: - text["packages"][package] = {} - text["packages"][package]["require"] = line - - with open(args.path, "w") as recipe: - yaml.dump(text, recipe) - with open(args.extra_path, "w") as recipe: - yaml.dump(text_extra, recipe) + + # original = " " + # if package in text["packages"] and "require" in text["packages"][package]: + # original = text["packages"][package]["require"] + # text["packages"][package]["require"] = line + original + # continue + # elif ( + # package in text_extra["packages"] + # and "require" in text_extra["packages"][package] + # ): + # original = text_extra["packages"][package]["require"] + # text_extra["packages"][package]["require"] = line + original + # continue + + # if package not in text["packages"] or not text["packages"][package]: + # print(f"Adding {package}@{commit} to the key4hep-stack package.py") + # else: + # print(f"Updating {package}@{commit} in the key4hep-stack package.py") + # if package not in text["packages"]: + # text["packages"][package] = {} + # text["packages"][package]["require"] = line + + text["spack"]["specs"].append(f"{package}{line}") + + # with open(args.path, "w") as recipe: + # yaml.dump(text, recipe) + # with open(args.extra_path, "w") as recipe: + # yaml.dump(text_extra, recipe) + with open(args.spack, "w") as config: + yaml.dump(text, config) From a0dd06c6b4b0c7a74874c55a124e91b4be90c45a Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Fri, 10 May 2024 16:18:43 +0200 Subject: [PATCH 46/58] Build whizard with +openmp --- environments/key4hep-common/packages.yaml | 2 +- environments/key4hep-nightly/packages.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index 0b7aeb26..ecbb6afd 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -89,7 +89,7 @@ packages: py-tensorflow: require: ~cuda~nccl whizard: - require: ~fastjet~latex+lcio~lhapdf+openloops~openmp+pythia8 hepmc=3 + require: ~fastjet~latex+lcio~lhapdf+openloops+openmp+pythia8 hepmc=3 k4simdelphes: require: ~delphes_hepmc evtgen: diff --git a/environments/key4hep-nightly/packages.yaml b/environments/key4hep-nightly/packages.yaml index 6d58ba6b..185428da 100644 --- a/environments/key4hep-nightly/packages.yaml +++ b/environments/key4hep-nightly/packages.yaml @@ -119,5 +119,5 @@ packages: variants: build_type=RelWithDebInfo cxxstd=20 whizard: - require: ~fastjet+latex+lcio~lhapdf+openloops~openmp+pythia8 hepmc=3 + require: ~fastjet+latex+lcio~lhapdf+openloops+openmp+pythia8 hepmc=3 From d01d05bac589673c9e15ddf7ae248d47a1bd6337 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 11 May 2024 08:07:10 +0200 Subject: [PATCH 47/58] Add a fix for the reconcretize issue --- .cherry-pick | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.cherry-pick b/.cherry-pick index 8b3967ed..f279ceee 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -28,6 +28,9 @@ curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44072.diff # pythia8: Add a cxxstd, remove when https://github.com/spack/spack/pull/44077 is merged curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44077.diff | patch -p1 +# fix issues when reconcretizing a GitVersion? remove when https://github.com/spack/spack/pull/43859 is merged +curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43859.diff | patch -p1 + if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]]; then From 5b67d6cfce8749048e680675f8992fe441c6c9b4 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 11 May 2024 08:09:14 +0200 Subject: [PATCH 48/58] Go back to using a single spec --- scripts/fetch_nightly_versions.py | 102 +++++++++++++++--------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/scripts/fetch_nightly_versions.py b/scripts/fetch_nightly_versions.py index 3fffe72f..863246fd 100755 --- a/scripts/fetch_nightly_versions.py +++ b/scripts/fetch_nightly_versions.py @@ -59,18 +59,18 @@ def get_latest_commit( # having issues when concretizing on top of an existing installation (that may not be complete) # so I'm reverting back to the previous approach of having multiple specs - # parser.add_argument( - # "--path", - # help="path to a yaml file with spack packages", - # ) - # parser.add_argument( - # "--extra-path", - # help="path to a yaml file with spack packages", - # ) parser.add_argument( - "--spack", - help="path to the spack.yaml in the nightly environment", + "--path", + help="path to a yaml file with spack packages", ) + parser.add_argument( + "--extra-path", + help="path to a yaml file with spack packages", + ) + # parser.add_argument( + # "--spack", + # help="path to the spack.yaml in the nightly environment", + # ) parser.add_argument( "date", help="date until which to search for commits, for example: 2021-01-01", @@ -79,19 +79,19 @@ def get_latest_commit( args = parser.parse_args() date = args.date - # try: - # with open(args.path, "r") as recipe: - # text = yaml.safe_load(recipe) - # except FileNotFoundError: - # print("Please run this script from the key4hep-spack repository.") - # raise + try: + with open(args.path, "r") as recipe: + text = yaml.safe_load(recipe) + except FileNotFoundError: + print("Please run this script from the key4hep-spack repository.") + raise - # try: - # with open(args.extra_path, "r") as recipe: - # text_extra = yaml.safe_load(recipe) - # except FileNotFoundError: - # print("Please run this script from the key4hep-spack repository.") - # raise + try: + with open(args.extra_path, "r") as recipe: + text_extra = yaml.safe_load(recipe) + except FileNotFoundError: + print("Please run this script from the key4hep-spack repository.") + raise try: with open(args.spack, "r") as config: @@ -168,32 +168,32 @@ def get_latest_commit( if package not in ["cepcsw"]: line += "=develop" - # original = " " - # if package in text["packages"] and "require" in text["packages"][package]: - # original = text["packages"][package]["require"] - # text["packages"][package]["require"] = line + original - # continue - # elif ( - # package in text_extra["packages"] - # and "require" in text_extra["packages"][package] - # ): - # original = text_extra["packages"][package]["require"] - # text_extra["packages"][package]["require"] = line + original - # continue - - # if package not in text["packages"] or not text["packages"][package]: - # print(f"Adding {package}@{commit} to the key4hep-stack package.py") - # else: - # print(f"Updating {package}@{commit} in the key4hep-stack package.py") - # if package not in text["packages"]: - # text["packages"][package] = {} - # text["packages"][package]["require"] = line - - text["spack"]["specs"].append(f"{package}{line}") - - # with open(args.path, "w") as recipe: - # yaml.dump(text, recipe) - # with open(args.extra_path, "w") as recipe: - # yaml.dump(text_extra, recipe) - with open(args.spack, "w") as config: - yaml.dump(text, config) + original = " " + if package in text["packages"] and "require" in text["packages"][package]: + original = text["packages"][package]["require"] + text["packages"][package]["require"] = line + original + continue + elif ( + package in text_extra["packages"] + and "require" in text_extra["packages"][package] + ): + original = text_extra["packages"][package]["require"] + text_extra["packages"][package]["require"] = line + original + continue + + if package not in text["packages"] or not text["packages"][package]: + print(f"Adding {package}@{commit} to the key4hep-stack package.py") + else: + print(f"Updating {package}@{commit} in the key4hep-stack package.py") + if package not in text["packages"]: + text["packages"][package] = {} + text["packages"][package]["require"] = line + + # text["spack"]["specs"].append(f"{package}{line}") + + with open(args.path, "w") as recipe: + yaml.dump(text, recipe) + with open(args.extra_path, "w") as recipe: + yaml.dump(text_extra, recipe) + # with open(args.spack, "w") as config: + # yaml.dump(text, config) From 89bb528cd2d67ae784cb7d623d549e4797d56458 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 11 May 2024 08:21:58 +0200 Subject: [PATCH 49/58] Comment also the spack block --- scripts/fetch_nightly_versions.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/fetch_nightly_versions.py b/scripts/fetch_nightly_versions.py index 863246fd..2c37b5e5 100755 --- a/scripts/fetch_nightly_versions.py +++ b/scripts/fetch_nightly_versions.py @@ -93,12 +93,12 @@ def get_latest_commit( print("Please run this script from the key4hep-spack repository.") raise - try: - with open(args.spack, "r") as config: - text = yaml.safe_load(config) - except FileNotFoundError: - print("Please run this script from the key4hep-spack repository.") - raise + # try: + # with open(args.spack, "r") as config: + # text = yaml.safe_load(config) + # except FileNotFoundError: + # print("Please run this script from the key4hep-spack repository.") + # raise for package, location in [ ("aidatt", "aidasoft/aidatt"), From 66707448fa53a36dbedda50bfd62e1f94b7817e6 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 11 May 2024 15:43:09 +0200 Subject: [PATCH 50/58] Add message about the nigtlies and CentOS 7 --- scripts/cvmfs/setup-nightlies.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cvmfs/setup-nightlies.sh b/scripts/cvmfs/setup-nightlies.sh index b989cb6c..8dc7c94c 100644 --- a/scripts/cvmfs/setup-nightlies.sh +++ b/scripts/cvmfs/setup-nightlies.sh @@ -63,6 +63,7 @@ if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="rhel"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"7* ]]; then os="centos7" k4path=$(echo /cvmfs/sw-nightlies.hsf.org/key4hep/releases/$rel/*centos7*) + echo "WARNING: CentOS 7 nightlies are not being built anymore and will be deleted soon, consider using AlmaLinux 9" elif [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="almalinux"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"9* ]] || [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="rhel"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"9* ]] || [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="rocky"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"9* ]]; then From b487422449d418591bdbee28cfba816c5e3c16ec Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sun, 12 May 2024 20:50:31 +0200 Subject: [PATCH 51/58] Change comment --- .cherry-pick | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.cherry-pick b/.cherry-pick index f279ceee..d2d88817 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -7,7 +7,7 @@ curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/41128.diff # add vdt for CPATH, needed for podio+rntuple git cherry-pick f97fabc3ff12527e5220ea6917719a73f8bd4315 -X theirs --no-commit -# Add a patch to fix whizard (re pythia8), remove when https://github.com/spack/spack/pull/43045 is merged +# Add a patch to fix whizard (re pythia8), remove! curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43045.diff | patch -p1 # podio: add rpath, remove when https://github.com/spack/spack/pull/42844 is merged @@ -31,6 +31,9 @@ curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44077.diff # fix issues when reconcretizing a GitVersion? remove when https://github.com/spack/spack/pull/43859 is merged curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43859.diff | patch -p1 +# py-onnxruntime: Install the session headers, needed by FCCAnalyses +git cherry-pick e272ffa5a4768d23f1579403f9872360630e7278 -X theirs --no-commit + if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]]; then From 6e800b0b0353b7af321f149a4289854a982353be Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 13 May 2024 21:13:27 +0200 Subject: [PATCH 52/58] Add patchs for FCCAnalyses --- packages/fccanalyses/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/fccanalyses/package.py b/packages/fccanalyses/package.py index 10795494..fd72938a 100644 --- a/packages/fccanalyses/package.py +++ b/packages/fccanalyses/package.py @@ -36,6 +36,16 @@ class Fccanalyses(CMakePackage, Key4hepPackage): sha256="0a324f913e515c0a12d3d799e4c924ad57eaad51cbeae2633417bb819d97d227", ) + patch( + "https://patch-diff.githubusercontent.com/raw/HEP-FCC/FCCAnalyses/pull/373.patch?full_index=1", + sha256="e77e5962d35d764cae5757f066eecc30fa9c60cb05ff087e684636e7c8e4724d", + ) + + patch( + "https://patch-diff.githubusercontent.com/raw/HEP-FCC/FCCAnalyses/pull/374.patch?full_index=1", + sha256="aba8cb69ba3494fe48bc4a3d26189932c4974c0013278081893cfef09606fae2", + ) + variant("onnx", default=True, description="Build ONNX-dependent analyzers.") variant("acts", default=True, description="Build Acts-dependent analyzers.") variant("dd4hep", default=True, description="Build DD4hep-dependent analyzers.") From c3b2f1a4eec70d489adf938d02868d81adb57d6b Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 13 May 2024 22:29:25 +0200 Subject: [PATCH 53/58] Add patch for k4reccalorimeter --- packages/k4reccalorimeter/package.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/k4reccalorimeter/package.py b/packages/k4reccalorimeter/package.py index 2d70d0e8..cd5c543d 100644 --- a/packages/k4reccalorimeter/package.py +++ b/packages/k4reccalorimeter/package.py @@ -31,6 +31,11 @@ class K4reccalorimeter(CMakePackage, Key4hepPackage): depends_on("k4simgeant4") depends_on("py-onnxruntime") + patch( + "https://patch-diff.githubusercontent.com/raw/HEP-FCC/k4RecCalorimeter/pull/81.patch?full_index=1", + sha256="6366d91ed56b98d80f242a71641922653e72109de1c49b06bb979f04cb16c350", + ) + def cmake_args(self): args = [] args.append( From 5e2e31ad11f2d86fe1f024c5249fe680b0308105 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 14 May 2024 07:38:10 +0200 Subject: [PATCH 54/58] Fix sha256 --- packages/k4reccalorimeter/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/k4reccalorimeter/package.py b/packages/k4reccalorimeter/package.py index cd5c543d..2b47a040 100644 --- a/packages/k4reccalorimeter/package.py +++ b/packages/k4reccalorimeter/package.py @@ -33,7 +33,7 @@ class K4reccalorimeter(CMakePackage, Key4hepPackage): patch( "https://patch-diff.githubusercontent.com/raw/HEP-FCC/k4RecCalorimeter/pull/81.patch?full_index=1", - sha256="6366d91ed56b98d80f242a71641922653e72109de1c49b06bb979f04cb16c350", + sha256="a46d2fa00230d92e23788bf41870748c64c0a4ef2973bec3b26d1cf6dfc9c2db", ) def cmake_args(self): From f1ff3b7e7fa1c4ae85c7778ae039e7f04559516d Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 14 May 2024 10:23:55 +0200 Subject: [PATCH 55/58] Don't fail if the remote is already there --- .cherry-pick | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cherry-pick b/.cherry-pick index d2d88817..9942a564 100644 --- a/.cherry-pick +++ b/.cherry-pick @@ -1,4 +1,4 @@ -git remote add jmcarcell https://github.com/jmcarcell/spack +git remote add jmcarcell https://github.com/jmcarcell/spack || true git fetch jmcarcell -q # add a recent version of madgraph, remove when https://github.com/spack/spack/pull/41128 is merged From b28ade72c5eda3f9ade50d38999458843c6e60ea Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 14 May 2024 17:44:14 +0200 Subject: [PATCH 56/58] Build xrootd with the same cxxstd as ROOT --- environments/key4hep-common/packages.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/key4hep-common/packages.yaml b/environments/key4hep-common/packages.yaml index ecbb6afd..bee2f24e 100644 --- a/environments/key4hep-common/packages.yaml +++ b/environments/key4hep-common/packages.yaml @@ -45,7 +45,7 @@ packages: texlive: require: scheme=basic xrootd: - require: +krb5 + require: +krb5 cxxstd=20 # Use the system OpenGL as recommended by spack # See https://github.com/key4hep/key4hep-spack/issues/318 and From f4d5e024a26937fef79b00779a9df7f75f36a4d0 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 14 May 2024 21:13:36 +0200 Subject: [PATCH 57/58] Update setup scripts to work when there are multiple links in latest --- scripts/cvmfs/setup-nightlies.sh | 6 +++--- scripts/cvmfs/setup-releases.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/cvmfs/setup-nightlies.sh b/scripts/cvmfs/setup-nightlies.sh index 8dc7c94c..4feeb376 100644 --- a/scripts/cvmfs/setup-nightlies.sh +++ b/scripts/cvmfs/setup-nightlies.sh @@ -62,16 +62,16 @@ fi if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]] || [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="rhel"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"7* ]]; then os="centos7" - k4path=$(echo /cvmfs/sw-nightlies.hsf.org/key4hep/releases/$rel/*centos7*) + k4path=$(ls -rd /cvmfs/sw-nightlies.hsf.org/key4hep/releases/$rel/*centos7* | head -n1) echo "WARNING: CentOS 7 nightlies are not being built anymore and will be deleted soon, consider using AlmaLinux 9" elif [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="almalinux"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"9* ]] || [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="rhel"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"9* ]] || [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="rocky"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"9* ]]; then os="almalinux9" - k4path=$(echo /cvmfs/sw-nightlies.hsf.org/key4hep/releases/$rel/*almalinux9*) + k4path=$(ls -rd /cvmfs/sw-nightlies.hsf.org/key4hep/releases/$rel/*almalinux9* | head -n1) elif [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID=ubuntu' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="22.04"' ]]; then os="ubuntu22.04" - k4path=$(echo /cvmfs/sw-nightlies.hsf.org/key4hep/releases/$rel/*ubuntu22*) + k4path=$(ls -rd /cvmfs/sw-nightlies.hsf.org/key4hep/releases/$rel/*ubuntu22* | head -n1) else echo "Unsupported OS or OS couldn't be correctly detected, aborting..." echo "Supported OSes are: CentOS/RHEL 7, AlmaLinux/RockyLinux/RHEL 9, Ubuntu 22.04" diff --git a/scripts/cvmfs/setup-releases.sh b/scripts/cvmfs/setup-releases.sh index a1ea4aec..7b438f29 100644 --- a/scripts/cvmfs/setup-releases.sh +++ b/scripts/cvmfs/setup-releases.sh @@ -63,15 +63,15 @@ fi if [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="centos"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="7"' ]] || [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="rhel"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"7* ]]; then os="centos7" - k4path=$(echo /cvmfs/sw.hsf.org/key4hep/releases/$rel/*centos7*) + k4path=$(ls -rd /cvmfs/sw.hsf.org/key4hep/releases/$rel/*centos7* | head -n1) elif [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="almalinux"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"9* ]] || [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="rhel"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"9* ]] || [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID="rocky"' && "$(grep -E 'VERSION_ID' /etc/os-release)" = VERSION_ID=\"9* ]]; then os="almalinux9" - k4path=$(echo /cvmfs/sw.hsf.org/key4hep/releases/$rel/*almalinux9*) + k4path=$(ls -rd /cvmfs/sw.hsf.org/key4hep/releases/$rel/*almalinux9* | head -n1) elif [[ "$(grep -E '^ID=' /etc/os-release)" = 'ID=ubuntu' && "$(grep -E 'VERSION_ID' /etc/os-release)" = 'VERSION_ID="22.04"' ]]; then os="ubuntu22.04" - k4path=$(echo /cvmfs/sw.hsf.org/key4hep/releases/$rel/*ubuntu22*) + k4path=$(ls -rd /cvmfs/sw.hsf.org/key4hep/releases/$rel/*ubuntu22* | head -n1) else echo "Unsupported OS or OS couldn't be correctly detected, aborting..." echo "Supported OSes are: CentOS/RHEL 7, AlmaLinux/RockyLinux/RHEL 9, Ubuntu 22.04" From d5118f9cb71bde26ef9cb71ed09d4f1f30966ee7 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Tue, 14 May 2024 21:29:50 +0200 Subject: [PATCH 58/58] Add a few comments --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 87d071fd..7aff62ab 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,9 @@ repository](https://gitlab.cern.ch/key4hep/k4-deploy). Additionally, the file `.latest-commit` contains the latest commit of Spack used for the recent builds, which is updated from time to time to keep up with the -develop branch of Spack. +develop branch of Spack. In addition, the file `.cherry-pick` contains some +fixes needed to build the stack. These can also be found in the file +`.cherry-pick` that is shipped with every stack on cvmfs. ## Central Installations