Skip to content

Commit

Permalink
Merge pull request EESSI#286 from trz42/nessi-23.06-ImageMagick-7.1.0…
Browse files Browse the repository at this point in the history
…-37-foss-2022a

{2023.06}[foss/2022a] ImageMagick v7.1.0-37
  • Loading branch information
trz42 authored Mar 14, 2024
2 parents a5dcf8e + 3050379 commit 702a276
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
easyconfigs:
- Stacks-2.62-foss-2022a.eb
- ImageMagick-7.1.0-37-GCCcore-11.3.0.eb:
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/20086
options:
from-pr: 20086
13 changes: 13 additions & 0 deletions eb_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,18 @@ def parse_hook_fontconfig_add_fonts(ec, eprefix):
raise EasyBuildError("fontconfig-specific hook triggered for non-fontconfig easyconfig?!")


def parse_hook_imagemagick_add_dependency(ec, eprefix):
"""Add dependency for PCRE/8.45 for ImageMagick/7.1.0-37"""
if ec.name == 'ImageMagick':
if LooseVersion(ec.version) == LooseVersion('7.1.0-37'):
print_msg("Added dependency for PCRE/8.45 to %s/%s", ec.name, ec.version)
ec['dependencies'].append(('PCRE', '8.45'))
else:
print_msg("Not adding dependency for PCRE/8.45 to %s/%s", ec.name, ec.version)
else:
raise EasyBuildError("ImageMagick-specific hook triggered for non-ImageMagick easyconfig?!")


def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix):
"""Relax number of failing numerical LAPACK tests for aarch64/* CPU targets for OpenBLAS < 0.3.23"""
cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
Expand Down Expand Up @@ -589,6 +601,7 @@ def inject_gpu_property(ec):
PARSE_HOOKS = {
'CGAL': parse_hook_cgal_toolchainopts_precise,
'fontconfig': parse_hook_fontconfig_add_fonts,
'ImageMagick': parse_hook_imagemagick_add_dependency,
'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,
'Pillow-SIMD' : parse_hook_Pillow_SIMD_harcoded_paths,
'pybind11': parse_hook_pybind11_replace_catch2,
Expand Down

0 comments on commit 702a276

Please sign in to comment.