Merge branch 'develop' into 5.0.x

Author: boegel

easybuild/easyblocks/generic/cargo.py

@@ -125,6 +125,18 @@ def get_workspace_members(crate_dir):
     return [os.path.join(crate_dir, m) for m in members]
 
 
+def get_checksum(src, log):
+    """Get the checksum from an extracted source"""
+    checksum = src['checksum']
+    if isinstance(checksum, dict):
+        try:
+            checksum = checksum[src['name']]
+        except KeyError:
+            log.warning('No checksum for %s in %s', checksum, src['name'])
+            checksum = None
+    return checksum
+
+
 class Cargo(ExtensionEasyBlock):
     """Support for installing Cargo packages (Rust)"""
 
@@ -186,13 +198,7 @@ def __init__(self, *args, **kwargs):
         """Constructor for Cargo easyblock."""
         super(Cargo, self).__init__(*args, **kwargs)
         self.cargo_home = os.path.join(self.builddir, '.cargo')
-        env.setvar('CARGO_HOME', self.cargo_home)
-        env.setvar('RUSTC', 'rustc')
-        env.setvar('RUSTDOC', 'rustdoc')
-        env.setvar('RUSTFMT', 'rustfmt')
-        env.setvar('RUSTFLAGS', self.rustc_optarch())
-        env.setvar('RUST_LOG', 'DEBUG')
-        env.setvar('RUST_BACKTRACE', '1')
+        self.set_cargo_vars()
 
         # Populate sources from "crates" list of tuples
         sources = []
@@ -219,11 +225,31 @@ def __init__(self, *args, **kwargs):
 
         self.cfg.update('sources', sources)
 
+    def set_cargo_vars(self):
+        """Set environment variables for Rust compilation and Cargo"""
+        env.setvar('CARGO_HOME', self.cargo_home)
+        env.setvar('RUSTC', 'rustc')
+        env.setvar('RUSTDOC', 'rustdoc')
+        env.setvar('RUSTFMT', 'rustfmt')
+        env.setvar('RUSTFLAGS', self.rustc_optarch())
+        env.setvar('RUST_LOG', 'DEBUG')
+        env.setvar('RUST_BACKTRACE', '1')
+
     @property
     def crates(self):
         """Return the crates as defined in the EasyConfig"""
         return self.cfg['crates']
 
+    def load_module(self, *args, **kwargs):
+        """(Re)set environment variables after loading module file.
+
+        Required here to ensure the variables are defined for stand-alone installations and extensions,
+        because the environment is reset to the initial environment right before loading the module.
+        """
+
+        super(Cargo, self).load_module(*args, **kwargs)
+        self.set_cargo_vars()
+
     def extract_step(self):
         """
         Unpack the source files and populate them with required .cargo-checksum.json if offline
@@ -257,12 +283,13 @@ def extract_step(self):
                 except KeyError:
                     git_sources[git_key] = src
                 else:
-                    previous_checksum = previous_source['checksum']
-                    current_checksum = src['checksum']
+                    previous_checksum = get_checksum(previous_source, self.log)
+                    current_checksum = get_checksum(src, self.log)
                     if previous_checksum and current_checksum and previous_checksum != current_checksum:
-                        raise EasyBuildError("Sources for the same git repository need to be identical."
-                                             "Mismatch found for %s rev %s in %s vs %s",
-                                             git_repo, rev, previous_source['name'], src['name'])
+                        raise EasyBuildError("Sources for the same git repository need to be identical. "
+                                             "Mismatch found for %s rev %s in %s (checksum: %s) vs %s (checksum: %s)",
+                                             git_repo, rev, previous_source['name'], previous_checksum,
+                                             src['name'], current_checksum)
                     self.log.info("Source %s already extracted to %s by %s. Skipping extraction.",
                                   src['name'], previous_source['finalpath'], previous_source['name'])
                     src['finalpath'] = previous_source['finalpath']

easybuild/easyblocks/generic/pythonpackage.py

@@ -876,6 +876,9 @@ def test_step(self, return_output_ec=False):
                         actual_installdir = os.path.join(test_installdir, 'local')
                     else:
                         actual_installdir = test_installdir
+                    # Export the temporary installdir as an environment variable
+                    # Some tests (e.g. for astropy) require to be run in the installdir
+                    env.setvar('EB_PYTHONPACKAGE_TEST_INSTALLDIR', actual_installdir)
 
                     self.log.debug("Pre-creating subdirectories in %s: %s", actual_installdir, self.all_pylibdirs)
                     for pylibdir in self.all_pylibdirs:

easybuild/easyblocks/l/lammps.py

@@ -126,6 +126,7 @@
     'skylake_avx512': 'SKX',
     'cascadelake': 'SKX',
     'icelake': 'SKX',
+    'sapphirerapids': 'SKX',
     'knights-landing': 'KNL',
     'zen': 'ZEN',
     'zen2': 'ZEN2',
@@ -242,6 +243,7 @@ def update_kokkos_cpu_mapping(self):
 
         if LooseVersion(self.cur_version) >= LooseVersion(translate_lammps_version('2Aug2023')):
             self.kokkos_cpu_mapping['icelake'] = 'ICX'
+            self.kokkos_cpu_mapping['sapphirerapids'] = 'SPR'
 
     def prepare_step(self, *args, **kwargs):
         """Custom prepare step for LAMMPS."""
@@ -478,7 +480,7 @@ def install_step(self):
 
             mkdir(site_packages, parents=True)
 
-            self.lammpsdir = os.path.join(self.builddir, '%s-*_%s' % (self.name.lower(), self.version))
+            self.lammpsdir = os.path.join(self.builddir, '%s-*' % self.name.lower())
             self.python_dir = os.path.join(self.lammpsdir, 'python')
 
             # The -i flag is added through a patch to the lammps source file python/install.py

easybuild/easyblocks/o/openfoam.py

@@ -48,6 +48,7 @@
 import easybuild.tools.toolchain as toolchain
 from easybuild.easyblocks.generic.cmakemake import setup_cmake_env
 from easybuild.framework.easyblock import EasyBlock
+from easybuild.framework.easyconfig import CUSTOM
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.filetools import adjust_permissions, apply_regex_substitutions, mkdir, write_file
 from easybuild.tools.modules import get_software_root, get_software_version
@@ -58,6 +59,15 @@
 class EB_OpenFOAM(EasyBlock):
     """Support for building and installing OpenFOAM."""
 
+    @staticmethod
+    def extra_options():
+        """Custom easyconfig parameter specific to OpenFOAM."""
+        extra_vars = EasyBlock.extra_options()
+        extra_vars.update({
+            'sanity_check_motorbike': [True, "Should the motorbike sanity check run?", CUSTOM],
+        })
+        return extra_vars
+
     def __init__(self, *args, **kwargs):
         """Specify that OpenFOAM should be built in install dir."""
 
@@ -540,7 +550,8 @@ def sanity_check_step(self):
 
         # run motorBike tutorial case to ensure the installation is functional (if it's available);
         # only for recent (>= v6.0) versions of openfoam.org variant
-        if self.is_dot_org and self.looseversion >= LooseVersion('6'):
+        # could be turned off by set 'sanity_check_motorbike' to False (default True)
+        if self.is_dot_org and self.looseversion >= LooseVersion('6') and self.cfg['sanity_check_motorbike']:
             openfoamdir_path = os.path.join(self.installdir, self.openfoamdir)
             if self.looseversion <= LooseVersion('10'):
                 motorbike_path = os.path.join(