Skip to content

Commit

Permalink
Merge branch '5.0.x' into modload-perl
Browse files Browse the repository at this point in the history
  • Loading branch information
boegel committed Feb 5, 2025
2 parents b26cf5c + 320cea7 commit 73c2f07
Show file tree
Hide file tree
Showing 251 changed files with 900 additions and 1,567 deletions.
2 changes: 1 addition & 1 deletion easybuild/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down Expand Up @@ -42,7 +42,7 @@
# recent setuptools versions will *TRANSFORM* something like 'X.Y.Zdev' into 'X.Y.Z.dev0', with a warning like
# UserWarning: Normalizing '2.4.0dev' to '2.4.0.dev0'
# This causes problems further up the dependency chain...
VERSION = '5.0.0.dev0'
VERSION = '5.0.0beta1'
UNKNOWN = 'UNKNOWN'


Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/a/abaqus.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/a/adf.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2016-2024 Ghent University
# Copyright 2016-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
17 changes: 11 additions & 6 deletions easybuild/easyblocks/a/advisor.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down Expand Up @@ -34,27 +34,32 @@
from easybuild.tools import LooseVersion

from easybuild.easyblocks.generic.intelbase import IntelBase
from easybuild.tools.build_log import EasyBuildError


class EB_Advisor(IntelBase):
"""
Support for installing Intel Advisor XE
- minimum version suported: 2020.x
"""

def __init__(self, *args, **kwargs):
"""Constructor, initialize class variables."""
super(EB_Advisor, self).__init__(*args, **kwargs)
if LooseVersion(self.version) < LooseVersion('2017'):
self.subdir = 'advisor_xe'
elif LooseVersion(self.version) < LooseVersion('2021'):

if LooseVersion(self.version) < LooseVersion('2020'):
raise EasyBuildError(
f"Version {self.version} of {self.name} is unsupported. Mininum supported version is 2020.0."
)

if LooseVersion(self.version) < LooseVersion('2021'):
self.subdir = 'advisor'
else:
self.subdir = os.path.join('advisor', 'latest')

def prepare_step(self, *args, **kwargs):
"""Since 2019u3 there is no license required."""
if LooseVersion(self.version) >= LooseVersion('2019_update3'):
kwargs['requires_runtime_license'] = False
kwargs['requires_runtime_license'] = False
super(EB_Advisor, self).prepare_step(*args, **kwargs)

def make_module_req_guess(self):
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/a/aedt.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down Expand Up @@ -71,7 +71,7 @@ def install_step(self):
])
run_shell_cmd("./Linux/AnsysEM/Disk1/InstData/setup.exe %s" % options)

def post_install_step(self):
def post_processing_step(self):
"""Disable OS check and set LC_ALL/LANG for runtime"""
if not self.subdir:
self._set_subdir()
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/a/amber.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2015-2024 Stanford University
# Copyright 2009-2025 Ghent University
# Copyright 2015-2025 Stanford University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/a/anaconda.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/a/ansys.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/a/ant.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyblocks/a/aocc.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2020-2024 Forschungszentrum Juelich GmbH
# Copyright 2020-2025 Forschungszentrum Juelich GmbH
#
# This file is triple-licensed under GPLv2 (see below), MIT, and
# BSD three-clause licenses.
Expand Down Expand Up @@ -214,7 +214,7 @@ def install_step(self):

super(EB_AOCC, self).install_step()

def post_install_step(self):
def post_processing_step(self):
"""
For AOCC <5.0.0:
Create wrappers for the compilers to make sure compilers picks up GCCcore as GCC toolchain.
Expand Down Expand Up @@ -245,7 +245,7 @@ def post_install_step(self):

self._create_compiler_config_files(compilers_to_add_config_files)
self._create_compiler_wrappers(compilers_to_wrap)
super(EB_AOCC, self).post_install_step()
super(EB_AOCC, self).post_processing_step()

def sanity_check_step(self):
"""Custom sanity check for AOCC, based on sanity check for Clang."""
Expand Down
6 changes: 3 additions & 3 deletions easybuild/easyblocks/a/aomp.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2021-2024 Ghent University
# Copyright 2021-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down Expand Up @@ -133,8 +133,8 @@ def configure_step(self):
# Only build selected components
self.cfg['installopts'] = 'select ' + ' '.join(components)

def post_install_step(self):
super(EB_AOMP, self).post_install_step()
def post_processing_step(self):
super(EB_AOMP, self).post_processing_step()
# The install script will create a symbolic link as the install
# directory, this creates problems for EB as it won't remove the
# symlink. To remedy this we remove the link here and rename the actual
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/a/armadillo.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/b/bazel.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/b/berkeleygw.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/b/binutils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/b/blat.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 the Cyprus Institute
# Copyright 2009-2025 the Cyprus Institute
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/b/boost.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/b/bowtie.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2013-2024 Ghent University
# Copyright 2013-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/b/bowtie2.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##
# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
#
# Copyright:: Copyright 2012-2024 Uni.Lu/LCSB, NTUA
# Copyright:: Copyright 2012-2025 Uni.Lu/LCSB, NTUA
# Authors:: Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>, Kenneth Hoste
# License:: MIT/GPL
# $Id$
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/b/bwa.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
##
# This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
#
# Copyright:: Copyright 2012-2024 Uni.Lu/LCSB, NTUA
# Copyright:: Copyright 2012-2025 Uni.Lu/LCSB, NTUA
# Authors:: Cedric Laczny <cedric.laczny@uni.lu>, Kenneth Hoste
# Authors:: George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis@cern.ch>
# License:: MIT/GPL
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/b/bzip2.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/cblas.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2013-2024 Ghent University
# Copyright 2013-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/cgal.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
8 changes: 4 additions & 4 deletions easybuild/easyblocks/c/clang.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
##
# Copyright 2013-2024 Dmitri Gribenko
# Copyright 2013-2024 Ghent University
# Copyright 2013-2025 Dmitri Gribenko
# Copyright 2013-2025 Ghent University
#
# This file is triple-licensed under GPLv2 (see below), MIT, and
# BSD three-clause licenses.
Expand Down Expand Up @@ -612,9 +612,9 @@ def install_step(self):
except OSError as err:
raise EasyBuildError("Failed to copy static analyzer dirs to install dir: %s", err)

def post_install_step(self):
def post_processing_step(self):
"""Install python bindings."""
super(EB_Clang, self).post_install_step()
super(EB_Clang, self).post_processing_step()

# copy Python bindings here in post-install step so that it is not done more than once in multi_deps context
if self.cfg['python_bindings']:
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/c/clang_aomp.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down Expand Up @@ -145,7 +145,7 @@ def configure_step(self):
raise EasyBuildError("Could not find 'ROCm-Device-Libs' source directory in %s", self.builddir)

num_comps = len(self.cfg['components'])
for idx, comp in enumerate(self.comp_cfgs):
for idx, (comp, _) in enumerate(self.comp_instances):
name = comp['name']
msg = "configuring bundle component %s %s (%d/%d)..." % (name, comp['version'], idx + 1, num_comps)
print_msg(msg)
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/cmake.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2020-2024 Alexander Grund
# Copyright 2020-2025 Alexander Grund
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/code_server.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2012-2024 Ghent University
# Copyright 2012-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/comsol.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/cp2k.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/cplex.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2009-2024 Ghent University
# Copyright 2009-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
4 changes: 2 additions & 2 deletions easybuild/easyblocks/c/crispr_dav.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2020-2024 Ghent University
# Copyright 2020-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down Expand Up @@ -46,7 +46,7 @@ def __init__(self, *args, **kwargs):
super(EB_CRISPR_minus_DAV, self).__init__(*args, **kwargs)
self.cfg['extract_sources'] = True

def post_install_step(self):
def post_processing_step(self):
"""Update configuration files with correct paths to dependencies and files in installation."""

# getting paths of deps + files we will work with
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/cryptography.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2017-2024 Ghent University
# Copyright 2017-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
8 changes: 4 additions & 4 deletions easybuild/easyblocks/c/cuda.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2012-2024 Ghent University
# Copyright 2012-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down Expand Up @@ -218,7 +218,7 @@ def install_step(self):
self.log.debug("Running patch %s", patch['name'])
run_shell_cmd("/bin/sh " + patch['path'] + " --accept-eula --silent --installdir=" + self.installdir)

def post_install_step(self):
def post_processing_step(self):
"""
Create wrappers for the specified host compilers, generate the appropriate stub symlinks,
and create version independent pkgconfig files
Expand Down Expand Up @@ -288,7 +288,7 @@ def create_wrapper(wrapper_name, wrapper_comp):
symlink(pc_file, link, use_abspath_source=False)
change_dir(cwd)

super(EB_CUDA, self).post_install_step()
super(EB_CUDA, self).post_processing_step()

def sanity_check_step(self):
"""Custom sanity check for CUDA."""
Expand Down Expand Up @@ -358,7 +358,7 @@ def make_module_req_guess(self):
guesses.update({
'CPATH': inc_path,
'LD_LIBRARY_PATH': lib_path,
'LIBRARY_PATH': ['lib64', os.path.join('stubs', 'lib64')],
'LIBRARY_PATH': lib_path + [os.path.join('stubs', 'lib64')],
'PATH': bin_path,
'PKG_CONFIG_PATH': ['pkgconfig'],
})
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyblocks/c/cudacompat.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##
# Copyright 2012-2024 Ghent University
# Copyright 2012-2025 Ghent University
#
# This file is part of EasyBuild,
# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
Expand Down
Loading

0 comments on commit 73c2f07

Please sign in to comment.