From b2341ff68e5bdfeb3189c92e342fec3ef2653e28 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 6 Aug 2024 11:55:15 +0200 Subject: [PATCH 1/2] {2023.06}[foss/2023a] grpcio v1.57.0 --- .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml | 1 + eb_hooks.py | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml index 90dda5236b..a8a38ec80c 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml @@ -30,3 +30,4 @@ easyconfigs: - librosa-0.10.1-foss-2023a.eb - xarray-2023.9.0-gfbf-2023a.eb - SciTools-Iris-3.9.0-foss-2023a.eb + - grpcio-1.57.0-GCCcore-12.3.0.eb diff --git a/eb_hooks.py b/eb_hooks.py index 7f7e4e57bd..13b619344a 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -220,6 +220,19 @@ def parse_hook_fontconfig_add_fonts(ec, eprefix): raise EasyBuildError("fontconfig-specific hook triggered for non-fontconfig easyconfig?!") +def parse_hook_grpcio_zlib(ec, ecprefix): + """Adjust preinstallopts to use ZLIB from compat layer.""" + if ec.name == 'grpcio' and ec.version in ['1.57.0']: + exts_list = ec['exts_list'] + original_preinstallopts = (exts_list[0][2])['preinstallopts'] + original_option = "GRPC_PYTHON_BUILD_SYSTEM_ZLIB=True" + new_option = "GRPC_PYTHON_BUILD_SYSTEM_ZLIB=False" + (exts_list[0][2])['preinstallopts'] = original_preinstallopts.replace(original_option, new_option, 1) + print_msg("Modified the easyconfig to use compat ZLIB with GRPC_PYTHON_BUILD_SYSTEM_ZLIB=False") + else: + raise EasyBuildError("grpcio-specific hook triggered for a non-grpcio easyconfig?!") + + def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix): """Relax number of failing numerical LAPACK tests for aarch64/neoverse_v1 CPU target for OpenBLAS < 0.3.23""" cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR') From 475653cd5a84f8ac8608dbc1fc471404ed68f4cd Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 6 Aug 2024 13:38:22 +0200 Subject: [PATCH 2/2] enable parse hook for grpcio --- eb_hooks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/eb_hooks.py b/eb_hooks.py index 13b619344a..73e1ff7df6 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -756,6 +756,7 @@ def inject_gpu_property(ec): 'casacore': parse_hook_casacore_disable_vectorize, 'CGAL': parse_hook_cgal_toolchainopts_precise, 'fontconfig': parse_hook_fontconfig_add_fonts, + 'grpcio': parse_hook_grpcio_zlib, 'LAMMPS': parse_hook_lammps_remove_deps_for_CI_aarch64, 'CP2K': parse_hook_CP2K_remove_deps_for_aarch64, 'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,