From 00cfa6c94b5bf4d399a1cfe28820d82bce30a6a5 Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Thu, 3 Oct 2024 11:09:45 +0200 Subject: [PATCH 1/3] 106a: prepare toolchains and CI --- .gitlab-ci.yml | 24 ++++++++----------- ...eptools-dev4.cmake => heptools-106a.cmake} | 0 ...ev4cuda.cmake => heptools-106a_cuda.cmake} | 2 +- ...devswan.cmake => heptools-106a_swan.cmake} | 2 +- 4 files changed, 12 insertions(+), 16 deletions(-) rename cmake/toolchain/{heptools-dev4.cmake => heptools-106a.cmake} (100%) rename cmake/toolchain/{heptools-dev4cuda.cmake => heptools-106a_cuda.cmake} (80%) rename cmake/toolchain/{heptools-devswan.cmake => heptools-106a_swan.cmake} (98%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8c967f8de..cbfe9da95e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,9 +28,8 @@ alma8: - PLATFORM: - alma8 LCG_VERSION: - - dev3 - - dev3cuda - - dev4cuda + - 106a + - 106a_cuda alma9: <<: *retry_policy @@ -51,12 +50,9 @@ alma9: - PLATFORM: - alma9 LCG_VERSION: - - dev3 - - dev4 - - dev3lhcb - - dev4lhcb - - devswan - - devAdePT + - 106a + - 106a_swan + - 106a_cuda ubuntu: <<: *retry_policy @@ -76,8 +72,8 @@ ubuntu: - ubuntu20 - ubuntu22 LCG_VERSION: - - dev4 - - dev4cuda + - 106a + - 106a_cuda special: <<: *retry_policy @@ -95,19 +91,19 @@ special: parallel: matrix: - LCG_VERSION: - - dev4 + - 106a BINARY_TAG: "arm64-mac12-clang140-opt" LCG_HOST_OS: "mac" LCG_HOST_OSVERS: "12" IS_APPLE: "ON" - LCG_VERSION: - - dev4 + - 106a BINARY_TAG: "arm64-mac13-clang140-opt" LCG_HOST_OS: "mac" LCG_HOST_OSVERS: "12" IS_APPLE: "ON" - LCG_VERSION: - - dev4 + - 106a BINARY_TAG: "aarch64-el9-gcc13-opt" LCG_HOST_OS: "alma" LCG_HOST_OSVERS: "9" diff --git a/cmake/toolchain/heptools-dev4.cmake b/cmake/toolchain/heptools-106a.cmake similarity index 100% rename from cmake/toolchain/heptools-dev4.cmake rename to cmake/toolchain/heptools-106a.cmake diff --git a/cmake/toolchain/heptools-dev4cuda.cmake b/cmake/toolchain/heptools-106a_cuda.cmake similarity index 80% rename from cmake/toolchain/heptools-dev4cuda.cmake rename to cmake/toolchain/heptools-106a_cuda.cmake index e405a9b344..d92503fbd2 100644 --- a/cmake/toolchain/heptools-dev4cuda.cmake +++ b/cmake/toolchain/heptools-106a_cuda.cmake @@ -1,3 +1,3 @@ #---List of externals---------------------------------------------- -include(heptools-dev4) +include(heptools-106a) include(cuda_package_config) diff --git a/cmake/toolchain/heptools-devswan.cmake b/cmake/toolchain/heptools-106a_swan.cmake similarity index 98% rename from cmake/toolchain/heptools-devswan.cmake rename to cmake/toolchain/heptools-106a_swan.cmake index 66b75f6f23..d5370a0f0d 100644 --- a/cmake/toolchain/heptools-devswan.cmake +++ b/cmake/toolchain/heptools-106a_swan.cmake @@ -1,6 +1,6 @@ #---List of externals set(LCG_PYTHON_VERSION 3) -include(heptools-dev3) +include(heptools-106a) LCG_external_package(java 11.0.24p8 ) -- GitLab From 11f42220cb8dbbea201b5af048963aca796f944d Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Thu, 3 Oct 2024 11:09:55 +0200 Subject: [PATCH 2/3] 106a: fix garfield++ --- cmake/toolchain/heptools-dev-base.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake index d8f2002847..3d1891a478 100644 --- a/cmake/toolchain/heptools-dev-base.cmake +++ b/cmake/toolchain/heptools-dev-base.cmake @@ -9,7 +9,9 @@ LCG_AA_project(HepMC 2.06.11) LCG_AA_project(Geant4 11.2.2) LCG_AA_project(Geant4-vecgeom-scalar 11.2.0) -LCG_AA_project(Garfield++ HEAD GIT=https://gitlab.cern.ch/garfield/garfieldpp.git) +#LCG_AA_project(Garfield++ HEAD GIT=https://gitlab.cern.ch/garfield/garfieldpp.git) +# commit from September 26 +LCG_AA_project(Garfield++ 9d53f104) if(${LCG_OS}${LCG_OSVERS} MATCHES centos|ubuntu|el) if(((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} GREATER 9)) OR (${LCG_COMP} MATCHES clang)) LCG_AA_project(Gaudi v38r3 GIT=https://gitlab.cern.ch/gaudi/Gaudi.git) -- GitLab From 663d7a377911da840f320544729b457b516db69f Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Thu, 3 Oct 2024 11:22:12 +0200 Subject: [PATCH 3/3] 106a: drop ginac from macOS --- cmake/toolchain/heptools-macos.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/toolchain/heptools-macos.cmake b/cmake/toolchain/heptools-macos.cmake index 4b640a3365..521801aacd 100644 --- a/cmake/toolchain/heptools-macos.cmake +++ b/cmake/toolchain/heptools-macos.cmake @@ -79,6 +79,7 @@ if(APPLE) if(LCG_ARCH MATCHES arm64) LCG_remove_package(nlox) + LCG_remove_package(ginac) LCG_remove_package(gosam) LCG_remove_package(gosam_contrib) LCG_remove_package(madgraph5amc) -- GitLab