Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

{2023.06}[foss/2022a] Pillow V9.1.1 #202

Merged
merged 3 commits into from
Oct 11, 2023
Merged

{2023.06}[foss/2022a] Pillow V9.1.1 #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c5daa9
Added requested changes
Oct 11, 2023
6ff2f28
Added additional requested changes
Oct 11, 2023
6b80c9f
Added latest modifications
Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions eb_hooks.py
View file
Open in desktop
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,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you order the entries alphabetically ... one line upwards.

'UCX': parse_hook_ucx_eprefix,
}

Expand Down
4 changes: 4 additions & 0 deletions eessi-2023.06-eb-4.8.1-2022a.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,7 @@ easyconfigs:
- Tk-8.6.12-GCCcore-11.3.0.eb
- GROMACS-2023.1-foss-2022a.eb
- MUMPS-5.5.1-foss-2022a-metis.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
Loading