Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Geant4] Update to version 10.6.9 #6327

Merged
merged 2 commits into from
Oct 22, 2020
Merged

[Geant4] Update to version 10.6.9 #6327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6877dc2
[Geant4] Update to version 10.6.9
mrodozov Oct 20, 2020
102b160
Update vector and arm patches
mrodozov Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions geant4.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### RPM external geant4 10.7.0.beta
%define tag 67ba86d073ec6366df0de75a0f5b5d57920d0b7e
%define branch master
%define github_user Geant4
### RPM external geant4 10.6.9
%define tag e8eb2b9a2c3c1f1e76008177e65c612f27cbdba4
%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

BuildRequires: cmake gmake
Expand Down
4 changes: 2 additions & 2 deletions vecgeom-fix-for-arm64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3014e9..f10fae0 100644
index a090c57..9726ebe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -317,6 +317,8 @@ elseif(Intel)
@@ -294,6 +294,8 @@ elseif(Intel)
list(APPEND CMAKE_CXX_FLAGS -std=c++11)
elseif(CMAKE_CXX_STANDARD STREQUAL 14)
list(APPEND CMAKE_CXX_FLAGS -std=c++14)
Expand Down
16 changes: 8 additions & 8 deletions vecgeom-fix-vector.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f5833f..d4bfd51 100644
index a090c57..7dbb121 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ option(USE_CACHED_TRANSFORMATIONS "Use cached transformations in navigation stat
option(FAST_MATH "Enable the -ffast-math compiler option in Release builds" OFF)

@@ -85,7 +85,7 @@ endif()
# - ISA
set(VECGEOM_ISAS empty)
if(CMAKE_SYSTEM_PROCESSOR MATCHES "(i686|x86_64)")
- set(VECGEOM_ARCH sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty)
+ set(VECGEOM_ARCH sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty arch=nehalem arch=sandybridge arch=haswell)
mrodozov marked this conversation as resolved.
Show resolved Hide resolved
else()
set(VECGEOM_ARCH empty)
- set(VECGEOM_ISAS sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty)
+ set(VECGEOM_ISAS sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty arch=nehalem arch=sandybridge arch=haswell)
endif()

enum_option(VECGEOM_VECTOR DOC "Vector instruction set to be used"
4 changes: 3 additions & 1 deletion vecgeom.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### RPM external vecgeom v1.1.7
Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
%define tag 982503b232bb2101a5257630335340fbd3eb9f78
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

Expand Down