Skip to content

Commit

Permalink
Merge pull request #310 from casparvl/foss_2022a
Browse files Browse the repository at this point in the history
{2023.06} foss/2022a
  • Loading branch information
boegel authored Sep 27, 2023
2 parents f9a0f77 + acf6b94 commit f0ea37a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test_eessi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
- eessi-2023.06-eb-4.8.0-2021b.yml
- eessi-2023.06-eb-4.8.1-system.yml
- eessi-2023.06-eb-4.8.1-2021b.yml
- eessi-2023.06-eb-4.8.1-2022a.yml
steps:
- name: Check out software-layer repository
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
Expand Down
10 changes: 10 additions & 0 deletions eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,15 @@ def pre_test_hook_ignore_failing_tests_SciPybundle(self, *args, **kwargs):
self.cfg['testopts'] = "|| echo ignoring failing tests"


def pre_test_hook_ignore_failing_tests_FFTWMPI(self, *args, **kwargs):
"""
Pre-test hook for FFTW.MPI: skip failing tests for FFTW.MPI 3.3.10 on neoverse_v1
cfr. https://github.com/EESSI/software-layer/issues/325
"""
cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
if self.name == 'FFTW.MPI' and self.version == '3.3.10' and cpu_target == 'aarch64/neoverse_v1':
self.cfg['testopts'] = "|| echo ignoring failing tests"

PARSE_HOOKS = {
'CGAL': parse_hook_cgal_toolchainopts_precise,
'fontconfig': parse_hook_fontconfig_add_fonts,
Expand All @@ -295,4 +304,5 @@ def pre_test_hook_ignore_failing_tests_SciPybundle(self, *args, **kwargs):

PRE_TEST_HOOKS = {
'SciPy-bundle': pre_test_hook_ignore_failing_tests_SciPybundle,
'FFTW.MPI': pre_test_hook_ignore_failing_tests_FFTWMPI,
}
7 changes: 7 additions & 0 deletions eessi-2023.06-eb-4.8.1-2022a.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
easyconfigs:
- OpenBLAS-0.3.20-GCC-11.3.0:
# use easyconfig that includes patch to fix detection of Neoverse V1 CPUs,
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/18870
options:
from-pr: 18870
- foss-2022a

0 comments on commit f0ea37a

Please sign in to comment.