Skip to content

Commit

Permalink
sync local branch with target
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Top committed Oct 10, 2023
2 parents f8cadf0 + 29a3433 commit bf65b7d
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 0 deletions.
24 changes: 24 additions & 0 deletions eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
from distutils.version import LooseVersion


CPU_TARGET_NEOVERSE_V1 = 'aarch64/neoverse_v1'


EESSI_RPATH_OVERRIDE_ATTR = 'orig_rpath_override_dirs'


Expand Down Expand Up @@ -248,6 +251,23 @@ 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_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).
In previous versions we were not as strict yet on the numpy/SciPy tests
"""
cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
if self.name == 'SciPy-bundle' and self.version == '2021.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 @@ -265,3 +285,7 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs):
'OpenBLAS': pre_configure_hook_openblas_optarch_generic,
'WRF': pre_configure_hook_wrf_aarch64,
}

PRE_TEST_HOOKS = {
'SciPy-bundle': pre_test_hook_ignore_failing_tests_SciPybundle,
}
43 changes: 43 additions & 0 deletions eessi-2023.06-eb-4.8.1-2022a.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,47 @@ easyconfigs:
# avoid that hardcoded paths like /usr/include are used in build commands
options:
from-pr: 18881
- Boost.Python-1.79.0-GCC-11.3.0.eb
- netCDF-4.9.0-gompi-2022a.eb:
# use updated CMakeMake easyblock to avoid that -DCMAKE_SKIP_RPATH=ON is used, which breaks the netCDF test step
# see https://github.com/easybuilders/easybuild-easyblocks/pull/3012
options:
include-easyblocks-from-pr: 3012
- NCO-5.1.0-foss-2022a.eb
- AdapterRemoval-2.3.3-GCC-11.3.0.eb
- BEDTools-2.30.0-GCC-11.3.0.eb
- Pysam-0.20.0-GCC-11.3.0.eb
- TransDecoder-5.5.0-GCC-11.3.0.eb
- VCFtools-0.1.16-GCC-11.3.0.eb
- XML-LibXML-2.0207-GCCcore-11.3.0.eb
- CMake-3.24.3-GCCcore-11.3.0.eb
- elfutils-0.187-GCCcore-11.3.0.eb
- Ninja-1.10.2-GCCcore-11.3.0.eb
- Z3-4.10.2-GCCcore-11.3.0.eb
- SciPy-bundle-2022.05-foss-2022a.eb
- Xvfb-21.1.3-GCCcore-11.3.0.eb:
# enable exec permissions for xvfb-run after copying;
# need to also enable user write permissions on xvfb-run to ensure that copying with preserved permissions works
options:
from-pr: 18834
- tbb-2021.5.0-GCCcore-11.3.0.eb
- CMSeq-1.0.4-foss-2022a.eb
- Pango-1.50.7-GCCcore-11.3.0.eb
- nodejs-16.15.1-GCCcore-11.3.0.eb:
options:
download-timeout: 1000
- ecCodes-2.27.0-gompi-2022a.eb:
options:
download-timeout: 1000
- GLPK-5.0-GCCcore-11.3.0.eb
- libgit2-1.4.3-GCCcore-11.3.0.eb
- libGLU-9.0.2-GCCcore-11.3.0.eb
- libsndfile-1.1.0-GCCcore-11.3.0.eb
- LibTIFF-4.3.0-GCCcore-11.3.0.eb
- MPFR-4.1.0-GCCcore-11.3.0.eb
- NLopt-2.7.1-GCCcore-11.3.0.eb
- PCRE2-10.40-GCCcore-11.3.0.eb
- Tk-8.6.12-GCCcore-11.3.0.eb
- GROMACS-2023.1-foss-2022a.eb
- MUMPS-5.5.1-foss-2022a-metis.eb
- ASE-3.22.1-foss-2022a.eb

0 comments on commit bf65b7d

Please sign in to comment.