Merge branch 'nessi.no-2023.06' of gh-nessi:NorESSI/software-layer in…

…to nessi-23.06-add-R-2022a

fix merge conflict after EESSI#213

.github/workflows/test_eessi.yml

@@ -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:

eb_hooks.py

@@ -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':
@@ -298,6 +315,7 @@ def pre_single_extension_isoband(ext, *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,
 }
 

eessi-2023.06-eb-4.8.1-2022a.yml

@@ -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
   # - netCDF-4.9.0-gompi-2022a.eb:
@@ -51,4 +55,14 @@ easyconfigs:
   - NLopt-2.7.1-GCCcore-11.3.0.eb
   - PCRE2-10.40-GCCcore-11.3.0.eb
   - 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
+  - ParaView-5.10.1-foss-2022a-mpi.eb:
+        options:
+          download-timeout: 1000
+  - ASE-3.22.1-foss-2022a.eb
   - R-4.2.1-foss-2022a.eb

eessi-2023.06-eb-4.8.1-system.yml

@@ -1,3 +1,6 @@
 easyconfigs:
   # wraps around Java/11.0.20
   - Java-11.eb
+  - EasyBuild-4.8.2.eb:
+      options:
+        from-pr: 19105

eessi-2023.06-eb-4.8.2-2022a.yml

@@ -0,0 +1,2 @@
+easyconfigs:
+  - CDO-2.0.6-gompi-2022a.eb