From 900ea859d96cc9da2466da89f28fc22eb73861b3 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Tue, 9 Jun 2026 17:43:34 +0200 Subject: [PATCH 1/2] Enable building with cuda for el9_amd64_gcc15 --- config.map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.map b/config.map index 5281dc3039d6..1578e7b6ba7f 100644 --- a/config.map +++ b/config.map @@ -22,7 +22,7 @@ SCRAM_ARCH=el9_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/ro SCRAM_ARCH=el9_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/rootmodule;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_CXXMODULE_X;DOCKER_IMG=cmssw;BUILD_DAY=1,5;BUILD_HOUR=23;DEBUG_EXTERNALS=root; SCRAM_ARCH=el10_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda,estats; SCRAM_ARCH=fc42_riscv64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda:tensorflow:valgrind:openloops:acts,system:rpm:autotools:gcc,builders:1; -SCRAM_ARCH=el9_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=estats,cpp23,without:cuda,microarchs:x86-64-v2; +SCRAM_ARCH=el9_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=estats,cpp23,microarchs:x86-64-v2; SCRAM_ARCH=el9_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/root640-gcc15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_ROOT640_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;BUILD_OPTS=estats,cpp23,without:cuda,microarchs:x86-64-v2; SCRAM_ARCH=el9_amd64_gcc16;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/gcc16;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=estats,cpp23,without:cuda,microarchs:x86-64-v2; SCRAM_ARCH=el9_amd64_gcc14;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g14;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_CPP23_X;DOCKER_IMG=cmssw;BUILD_HOUR=11;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda,microarchs:x86-64-v2,estats; From cd46f4ad19f8404ce950410d017a1653aa3abb28 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 17 Jun 2026 10:16:03 +0200 Subject: [PATCH 2/2] el9/gcc15 with default c++20 and enable c++23 for el9/gcc14 --- config.map | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.map b/config.map index 5f9564c1cd0c..e3858b5ff683 100644 --- a/config.map +++ b/config.map @@ -20,12 +20,12 @@ SCRAM_ARCH=el9_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/ro SCRAM_ARCH=el9_aarch64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/rootmaster;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_ROOT6_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_OPTS=estats; SCRAM_ARCH=el9_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/root640;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_ROOT640_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;PR_TESTS=1;BUILD_DAY=1,3,5;BUILD_OPTS=estats; SCRAM_ARCH=el9_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/rootmodule;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_CXXMODULE_X;DOCKER_IMG=cmssw;BUILD_DAY=1,5;BUILD_HOUR=23;DEBUG_EXTERNALS=root; -SCRAM_ARCH=el9_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=estats,cpp23,microarchs:x86-64-v2; +SCRAM_ARCH=el9_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=estats,microarchs:x86-64-v2; SCRAM_ARCH=el9_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/root640-gcc15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_ROOT640_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;BUILD_OPTS=estats,cpp23,without:cuda,microarchs:x86-64-v2; SCRAM_ARCH=el10_amd64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda,estats; SCRAM_ARCH=fc42_riscv64_gcc15;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g15;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda:tensorflow:valgrind:openloops:acts,system:rpm:autotools:gcc,builders:1; SCRAM_ARCH=el9_amd64_gcc16;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/gcc16;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=23;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=estats,cpp23,without:cuda,microarchs:x86-64-v2; -SCRAM_ARCH=el9_amd64_gcc14;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g14;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_CPP23_X;DOCKER_IMG=cmssw;BUILD_HOUR=11;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,without:cuda,microarchs:x86-64-v2,estats; +SCRAM_ARCH=el9_amd64_gcc14;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g14;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_CPP23_X;DOCKER_IMG=cmssw;BUILD_HOUR=11;BUILD_DAY=2,4;IB_ONLY=1;BUILD_OPTS=cpp23,microarchs:x86-64-v2,estats; SCRAM_ARCH=el9_amd64_gcc14;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g14;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=11;BUILD_OPTS=microarchs:x86-64-v2; SCRAM_ARCH=el8_aarch64_gcc14;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_1_X/g14;RELEASE_BRANCH=master;RELEASE_QUEUE=CMSSW_20_1_X;DOCKER_IMG=cmssw;BUILD_HOUR=11;BUILD_DAY=2,4;IB_ONLY=1;DISABLED=1;IB_WEB_PAGE=1; SCRAM_ARCH=el8_amd64_gcc13;PKGTOOLS_TAG=V00-34-XX;CMSDIST_TAG=IB/CMSSW_20_0_X/master;RELEASE_BRANCH=CMSSW_20_0_X;RELEASE_QUEUE=CMSSW_20_0_X;DOCKER_IMG=cmssw;BUILD_PATCH_RELEASE=1;ADDITIONAL_TESTS=HLT,clang-analyzer,static-checks,fwlite,iwyu,lizard,flawfinder,check-headers,cfipython,invalid-includes,profiling,crab,hlt-p2-timing,class-versions,gpu-relvals,gpu-qa,rntuple;PR_TESTS=1;PROD_ARCH=1;PRS_TEST_CLANG=1;REQUIRED_TEST=true;BUILD_OPTS=microarchs:x86-64-v2;