Skip to content

Commit

Permalink
Merge pull request #331 from maxim-masterov/espresso
Browse files Browse the repository at this point in the history
{2023.06}[foss/2022a] ESPResSo v4.2.1
  • Loading branch information
boegel authored Oct 11, 2023
2 parents 860f935 + cd5cea9 commit 332d9d2
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 20 deletions.
2 changes: 1 addition & 1 deletion EESSI-pilot-install-software.sh
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ fi
pr_diff=$(ls [0-9]*.diff | head -1)

# use PR patch file to determine in which easystack files stuff was added
for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^eessi.*yml$'); do
for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep '^eessi.*yml$' | egrep -v 'known-issues|missing'); do

echo -e "Processing easystack file ${easystack_file}...\n\n"

Expand Down
35 changes: 24 additions & 11 deletions eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ def pre_configure_hook_metabat_filtered_zlib_dep(self, *args, **kwargs):
else:
raise EasyBuildError("MetaBAT-specific hook triggered for non-MetaBAT easyconfig?!")


def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
"""
Pre-configure hook for WRF:
Expand All @@ -266,11 +267,32 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
else:
raise EasyBuildError("WRF-specific hook triggered for non-WRF easyconfig?!")


def pre_test_hook(self,*args, **kwargs):
"""Main pre-test hook: trigger custom functions based on software name."""
if self.name in PRE_TEST_HOOKS:
PRE_TEST_HOOKS[self.name](self, *args, **kwargs)


def pre_test_hook_ignore_failing_tests_ESPResSo(self, *args, **kwargs):
"""
Pre-test hook for ESPResSo: skip failing tests, tests frequently timeout due to known bugs in ESPResSo v4.2.1
cfr. https://github.com/EESSI/software-layer/issues/363
"""
if self.name == 'ESPResSo' and self.version == '4.2.1':
self.cfg['testopts'] = "|| echo 'ignoring failing tests (probably due to timeouts)'"


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 == CPU_TARGET_NEOVERSE_V1:
self.cfg['testopts'] = "|| echo ignoring failing tests"


def pre_test_hook_ignore_failing_tests_SciPybundle(self, *args, **kwargs):
"""
Pre-test hook for SciPy-bundle: skip failing tests for SciPy-bundle 2021.10 (currently the only version that is failing).
Expand Down Expand Up @@ -307,16 +329,6 @@ def pre_single_extension_isoband(ext, *args, **kwargs):
ext.cfg['preinstallopts'] = "sed -i 's/SIGSTKSZ/32768/g' src/testthat/vendor/catch.h && "


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 == CPU_TARGET_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 @@ -337,8 +349,9 @@ def pre_test_hook_ignore_failing_tests_FFTWMPI(self, *args, **kwargs):
}

PRE_TEST_HOOKS = {
'SciPy-bundle': pre_test_hook_ignore_failing_tests_SciPybundle,
'ESPResSo': pre_test_hook_ignore_failing_tests_ESPResSo,
'FFTW.MPI': pre_test_hook_ignore_failing_tests_FFTWMPI,
'SciPy-bundle': pre_test_hook_ignore_failing_tests_SciPybundle,
}

PRE_SINGLE_EXTENSION_HOOKS = {
Expand Down
5 changes: 4 additions & 1 deletion eessi-2023.06-eb-4.8.1-2022a.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ easyconfigs:
from-pr: 18870
- foss-2022a
- SciPy-bundle-2022.05-foss-2022a
- BAMM-2.5.0-foss-2022a.eb
- BAMM-2.5.0-foss-2022a.eb
- ESPResSo-4.2.1-foss-2022a:
options:
from-pr: 18963
22 changes: 15 additions & 7 deletions eessi-2023.06-known-issues.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
- x86_64/*:
- ESPResSo-4.2.1-foss-2022a:
- issue: https://github.com/EESSI/software-layer/issues/363
- info: "Failing tests in ESPResSo v4.2.1 due to timeouts"
- aarch64/*:
- ESPResSo-4.2.1-foss-2022a:
- issue: https://github.com/EESSI/software-layer/issues/363
- info: "Failing tests in ESPResSo v4.2.1 due to timeouts"
- aarch64/neoverse_v1:
- FFTW/3.3.10-GCC-11.3.0:
- FFTW-3.3.10-GCC-11.3.0:
- issue: https://github.com/EESSI/software-layer/issues/325
- info: "Flaky FFTW tests, random failures"
- FFTW/3.3.10-gompi-2021b:
- FFTW-3.3.10-gompi-2021b:
- issue: https://github.com/EESSI/software-layer/issues/325
- info: "Flaky FFTW tests, random failures"
- OpenBLAS/0.3.18-GCC-11.2.0:
- OpenBLAS-0.3.18-GCC-11.2.0:
- issue: https://github.com/EESSI/software-layer/issues/314
- info: "Increased number of non-numerical failures in OpenBLAS test suite (238 vs max. 150 on x86_64/*)"
- OpenBLAS/0.3.20-GCC-11.3.0:
- OpenBLAS-0.3.20-GCC-11.3.0:
- issue: https://github.com/EESSI/software-layer/issues/314
- info: "Increased number of non-numerical failures in OpenBLAS test suite (238 vs max. 150 on x86_64/*)"
- OpenBLAS/0.3.21-GCC-12.2.0:
- OpenBLAS-0.3.21-GCC-12.2.0:
- issue: https://github.com/EESSI/software-layer/issues/314
- info: "Increased number of non-numerical failures in OpenBLAS test suite (344 vs max. 150 on x86_64/*)"
- SciPy-bundle/2021.05-foss-2021a:
- SciPy-bundle-2021.05-foss-2021a:
- issue: https://github.com/EESSI/software-layer/issues/318
- info: "2 failing tests (vs 30554 passed) in scipy test suite"
- SciPy-bundle/2021.10-foss-2021b:
- SciPy-bundle-2021.10-foss-2021b:
- issue: https://github.com/EESSI/software-layer/issues/318
- info: "20 failing tests (vs 14429 passed) in numpy test suite + 55 failing tests (vs 32438 passed) in scipy test suite"

0 comments on commit 332d9d2

Please sign in to comment.