From e48a2fcc09430699fb6055a3188da2918fc6c0cd Mon Sep 17 00:00:00 2001
From: Sebastian Achilles <s.achilles@fz-juelich.de>
Date: Mon, 2 Aug 2021 19:31:59 +0200
Subject: [PATCH] Custom Toolchains: Upstream renamed NvhpcToolchain to
NVHPCToolchain
---
Custom_Toolchains/npsmpic.py | 8 +++++---
Custom_Toolchains/nvompic.py | 6 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Custom_Toolchains/npsmpic.py b/Custom_Toolchains/npsmpic.py
index 33ee2bb06..bb0315b6c 100644
--- a/Custom_Toolchains/npsmpic.py
+++ b/Custom_Toolchains/npsmpic.py
@@ -29,13 +29,15 @@ EasyBuild support for npsmpi compiler toolchain (includes NVHPC and ParaStationM
@author: Damian Alvarez (Forschungszentrum Juelich)
"""
-from easybuild.toolchains.nvhpc import NvhpcToolchain
+from easybuild.toolchains.nvhpc import NVHPCToolchain
# We pull in MPI and CUDA at once so this maps nicely to HMNS
from easybuild.toolchains.mpi.psmpi import Psmpi
from easybuild.toolchains.compiler.cuda import Cuda
# Order matters!
-class Npsmpic(NvhpcToolchain, Cuda, Psmpi):
+
+
+class Npsmpic(NVHPCToolchain, Cuda, Psmpi):
"""Compiler toolchain with NVHPC and ParaStationMPI, with CUDA as dependency."""
NAME = 'npsmpic'
- SUBTOOLCHAIN = NvhpcToolchain.NAME
+ SUBTOOLCHAIN = NVHPCToolchain.NAME
diff --git a/Custom_Toolchains/nvompic.py b/Custom_Toolchains/nvompic.py
index b0a0e54a0..c080deb83 100644
--- a/Custom_Toolchains/nvompic.py
+++ b/Custom_Toolchains/nvompic.py
@@ -30,7 +30,7 @@ EasyBuild support for nvompic compiler toolchain (includes NVHPC and OpenMPI, an
@author: Sebastian Achilles (Forschungszentrum Juelich)
"""
-from easybuild.toolchains.nvhpc import NvhpcToolchain
+from easybuild.toolchains.nvhpc import NVHPCToolchain
# We pull in MPI and CUDA at once so this maps nicely to HMNS
from easybuild.toolchains.mpi.openmpi import OpenMPI
from easybuild.toolchains.compiler.cuda import Cuda
@@ -38,7 +38,7 @@ from easybuild.toolchains.compiler.cuda import Cuda
# Order matters!
-class NVompic(NvhpcToolchain, Cuda, OpenMPI):
+class NVompic(NVHPCToolchain, Cuda, OpenMPI):
"""Compiler toolchain with NVHPC and OpenMPI, with CUDA as dependency."""
NAME = 'nvompic'
- SUBTOOLCHAIN = NvhpcToolchain.NAME
+ SUBTOOLCHAIN = NVHPCToolchain.NAME
--
GitLab