From ff4bac4d711f46379a15068d0e19cc943b7c9396 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 29 Mar 2023 14:12:43 +0200 Subject: [PATCH 1/2] Update G4 11.1.1, vecgeom 1.2.1, clhep 2.4.6 and G4-data --- clhep.spec | 4 +-- cmssw-tool-conf.spec | 1 - geant4-G4EMLOW.spec | 2 +- geant4-G4PARTICLEXS.spec | 2 +- geant4.spec | 11 +++++---- scram-tools.file/tools/geant4/geant4vis.xml | 1 - scram-tools.file/tools/vecgeom/vecgeom.xml | 2 +- vecgeom.spec | 27 ++++++++++++--------- 8 files changed, 26 insertions(+), 24 deletions(-) diff --git a/clhep.spec b/clhep.spec index 142a138ec84..b712467baa3 100644 --- a/clhep.spec +++ b/clhep.spec @@ -1,6 +1,6 @@ -### RPM external clhep 2.4.5.1 +### RPM external clhep 2.4.6.0 -%define tag f256fe37039681f7856f0e324ccf9337cdc35b51 +%define tag 06b39fc5f06924728af27f6b0df1ffdac174dff3 %define branch cms/v%{realversion} %define github_user cms-externals Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec index 85b0872800b..825ce990f68 100644 --- a/cmssw-tool-conf.spec +++ b/cmssw-tool-conf.spec @@ -121,7 +121,6 @@ Requires: opencl-cpp Requires: qd Requires: blackhat Requires: sherpa -Requires: geant4-parfullcms Requires: fasthadd Requires: eigen Requires: gdb diff --git a/geant4-G4EMLOW.spec b/geant4-G4EMLOW.spec index c77884a2fe5..cce98cd813e 100644 --- a/geant4-G4EMLOW.spec +++ b/geant4-G4EMLOW.spec @@ -1,4 +1,4 @@ -### RPM external geant4-G4EMLOW 7.13 +### RPM external geant4-G4EMLOW 8.2 %define G4RunTime G4LEDATA %define source0 https://geant4-data.web.cern.ch/datasets/G4EMLOW.%{realversion}.tar.gz diff --git a/geant4-G4PARTICLEXS.spec b/geant4-G4PARTICLEXS.spec index c7400273470..98a78194d98 100644 --- a/geant4-G4PARTICLEXS.spec +++ b/geant4-G4PARTICLEXS.spec @@ -1,4 +1,4 @@ -### RPM external geant4-G4PARTICLEXS 3.1.1 +### RPM external geant4-G4PARTICLEXS 4.0 %define G4RunTime G4PARTICLEXSDATA %define source0 https://geant4-data.web.cern.ch/datasets/G4PARTICLEXS.%{realversion}.tar.gz diff --git a/geant4.spec b/geant4.spec index 96f28bdf13d..fd58e15f7e6 100644 --- a/geant4.spec +++ b/geant4.spec @@ -1,11 +1,11 @@ -### RPM external geant4 10.7.2 +### RPM external geant4 11.1.1 ## INCLUDE compilation_flags ## INCLUDE compilation_flags_lto %define use_vecgeom 1 -%define tag 0aeb9c66fceb9ae0f66b91721783fd35a8dffa52 +%define tag 35f304cde19a3e2dfe3bb941d4fc76c2fe45fa26 %define branch cms/v%{realversion} %define github_user cms-externals -Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz +Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz BuildRequires: cmake gmake @@ -49,12 +49,13 @@ cmake ../%{n}.%{realversion} \ -DCMAKE_AR=$(which gcc-ar) \ -DCMAKE_RANLIB=$(which gcc-ranlib) \ -DCMAKE_INSTALL_PREFIX:PATH="%i" \ + -DCMAKE_CXX_STANDARD:STRING="17" \ -DCMAKE_BUILD_TYPE=Release \ -DGEANT4_USE_GDML=ON \ - -DGEANT4_BUILD_CXXSTD:STRING="17" \ -DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \ -DGEANT4_ENABLE_TESTING=OFF \ -DGEANT4_BUILD_VERBOSE_CODE=OFF \ + -DGEANT4_BUILD_BUILTIN_BACKTRACE=OFF \ %if %{use_vecgeom} -DGEANT4_USE_USOLIDS="all" \ %endif @@ -63,7 +64,7 @@ cmake ../%{n}.%{realversion} \ -DGEANT4_INSTALL_EXAMPLES=OFF \ -DGEANT4_USE_SYSTEM_CLHEP=ON \ -DGEANT4_USE_SYSTEM_EXPAT=ON \ - -DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT};${VECGEOM_ROOT}" \ + -DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT};${VECGEOM_ROOT};${VECCORE_ROOT}" \ -DGEANT4_USE_SYSTEM_ZLIB=ON \ -DGEANT4_BUILD_MULTITHREADED=ON diff --git a/scram-tools.file/tools/geant4/geant4vis.xml b/scram-tools.file/tools/geant4/geant4vis.xml index c53baa6bd1d..85b945a1024 100644 --- a/scram-tools.file/tools/geant4/geant4vis.xml +++ b/scram-tools.file/tools/geant4/geant4vis.xml @@ -5,7 +5,6 @@ - diff --git a/scram-tools.file/tools/vecgeom/vecgeom.xml b/scram-tools.file/tools/vecgeom/vecgeom.xml index d66a3f63229..ecae7d0d7c1 100644 --- a/scram-tools.file/tools/vecgeom/vecgeom.xml +++ b/scram-tools.file/tools/vecgeom/vecgeom.xml @@ -3,7 +3,7 @@ - + diff --git a/vecgeom.spec b/vecgeom.spec index 57e9be229ef..a8c646a94f2 100644 --- a/vecgeom.spec +++ b/vecgeom.spec @@ -1,11 +1,11 @@ -### RPM external vecgeom v1.1.17 +### RPM external vecgeom v1.2.1 ## INCLUDE compilation_flags ## INCLUDE compilation_flags_lto -%define tag ed9a40412c354652262ec80af449f5531206e52c +%define tag 12fc8ba12efe93de5aaa9ff8e51e093ae93a1633 Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz BuildRequires: cmake gmake %define keep_archives true - +%define vecgeom_backend Scalar Patch0: vecgeom-fix-vector %prep @@ -20,24 +20,27 @@ cd ../build cmake ../%{n}-%{realversion} \ -DCMAKE_INSTALL_PREFIX=%{i} \ - -DCMAKE_INSTALL_LIBDIR=%{i}/lib \ - -DROOT=OFF \ + -DCMAKE_CXX_STANDARD:STRING="17" \ -DCMAKE_AR=$(which gcc-ar) \ -DCMAKE_RANLIB=$(which gcc-ranlib) \ -DCMAKE_BUILD_TYPE=Release \ - -DNO_SPECIALIZATION=ON \ - -DBACKEND=Scalar \ -%ifarch x86_64 - -DVECGEOM_VECTOR=sse3 \ -%endif + -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_CXX_STANDARD=17 \ %if "%{?arch_build_flags}" -DCMAKE_CXX_FLAGS="%{arch_build_flags} %{lto_build_flags}" \ %else -DCMAKE_CXX_FLAGS="%{lto_build_flags}" \ %endif - -DGEANT4=OFF +%ifarch x86_64 +%if "%{vecgeom_backend}" == "Vc" + -DVECGEOM_VECTOR=sse3 \ +%endif +%endif + -DVECGEOM_NO_SPECIALIZATION=ON \ + -DVECGEOM_BUILTIN_VECCORE=ON \ + -DVECGEOM_BACKEND=%{vecgeom_backend} \ + -DVECGEOM_GEANT4=OFF \ + -DVECGEOM_ROOT=OFF make %{makeprocesses} VERBOSE=1 From 6a6640b51a2d772974f0615c2b796e67ad17d90b Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 29 Mar 2023 14:19:49 +0200 Subject: [PATCH 2/2] remove un-used VECCORE_ROOT --- geant4.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geant4.spec b/geant4.spec index fd58e15f7e6..d06fd4c1246 100644 --- a/geant4.spec +++ b/geant4.spec @@ -64,7 +64,7 @@ cmake ../%{n}.%{realversion} \ -DGEANT4_INSTALL_EXAMPLES=OFF \ -DGEANT4_USE_SYSTEM_CLHEP=ON \ -DGEANT4_USE_SYSTEM_EXPAT=ON \ - -DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT};${VECGEOM_ROOT};${VECCORE_ROOT}" \ + -DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT};${VECGEOM_ROOT}" \ -DGEANT4_USE_SYSTEM_ZLIB=ON \ -DGEANT4_BUILD_MULTITHREADED=ON