Skip to content

Commit 9ec0cad

Browse files
authored
Merge pull request #630 from laraPPr/Add_CP2K
{2023.06}[foss/2023a] CP2K 2023.1
2 parents 10a6d15 + 33d0374 commit 9ec0cad

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ easyconfigs:
2222
from-commit: dbdaacc0739fdee91baa9123864ea4428cf21273
2323
# see https://github.com/easybuilders/easybuild-easyblocks/pull/3338
2424
include-easyblocks-from-commit: 32e45bd1f2d916732ca5852d55d17fa4d99e388b
25+
- CP2K-2023.1-foss-2023a.eb:
26+
options:
27+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/20951
28+
from-commit: a92667fe32396bbd4106243658625f7ff2adcd68

eb_hooks.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,22 @@ def parse_hook_lammps_remove_deps_for_CI_aarch64(ec, *args, **kwargs):
299299
raise EasyBuildError("LAMMPS-specific hook triggered for non-LAMMPS easyconfig?!")
300300

301301

302+
def parse_hook_CP2K_remove_deps_for_aarch64(ec, *args, **kwargs):
303+
"""
304+
Remove x86_64 specific dependencies for the CI and missing installations to pass on aarch64
305+
"""
306+
if ec.name == 'CP2K' and ec.version in ('2023.1',):
307+
if os.getenv('EESSI_CPU_FAMILY') == 'aarch64':
308+
# LIBXSMM is not supported on ARM with GCC 12.2.0 and 12.3.0
309+
# See https://www.cp2k.org/dev:compiler_support
310+
# See https://github.com/easybuilders/easybuild-easyconfigs/pull/20951
311+
# we need this hook because we check for missing installations for all CPU targets
312+
# on an x86_64 VM in GitHub Actions (so condition based on ARCH in LAMMPS easyconfig is always true)
313+
ec['dependencies'] = [dep for dep in ec['dependencies'] if dep[0] not in ('libxsmm',)]
314+
else:
315+
raise EasyBuildError("CP2K-specific hook triggered for non-CP2K easyconfig?!")
316+
317+
302318
def pre_prepare_hook_highway_handle_test_compilation_issues(self, *args, **kwargs):
303319
"""
304320
Solve issues with compiling or running the tests on both
@@ -726,6 +742,7 @@ def inject_gpu_property(ec):
726742
'CGAL': parse_hook_cgal_toolchainopts_precise,
727743
'fontconfig': parse_hook_fontconfig_add_fonts,
728744
'LAMMPS': parse_hook_lammps_remove_deps_for_CI_aarch64,
745+
'CP2K': parse_hook_CP2K_remove_deps_for_aarch64,
729746
'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,
730747
'pybind11': parse_hook_pybind11_replace_catch2,
731748
'Qt5': parse_hook_qt5_check_qtwebengine_disable,

0 commit comments

Comments
 (0)