Skip to content

Commit

Permalink
added the OpenBabel eb in eessi-2023.06-eb-4.8.2-2022a.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Top committed Nov 4, 2023
2 parents 72ad553 + 43e4262 commit bec54e4
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test_eessi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
EESSI_VERSION:
- 2023.06
EESSI_SOFTWARE_SUBDIR:
- aarch64/generic
# - aarch64/generic
- x86_64/amd/zen2
- x86_64/intel/broadwell
- x86_64/intel/cascadelake
# - x86_64/intel/cascadelake
- x86_64/intel/skylake_avx512
- x86_64/generic
EASYSTACK_FILE:
Expand Down
18 changes: 18 additions & 0 deletions eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,23 @@ def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix):
raise EasyBuildError("OpenBLAS-specific hook triggered for non-OpenBLAS easyconfig?!")


def parse_hook_pillow_set_cpath_library_path(ec, eprefix):
"""Extend CPATH and LIBRARY_PATH environment variables using EESSI_EPREFIX."""
if ec.name == 'Pillow':
EESSI_CPATH = os.getenv('EESSI_EPREFIX') + '/usr/include'
EESSI_LIB_PATH = os.getenv('EESSI_EPREFIX') + '/usr/lib64'
print_msg("NOTE: Pillow has zlib as a dependancy, The original CPATH value: (%s) has been extended with (%s)",
os.getenv('CPATH'), EESSI_CPATH)
print_msg("NOTE: Pillow has zlib as a dependancy, The original LIBRARY_PATH value: (%s) has been extended with (%s)",
os.getenv('LIBRARY_PATH'), EESSI_LIB_PATH)
ec.log.info("NOTE: Pillow has zlib as a dependancy, The original CPATH value: (%s) has been extended with (%s)",
os.getenv('CPATH'), EESSI_CPATH)
ec.log.info("NOTE: Pillow has zlib as a dependancy, The original LIBRARY_VALUE value: (%s) has been extended with (%s)",
os.getenv('LIBRARY_PATH'), EESSI_LIB_PATH)
os.environ['CPATH'] = os.pathsep.join(filter(None,[os.environ.get('CPATH',''), EESSI_CPATH]))
os.environ['LIBRARY_PATH'] = os.pathsep.join(filter(None,[os.environ.get('LIBRARY_PATH',''), EESSI_LIB_PATH]))


def parse_hook_ucx_eprefix(ec, eprefix):
"""Make UCX aware of compatibility layer via additional configuration options."""
if ec.name == 'UCX':
Expand Down Expand Up @@ -272,6 +289,7 @@ def pre_test_hook_ignore_failing_tests_SciPybundle(self, *args, **kwargs):
'CGAL': parse_hook_cgal_toolchainopts_precise,
'fontconfig': parse_hook_fontconfig_add_fonts,
'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,
'Pillow': parse_hook_pillow_set_cpath_library_path,
'UCX': parse_hook_ucx_eprefix,
}

Expand Down
13 changes: 12 additions & 1 deletion eessi-2023.06-eb-4.8.1-2022a.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ easyconfigs:
- gzip-1.12-GCCcore-11.3.0.eb
- lz4-1.9.3-GCCcore-11.3.0.eb
- zstd-1.5.2-GCCcore-11.3.0.eb
- Pillow-9.1.1-GCCcore-11.3.0.eb:
# 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
Expand Down Expand Up @@ -51,4 +55,11 @@ easyconfigs:
- Tk-8.6.12-GCCcore-11.3.0.eb
- GROMACS-2023.1-foss-2022a.eb
- MUMPS-5.5.1-foss-2022a-metis.eb
- OpenBabel-3.1.1-gompi-2022a.eb
- Pillow-9.1.1-GCCcore-11.3.0.eb:
# Uses a custom hook since has zlib as dependency which has hard coded header and library path within Pillow code.
options:
from-pr: 18881
- ParaView-5.10.1-foss-2022a-mpi.eb:
options:
download-timeout: 1000
- ASE-3.22.1-foss-2022a.eb
3 changes: 3 additions & 0 deletions eessi-2023.06-eb-4.8.1-system.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
easyconfigs:
# wraps around Java/11.0.20
- Java-11.eb
- EasyBuild-4.8.2.eb:
options:
from-pr: 19105
3 changes: 3 additions & 0 deletions eessi-2023.06-eb-4.8.2-2022a.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
easyconfigs:
- CDO-2.0.6-gompi-2022a.eb
- OpenBabel-3.1.1-gompi-2022a.eb

0 comments on commit bec54e4

Please sign in to comment.