Skip to content

Commit

Permalink
Update vector and arm patches
Browse files Browse the repository at this point in the history
  • Loading branch information
mrodozov committed Oct 21, 2020
1 parent 6877dc2 commit 102b160
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions vecgeom-fix-for-arm64.patch
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
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)
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
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

0 comments on commit 102b160

Please sign in to comment.