From 5a50f8f3e3b7d52d9a82d38a5179277ac421ced6 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Tue, 13 Jan 2026 11:16:22 +0100 Subject: [PATCH 1/6] Readd easybuild.toolchains.compiler.nvhpc `NVHPC` was replaced by `NvidiaCompilers` in EasyBuild 5.2.0 (f1761f83d9e87ad65366858fc95771faff9a6bbf) which is an accidental breaking change. Add it back with a deprecation notice making sure both are equal for now. --- easybuild/toolchains/compiler/nvhpc.py | 36 +++++++++++++++++++ .../toolchains/compiler/nvidia_compilers.py | 7 +++- test/framework/toolchain.py | 15 ++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 easybuild/toolchains/compiler/nvhpc.py diff --git a/easybuild/toolchains/compiler/nvhpc.py b/easybuild/toolchains/compiler/nvhpc.py new file mode 100644 index 0000000000..b39b765e1b --- /dev/null +++ b/easybuild/toolchains/compiler/nvhpc.py @@ -0,0 +1,36 @@ +## +# Copyright 2026 Ghent University +# +# This file is part of EasyBuild, +# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en), +# with support of Ghent University (http://ugent.be/hpc), +# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be), +# Flemish Research Foundation (FWO) (http://www.fwo.be/en) +# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en). +# +# https://github.com/easybuilders/easybuild +# +# EasyBuild is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation v2. +# +# EasyBuild is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with EasyBuild. If not, see . +## +"""Compatibility module such that compiler.nvhpc.NVHPC and compiler.compiler.nvidia_compilers.NvidiaCompilers +can be used interchangeably +""" + +from easybuild.base import fancylogger +from easybuild.toolchains.compiler.nvidia_compilers import NVHPC # noqa # pylint:disable=unused-import + +_log = fancylogger.getLogger('compiler.nvhpc', fname=False) +_log.deprecated("easybuild.toolchains.compiler.nvhpc was replaced by " + "easybuild.toolchains.compiler.nvidia_compilers in EasyBuild 5.2.0", '6.0') + +# TODO EasyBuild 6.0: Remove NVHPC name from NvidiaCompilers.COMPILER_MODULE_NAME diff --git a/easybuild/toolchains/compiler/nvidia_compilers.py b/easybuild/toolchains/compiler/nvidia_compilers.py index 1a4e617a7e..b6ee2061c7 100644 --- a/easybuild/toolchains/compiler/nvidia_compilers.py +++ b/easybuild/toolchains/compiler/nvidia_compilers.py @@ -45,7 +45,8 @@ class NvidiaCompilers(Compiler): "NVHPC compiler class" - COMPILER_MODULE_NAME = ['nvidia-compilers'] + # TODO EasyBuild 6.0: Remove NVHPC name + COMPILER_MODULE_NAME = ['nvidia-compilers', 'NVHPC'] COMPILER_FAMILY = TC_CONSTANT_NVHPC @@ -104,3 +105,7 @@ def _set_compiler_flags(self): def _set_compiler_vars(self): """Set the compiler variables""" super()._set_compiler_vars() + + +# Former name used in EasyBuild until 5.2.0, now a DEPRECATED alias +NVHPC = NvidiaCompilers diff --git a/test/framework/toolchain.py b/test/framework/toolchain.py index e306e9df30..7fed1fd3e2 100644 --- a/test/framework/toolchain.py +++ b/test/framework/toolchain.py @@ -3389,6 +3389,21 @@ def test_get_flag(self): tc.options.options_map['openmp'] = flags self.assertEqual(tc.get_flag('openmp'), flagstring) + def test_nvhpc_compatibility(self): + """Test that software using EasyBuild before 5.2.0 continues working + the compiler.nvhpc toolchain being renamed to NvidiaCompilers""" + with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): + from easybuild.toolchains.compiler.nvhpc import NVHPC + from easybuild.toolchains.nvompi import Nvompi + from easybuild.toolchains.compiler.nvidia_compilers import NvidiaCompilers + tc = NvidiaCompilers(name='NvidiaCompilers', version='2024a') # Common usage + self.assertIsInstance(tc, NVHPC) # Might be checked by pre-5.2.0 users + tc = Nvompi(version='2024a') # Common usage + self.assertIsInstance(tc, NVHPC) # Might be checked by pre-5.2.0 users + self.assertIsInstance(tc, NvidiaCompilers) + tc = NVHPC(name='NVHPC', version='2024a') # Might be used by pre-5.2.0 users + self.assertIsInstance(tc, NvidiaCompilers) + def suite(loader=None): """ return all the tests""" From 9101a1e20491320b4abb28e1b3c3fb4d91dfadc3 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Tue, 13 Jan 2026 14:16:40 +0100 Subject: [PATCH 2/6] Also handle replaced `NVHPC` toolchain and warn on instantiation --- .../toolchains/compiler/nvidia_compilers.py | 15 +++++++++++- easybuild/toolchains/nvhpc.py | 2 ++ easybuild/toolchains/nvidia_compilers.py | 14 +++++++++++ test/framework/toolchain.py | 24 +++++++++++++++---- 4 files changed, 50 insertions(+), 5 deletions(-) diff --git a/easybuild/toolchains/compiler/nvidia_compilers.py b/easybuild/toolchains/compiler/nvidia_compilers.py index b6ee2061c7..70a73d1164 100644 --- a/easybuild/toolchains/compiler/nvidia_compilers.py +++ b/easybuild/toolchains/compiler/nvidia_compilers.py @@ -36,6 +36,7 @@ * Andreas Herten (Forschungszentrum Juelich GmbH) """ +import abc import easybuild.tools.systemtools as systemtools from easybuild.tools.toolchain.compiler import Compiler @@ -108,4 +109,16 @@ def _set_compiler_vars(self): # Former name used in EasyBuild until 5.2.0, now a DEPRECATED alias -NVHPC = NvidiaCompilers +class NVHPC(metaclass=abc.ABCMeta): # pylint: disable=too-few-public-methods + """DEPRECATED alias for NvidiaCompilers.""" + def __new__(cls, *args, **kwargs): + if cls is NVHPC: + inst = NvidiaCompilers(*args, **kwargs) + inst.log.deprecated( + "easybuild.toolchains.compiler.nvhpc was replaced by " + "easybuild.toolchains.compiler.nvidia_compilers in EasyBuild 5.2.0", '6.0') + return inst + return super().__new__(cls) + + +NVHPC.register(NvidiaCompilers) diff --git a/easybuild/toolchains/nvhpc.py b/easybuild/toolchains/nvhpc.py index 21307a30e9..2dc575604f 100644 --- a/easybuild/toolchains/nvhpc.py +++ b/easybuild/toolchains/nvhpc.py @@ -36,6 +36,8 @@ from easybuild.toolchains.linalg.nvscalapack import NVScaLAPACK from easybuild.toolchains.mpi.nvhpcx import NVHPCX from easybuild.toolchains.nvidia_compilers import NvidiaCompilersToolchain +# Backwards compatibility +from easybuild.toolchains.nvidia_compilers import NVHPCToolchain # noqa # pylint:disable=unused-import from easybuild.tools.toolchain.toolchain import SYSTEM_TOOLCHAIN_NAME diff --git a/easybuild/toolchains/nvidia_compilers.py b/easybuild/toolchains/nvidia_compilers.py index d8d2a35e35..16aa84abdc 100644 --- a/easybuild/toolchains/nvidia_compilers.py +++ b/easybuild/toolchains/nvidia_compilers.py @@ -34,6 +34,7 @@ * Andreas Herten (Forschungszentrum Juelich) """ +import abc from easybuild.toolchains.compiler.nvidia_compilers import NvidiaCompilers from easybuild.toolchains.gcccore import GCCcore from easybuild.tools.toolchain.toolchain import SYSTEM_TOOLCHAIN_NAME @@ -48,3 +49,16 @@ class NvidiaCompilersToolchain(NvidiaCompilers): # nvidia-compilers is only an optional subtoolchain because of legacy reasons; # recent NVHPC toolchains (versions >= 25.0) always have nvidia-compilers are subtoolchain OPTIONAL = True + + +class NVHPCToolchain(metaclass=abc.ABCMeta): # pylint: disable=too-few-public-methods + """DEPRECATED alias for NvidiaCompilersToolchain.""" + def __new__(cls, *args, **kwargs): + if cls is NVHPCToolchain: + inst = NvidiaCompilersToolchain(*args, **kwargs) + inst.log.deprecated("NVHPCToolchain was replaced by NvidiaCompilersToolchain in EasyBuild 5.2.0", '6.0') + return inst + return super().__new__(cls) + + +NVHPCToolchain.register(NvidiaCompilersToolchain) diff --git a/test/framework/toolchain.py b/test/framework/toolchain.py index 7fed1fd3e2..d98a1075a5 100644 --- a/test/framework/toolchain.py +++ b/test/framework/toolchain.py @@ -3394,15 +3394,31 @@ def test_nvhpc_compatibility(self): the compiler.nvhpc toolchain being renamed to NvidiaCompilers""" with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): from easybuild.toolchains.compiler.nvhpc import NVHPC + self.assertIn("nvhpc was replaced by easybuild.toolchains.compiler.nvidia_compilers", self.get_stderr()) from easybuild.toolchains.nvompi import Nvompi from easybuild.toolchains.compiler.nvidia_compilers import NvidiaCompilers + from easybuild.toolchains.nvhpc import NvidiaCompilersToolchain, NVHPCToolchain + tc = NvidiaCompilers(name='NvidiaCompilers', version='2024a') # Common usage - self.assertIsInstance(tc, NVHPC) # Might be checked by pre-5.2.0 users - tc = Nvompi(version='2024a') # Common usage - self.assertIsInstance(tc, NVHPC) # Might be checked by pre-5.2.0 users + # Might be checked by pre-5.2.0 users + self.assertIsInstance(tc, NVHPC) + + with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): + tc = NVHPC(name='NVHPC', version='2024a') # Might be used by pre-5.2.0 users + self.assertIn("nvhpc was replaced by easybuild.toolchains.compiler.nvidia_compilers", self.get_stderr()) self.assertIsInstance(tc, NvidiaCompilers) - tc = NVHPC(name='NVHPC', version='2024a') # Might be used by pre-5.2.0 users + + tc = Nvompi(version='2024a') # Common usage self.assertIsInstance(tc, NvidiaCompilers) + self.assertIsInstance(tc, NvidiaCompilersToolchain) + # Might be checked by pre-5.2.0 users + self.assertIsInstance(tc, NVHPC) + self.assertIsInstance(tc, NVHPCToolchain) + + with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): + tc = NVHPCToolchain(name='NVHPC', version='2024a') # Might be used by pre-5.2.0 users + self.assertIn("NVHPCToolchain was replaced by NvidiaCompilersToolchain", self.get_stderr()) + self.assertIsInstance(tc, NvidiaCompilersToolchain) def suite(loader=None): From ca168b81da91ce756ab840134df057bba2402978 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Tue, 13 Jan 2026 14:19:01 +0100 Subject: [PATCH 3/6] Minor cleanup --- easybuild/toolchains/compiler/nvidia_compilers.py | 4 ---- test/framework/toolchain.py | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/easybuild/toolchains/compiler/nvidia_compilers.py b/easybuild/toolchains/compiler/nvidia_compilers.py index 70a73d1164..10b6536fae 100644 --- a/easybuild/toolchains/compiler/nvidia_compilers.py +++ b/easybuild/toolchains/compiler/nvidia_compilers.py @@ -103,10 +103,6 @@ def _set_compiler_flags(self): self.variables.nextend('OPTFLAGS', ['tp=x64']) super()._set_compiler_flags() - def _set_compiler_vars(self): - """Set the compiler variables""" - super()._set_compiler_vars() - # Former name used in EasyBuild until 5.2.0, now a DEPRECATED alias class NVHPC(metaclass=abc.ABCMeta): # pylint: disable=too-few-public-methods diff --git a/test/framework/toolchain.py b/test/framework/toolchain.py index d98a1075a5..a8ba682e1f 100644 --- a/test/framework/toolchain.py +++ b/test/framework/toolchain.py @@ -528,7 +528,7 @@ def test_validate_pass_by_value(self): pass_by_value = True ids = [] - for k, v in tc.variables.items(): + for _, v in tc.variables.items(): for x in v: idx = id(x) if idx not in ids: @@ -908,8 +908,6 @@ def test_misc_flags_unique_fortran(self): flag = tc.COMPILER_UNIQUE_OPTION_MAP[opt] if isinstance(flag, list): flag = ' '.join(flag) - else: - flag = flag for var in flag_vars: flags = tc.get_variable(var) if enable: From e6778e250f7d8c53cbcb6d51ceab9b862eece8e9 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Wed, 14 Jan 2026 17:15:33 +0100 Subject: [PATCH 4/6] Move compat classes out of new modules --- easybuild/toolchains/compiler/nvhpc.py | 19 ++++++++++++++++++- .../toolchains/compiler/nvidia_compilers.py | 17 ----------------- easybuild/toolchains/nvhpc.py | 16 ++++++++++++++-- easybuild/toolchains/nvidia_compilers.py | 14 -------------- 4 files changed, 32 insertions(+), 34 deletions(-) diff --git a/easybuild/toolchains/compiler/nvhpc.py b/easybuild/toolchains/compiler/nvhpc.py index b39b765e1b..222e9bc277 100644 --- a/easybuild/toolchains/compiler/nvhpc.py +++ b/easybuild/toolchains/compiler/nvhpc.py @@ -26,11 +26,28 @@ can be used interchangeably """ +import abc from easybuild.base import fancylogger -from easybuild.toolchains.compiler.nvidia_compilers import NVHPC # noqa # pylint:disable=unused-import +from easybuild.toolchains.compiler.nvidia_compilers import NvidiaCompilers _log = fancylogger.getLogger('compiler.nvhpc', fname=False) _log.deprecated("easybuild.toolchains.compiler.nvhpc was replaced by " "easybuild.toolchains.compiler.nvidia_compilers in EasyBuild 5.2.0", '6.0') + +# Former name used in EasyBuild until 5.2.0, now a DEPRECATED alias +class NVHPC(metaclass=abc.ABCMeta): # pylint: disable=too-few-public-methods + """DEPRECATED alias for NvidiaCompilers.""" + def __new__(cls, *args, **kwargs): + if cls is NVHPC: + inst = NvidiaCompilers(*args, **kwargs) + inst.log.deprecated( + "easybuild.toolchains.compiler.nvhpc was replaced by " + "easybuild.toolchains.compiler.nvidia_compilers in EasyBuild 5.2.0", '6.0') + return inst + return super().__new__(cls) + + +NVHPC.register(NvidiaCompilers) + # TODO EasyBuild 6.0: Remove NVHPC name from NvidiaCompilers.COMPILER_MODULE_NAME diff --git a/easybuild/toolchains/compiler/nvidia_compilers.py b/easybuild/toolchains/compiler/nvidia_compilers.py index 10b6536fae..62ed37f7c8 100644 --- a/easybuild/toolchains/compiler/nvidia_compilers.py +++ b/easybuild/toolchains/compiler/nvidia_compilers.py @@ -36,7 +36,6 @@ * Andreas Herten (Forschungszentrum Juelich GmbH) """ -import abc import easybuild.tools.systemtools as systemtools from easybuild.tools.toolchain.compiler import Compiler @@ -102,19 +101,3 @@ def _set_compiler_flags(self): if not self.options.get('optarch', False): self.variables.nextend('OPTFLAGS', ['tp=x64']) super()._set_compiler_flags() - - -# Former name used in EasyBuild until 5.2.0, now a DEPRECATED alias -class NVHPC(metaclass=abc.ABCMeta): # pylint: disable=too-few-public-methods - """DEPRECATED alias for NvidiaCompilers.""" - def __new__(cls, *args, **kwargs): - if cls is NVHPC: - inst = NvidiaCompilers(*args, **kwargs) - inst.log.deprecated( - "easybuild.toolchains.compiler.nvhpc was replaced by " - "easybuild.toolchains.compiler.nvidia_compilers in EasyBuild 5.2.0", '6.0') - return inst - return super().__new__(cls) - - -NVHPC.register(NvidiaCompilers) diff --git a/easybuild/toolchains/nvhpc.py b/easybuild/toolchains/nvhpc.py index 2dc575604f..5156183685 100644 --- a/easybuild/toolchains/nvhpc.py +++ b/easybuild/toolchains/nvhpc.py @@ -31,13 +31,12 @@ * Andreas Herten (Forschungszentrum Juelich) * Alex Domingo (Vrije Universiteit Brussel) """ +import abc from easybuild.toolchains.gcccore import GCCcore from easybuild.toolchains.linalg.nvblas import NVBLAS from easybuild.toolchains.linalg.nvscalapack import NVScaLAPACK from easybuild.toolchains.mpi.nvhpcx import NVHPCX from easybuild.toolchains.nvidia_compilers import NvidiaCompilersToolchain -# Backwards compatibility -from easybuild.toolchains.nvidia_compilers import NVHPCToolchain # noqa # pylint:disable=unused-import from easybuild.tools.toolchain.toolchain import SYSTEM_TOOLCHAIN_NAME @@ -47,3 +46,16 @@ class NVHPC(NvidiaCompilersToolchain, NVHPCX, NVBLAS, NVScaLAPACK): # GCCcore and system need to be listed as subtoolchains here only for legacy reasons; # recent NVHPC toolchains (versions >= 25.0) only have nvidia-compilers are subtoolchain SUBTOOLCHAIN = [NvidiaCompilersToolchain.NAME, GCCcore.NAME, SYSTEM_TOOLCHAIN_NAME] + + +class NVHPCToolchain(metaclass=abc.ABCMeta): # pylint: disable=too-few-public-methods + """DEPRECATED alias for NvidiaCompilersToolchain.""" + def __new__(cls, *args, **kwargs): + if cls is NVHPCToolchain: + inst = NvidiaCompilersToolchain(*args, **kwargs) + inst.log.deprecated("NVHPCToolchain was replaced by NvidiaCompilersToolchain in EasyBuild 5.2.0", '6.0') + return inst + return super().__new__(cls) + + +NVHPCToolchain.register(NvidiaCompilersToolchain) diff --git a/easybuild/toolchains/nvidia_compilers.py b/easybuild/toolchains/nvidia_compilers.py index 16aa84abdc..d8d2a35e35 100644 --- a/easybuild/toolchains/nvidia_compilers.py +++ b/easybuild/toolchains/nvidia_compilers.py @@ -34,7 +34,6 @@ * Andreas Herten (Forschungszentrum Juelich) """ -import abc from easybuild.toolchains.compiler.nvidia_compilers import NvidiaCompilers from easybuild.toolchains.gcccore import GCCcore from easybuild.tools.toolchain.toolchain import SYSTEM_TOOLCHAIN_NAME @@ -49,16 +48,3 @@ class NvidiaCompilersToolchain(NvidiaCompilers): # nvidia-compilers is only an optional subtoolchain because of legacy reasons; # recent NVHPC toolchains (versions >= 25.0) always have nvidia-compilers are subtoolchain OPTIONAL = True - - -class NVHPCToolchain(metaclass=abc.ABCMeta): # pylint: disable=too-few-public-methods - """DEPRECATED alias for NvidiaCompilersToolchain.""" - def __new__(cls, *args, **kwargs): - if cls is NVHPCToolchain: - inst = NvidiaCompilersToolchain(*args, **kwargs) - inst.log.deprecated("NVHPCToolchain was replaced by NvidiaCompilersToolchain in EasyBuild 5.2.0", '6.0') - return inst - return super().__new__(cls) - - -NVHPCToolchain.register(NvidiaCompilersToolchain) From 3dc8d0208558872179c10d2a76a57cc705d10954 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 19 Jan 2026 13:00:32 +0100 Subject: [PATCH 5/6] Refactor test Co-authored-by: Alex Domingo --- test/framework/toolchain.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/test/framework/toolchain.py b/test/framework/toolchain.py index a8ba682e1f..c1adfb0021 100644 --- a/test/framework/toolchain.py +++ b/test/framework/toolchain.py @@ -3390,33 +3390,38 @@ def test_get_flag(self): def test_nvhpc_compatibility(self): """Test that software using EasyBuild before 5.2.0 continues working the compiler.nvhpc toolchain being renamed to NvidiaCompilers""" - with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): - from easybuild.toolchains.compiler.nvhpc import NVHPC - self.assertIn("nvhpc was replaced by easybuild.toolchains.compiler.nvidia_compilers", self.get_stderr()) from easybuild.toolchains.nvompi import Nvompi from easybuild.toolchains.compiler.nvidia_compilers import NvidiaCompilers from easybuild.toolchains.nvhpc import NvidiaCompilersToolchain, NVHPCToolchain + # test deprecation of NVHPC in v5.2.0 + with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): + from easybuild.toolchains.compiler.nvhpc import NVHPC + self.assertIn("nvhpc was replaced by easybuild.toolchains.compiler.nvidia_compilers", self.get_stderr()) + + # load NVidiaCompilers, deprecated NVHPC corresponds to it tc = NvidiaCompilers(name='NvidiaCompilers', version='2024a') # Common usage # Might be checked by pre-5.2.0 users self.assertIsInstance(tc, NVHPC) + # load deprecated NVHPC, NvidiaCompilers corresponds to it with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): tc = NVHPC(name='NVHPC', version='2024a') # Might be used by pre-5.2.0 users self.assertIn("nvhpc was replaced by easybuild.toolchains.compiler.nvidia_compilers", self.get_stderr()) self.assertIsInstance(tc, NvidiaCompilers) + + # load deprecated NVHPCToolchain, it corresponds to NvidiaCompilersToolchain + with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): + tc = NVHPCToolchain(name='NVHPC', version='2024a') # Might be used by pre-5.2.0 users + self.assertIn("NVHPCToolchain was replaced by NvidiaCompilersToolchain", self.get_stderr()) + self.assertIsInstance(tc, NvidiaCompilersToolchain) tc = Nvompi(version='2024a') # Common usage self.assertIsInstance(tc, NvidiaCompilers) self.assertIsInstance(tc, NvidiaCompilersToolchain) - # Might be checked by pre-5.2.0 users - self.assertIsInstance(tc, NVHPC) self.assertIsInstance(tc, NVHPCToolchain) - - with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): - tc = NVHPCToolchain(name='NVHPC', version='2024a') # Might be used by pre-5.2.0 users - self.assertIn("NVHPCToolchain was replaced by NvidiaCompilersToolchain", self.get_stderr()) - self.assertIsInstance(tc, NvidiaCompilersToolchain) + # deprecated in 5.2.0 + self.assertIsInstance(tc, NVHPC) def suite(loader=None): From 5aceccbf4c5cb850fa03c2dff7e2ba739ff5fa4b Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Mon, 19 Jan 2026 13:03:53 +0100 Subject: [PATCH 6/6] Remove faulty whitespace and enhance comment --- test/framework/toolchain.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/framework/toolchain.py b/test/framework/toolchain.py index c1adfb0021..fe500b3bc5 100644 --- a/test/framework/toolchain.py +++ b/test/framework/toolchain.py @@ -3398,18 +3398,18 @@ def test_nvhpc_compatibility(self): with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): from easybuild.toolchains.compiler.nvhpc import NVHPC self.assertIn("nvhpc was replaced by easybuild.toolchains.compiler.nvidia_compilers", self.get_stderr()) - + # load NVidiaCompilers, deprecated NVHPC corresponds to it tc = NvidiaCompilers(name='NvidiaCompilers', version='2024a') # Common usage # Might be checked by pre-5.2.0 users self.assertIsInstance(tc, NVHPC) - # load deprecated NVHPC, NvidiaCompilers corresponds to it + # load deprecated NVHPC, NvidiaCompilers corresponds to it with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): tc = NVHPC(name='NVHPC', version='2024a') # Might be used by pre-5.2.0 users self.assertIn("nvhpc was replaced by easybuild.toolchains.compiler.nvidia_compilers", self.get_stderr()) self.assertIsInstance(tc, NvidiaCompilers) - + # load deprecated NVHPCToolchain, it corresponds to NvidiaCompilersToolchain with self.temporarily_allow_deprecated_behaviour(), self.mocked_stdout_stderr(): tc = NVHPCToolchain(name='NVHPC', version='2024a') # Might be used by pre-5.2.0 users @@ -3420,7 +3420,7 @@ def test_nvhpc_compatibility(self): self.assertIsInstance(tc, NvidiaCompilers) self.assertIsInstance(tc, NvidiaCompilersToolchain) self.assertIsInstance(tc, NVHPCToolchain) - # deprecated in 5.2.0 + # compiler toolchain NVHPC is deprecated in 5.2.0, but might still be checked by existing code self.assertIsInstance(tc, NVHPC)