Skip to content

Commit c0a3f2d

Browse files
committed
Merge branch 'LAMMPS_hook' into test_LAMMPS_HOOK
2 parents f4b0dc5 + fa18458 commit c0a3f2d

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

eb_hooks.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -933,25 +933,25 @@ def pre_configure_hook_LAMMPS_zen4_and_Aarch64_cuda(self, *args, **kwargs):
933933
"""
934934
pre-configure hook for LAMMPS:
935935
- set kokkos_arch on x86_64/amd/zen4
936-
- Disable SIMD for Aarch64 + cuda builds
936+
- Disable SIMD for Aarch64 + cuda builds
937937
"""
938-
938+
939939
# Get cpu_target for zen4 hook
940940
cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
941-
941+
942942
# Get the dependencies to check CUDA
943943
deps = self.cfg.dependencies()
944944
cuda_versions = ('12.1.1')
945-
945+
946946
if self.name == 'LAMMPS':
947947

948-
# Set kokkos_arch for LAMMPS version which do not have support for versions that do not support ZEN4
948+
# Set kokkos_arch for LAMMPS version which do not have support for versions that do not support ZEN4
949949
if self.version in ('2Aug2023_update2', '2Aug2023_update4', '29Aug2024'):
950950
if get_cpu_architecture() == X86_64:
951951
if cpu_target == CPU_TARGET_ZEN4:
952952
# There is no support for ZEN4 in LAMMPS yet so falling back to ZEN3
953953
self.cfg['kokkos_arch'] = 'ZEN3'
954-
954+
955955
# Disable SIMD for specific CUDA versions
956956
if self.version == '2Aug2023_update2':
957957
if get_cpu_architecture() == AARCH64:
@@ -961,12 +961,12 @@ def pre_configure_hook_LAMMPS_zen4_and_Aarch64_cuda(self, *args, **kwargs):
961961
if dep['version'] in cuda_version:
962962
cxxflags = os.getenv('CXXFLAGS', '')
963963
cxxflags = cxxflags.replace('-mcpu=native', '')
964-
# All ARM targets of 2Aug2023_update are build with ARMV80 or ARM81.
964+
# All ARM targets of 2Aug2023_update are build with ARMV80 or ARM81.
965965
# This is not the case for newer versions.
966966
cxxflags += ' -march=armv8-a+nosimd'
967967
self.log.info("Setting CXXFLAGS to disable NEON: %s", cxxflags)
968968
env.setvar('CXXFLAGS', cxxflags)
969-
969+
970970
else:
971971
raise EasyBuildError("LAMMPS-specific hook triggered for non-LAMMPS easyconfig?!")
972972

0 commit comments

Comments
 (0)