Skip to content

Commit 13db6c9

Browse files
authored
Merge pull request #323 from trz42/nessi-2023.06-lammps-2023a
{2023.06}[foss/2023a] LAMMPS v2Aug2023_update2
2 parents 55e5bbf + 218dfa6 commit 13db6c9

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
easyconfigs:
22
- BWA-0.7.17-20220923-GCCcore-12.3.0.eb
33
- PyQt5-5.15.10-GCCcore-12.3.0.eb
4+
- LAMMPS-2Aug2023_update2-foss-2023a-kokkos.eb:
5+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/19471
6+
# see https://github.com/easybuilders/easybuild-easyblocks/pull/3036
7+
options:
8+
from-pr: 19471
9+
include-easyblocks-from-pr: 3036

eb_hooks.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,17 @@ def parse_hook_lammps_remove_deps_for_CI_aarch64(ec, *args, **kwargs):
308308
# we need this hook because we check for missing installations for all CPU targets
309309
# on an x86_64 VM in GitHub Actions (so condition based on ARCH in LAMMPS easyconfig is always true)
310310
ec['dependencies'] = [dep for dep in ec['dependencies'] if dep[0] not in ('ScaFaCoS', 'tbb')]
311+
# if optarch is GENERIC, we also set 'kokkos_arch' to 'ARMV80'
312+
# if not set the easyblock will run
313+
# "python -c 'from archspec.cpu import host; print(host())'"
314+
# which returns the host architecture which is then mapped to some
315+
# identifier corresponding to the architecture;
316+
# however, this may not be correct if we want to build for
317+
# `aarch64/generic`
318+
if build_option('optarch') == OPTARCH_GENERIC:
319+
ec['kokkos_arch'] = 'ARMV80'
320+
print_msg("Set kokkos_arch = 'ARMV80' (cpu family: %s, optarch: %s)",
321+
os.getenv('EESSI_CPU_FAMILY'), build_option('optarch'))
311322
else:
312323
raise EasyBuildError("LAMMPS-specific hook triggered for non-LAMMPS easyconfig?!")
313324

0 commit comments

Comments
 (0)