From fbd42898cdbea3c563cda6cd6396bd15c3d6d763 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Mon, 17 Jun 2024 06:52:49 +0000 Subject: [PATCH 1/4] {2023.06}[GCCcore/2023a] grpcio V1.57.0 --- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index e2a6978e10..5102e668af 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -82,3 +82,4 @@ easyconfigs: - BLAST+-2.14.1-gompi-2023a.eb: options: from-pr: 20784 + - grpcio-1.57.0-GCCcore-12.3.0.eb From 1c69e4fb4956251cea65b59360ae7fe4bda345c1 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Mon, 17 Jun 2024 07:27:52 +0000 Subject: [PATCH 2/4] added --from-pr option --- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index 5102e668af..9a73dd426c 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -83,3 +83,5 @@ easyconfigs: options: from-pr: 20784 - grpcio-1.57.0-GCCcore-12.3.0.eb + options: + from-pr: 20191 From 45a963bedac62d4403238912a7356179cb862afa Mon Sep 17 00:00:00 2001 From: Richard Top Date: Mon, 17 Jun 2024 07:39:14 +0000 Subject: [PATCH 3/4] added --from-pr option --- .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index 9a73dd426c..8c576178ae 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -82,6 +82,6 @@ easyconfigs: - BLAST+-2.14.1-gompi-2023a.eb: options: from-pr: 20784 - - grpcio-1.57.0-GCCcore-12.3.0.eb + - grpcio-1.57.0-GCCcore-12.3.0.eb: options: from-pr: 20191 From 2e38f8d2460baf02a8d7822c5ea8e401d9167984 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Tue, 18 Jun 2024 12:18:32 +0000 Subject: [PATCH 4/4] added parse hook and using EasyBuild 4.9.2 --- .../2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 3 --- .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml | 2 ++ eb_hooks.py | 10 ++++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index 8c576178ae..e2a6978e10 100644 --- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -82,6 +82,3 @@ easyconfigs: - BLAST+-2.14.1-gompi-2023a.eb: options: from-pr: 20784 - - grpcio-1.57.0-GCCcore-12.3.0.eb: - options: - from-pr: 20191 diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml new file mode 100644 index 0000000000..74f242de97 --- /dev/null +++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml @@ -0,0 +1,2 @@ +easyconfigs: + - grpcio-1.57.0-GCCcore-12.3.0.eb diff --git a/eb_hooks.py b/eb_hooks.py index 849a135fa8..f446f51d32 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -231,6 +231,15 @@ def parse_hook_gpaw_harcoded_path(ec, eprefix): raise EasyBuildError("GPAW-specific hook triggered for non-GPAW easyconfig?!") +def parse_hook_grpcio_zlib(ec, ecprefix): + if ec.name == 'grpcio' and ec.version in ['1.57.0']: + exts_list = ec['exts_list'] + (exts_list[0][2])['preinstallopts'] = "sed -i 's@/usr@%(sysroot)s/usr@g' setup.py && export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS=%(parallel)s && export GRPC_PYTHON_CFLAGS=\"-fvisibility=hidden -fno-wrapv -fno-exceptions\" &&GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=True GRPC_PYTHON_BUILD_SYSTEM_ZLIB=False GRPC_PYTHON_BUILD_SYSTEM_RE2=True GRPC_PYTHON_BUILD_SYSTEM_ABSL=True" + 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_imagemagick_add_dependency(ec, eprefix): """Add dependency for PCRE/8.45 for ImageMagick/7.1.0-37""" if ec.name == 'ImageMagick': @@ -937,6 +946,7 @@ def pre_module_hook_librosa_augment_modluafooter(self, *args, **kwargs): 'CGAL': parse_hook_cgal_toolchainopts_precise, 'fontconfig': parse_hook_fontconfig_add_fonts, 'GPAW': parse_hook_gpaw_harcoded_path, + 'grpcio': parse_hook_grpcio_zlib, 'ImageMagick': parse_hook_imagemagick_add_dependency, 'LAMMPS': parse_hook_lammps_remove_deps_for_CI_aarch64, 'librosa': parse_hook_librosa_custom_ctypes,