hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gromacs: fix CPU optimizations detection (simd=auto) (#12354)

Browse source 
* SL-637
* https://redmine.gromacs.org/issues/2927
* tested with cmake 3.14.4 and 3.15.1
This commit is contained in:
Ricardo Silva 2019-08-10 04:38:16 +02:00 committed by Adam J. Stewart
parent 7cc57d74e4
commit c5849ce04f
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
var/spack/repos/builtin/packages/gromacs/gmxDetectCpu-cmake-3.14.patch Normal file
View file

@ -0,0 +1,12 @@
/cmake/gmxDetectCpu.cmake
+++ b/cmake/gmxDetectCpu.cmake
@@ -83,7 +83,7 @@ function(gmx_run_cpu_detection TYPE)
set(GCC_INLINE_ASM_DEFINE "-DGMX_X86_GCC_INLINE_ASM=0")
endif()
- set(_compile_definitions "${GCC_INLINE_ASM_DEFINE} -I${PROJECT_SOURCE_DIR}/src -DGMX_CPUINFO_STANDALONE ${GMX_STDLIB_CXX_FLAGS} -DGMX_TARGET_X86=${GMX_TARGET_X86_VALUE}")
+ set(_compile_definitions ${GCC_INLINE_ASM_DEFINE} -I${PROJECT_SOURCE_DIR}/src -DGMX_CPUINFO_STANDALONE ${GMX_STDLIB_CXX_FLAGS} -DGMX_TARGET_X86=${GMX_TARGET_X86_VALUE})
set(LINK_LIBRARIES "${GMX_STDLIB_LIBRARIES}")
try_compile(CPU_DETECTION_COMPILED
"${PROJECT_BINARY_DIR}"

2
var/spack/repos/builtin/packages/gromacs/package.py
View file

@ -74,6 +74,8 @@ class Gromacs(CMakePackage):
depends_on('cmake@3.4.3:3.99.99', type='build', when='@2018:') depends_on('cmake@3.4.3:3.99.99', type='build', when='@2018:')
depends_on('cuda', when='+cuda') depends_on('cuda', when='+cuda')
patch('gmxDetectCpu-cmake-3.14.patch', when='^cmake@3.14.0:')
def patch(self): def patch(self):
if '+plumed' in self.spec: if '+plumed' in self.spec:
self.spec['plumed'].package.apply_patch(self) self.spec['plumed'].package.apply_patch(self)