fix names of local variables in CUDA/GNU/gcccuda easyconfigs

easybuild/easyconfigs/c/CUDA/CUDA-10.1.105-GCC-8.2.0-2.31.1.eb

@@ -2,7 +2,7 @@
 
 name = 'CUDA'
 version = '10.1.105'
-nv_version = '418.39'
+local_nv_version = '418.39'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
@@ -13,7 +13,7 @@ description = """CUDA (formerly Compute Unified Device Architecture) is a parall
 toolchain = {'name': 'GCC', 'version': '8.2.0-2.31.1'}
 
 source_urls = ['https://developer.nvidia.com/compute/%(namelower)s/%(version_major_minor)s/Prod/local_installers/']
-sources = ['%%(namelower)s_%%(version)s_%s_linux.run' % nv_version]
+sources = ['%%(namelower)s_%%(version)s_%s_linux.run' % local_nv_version]
 checksums = ['33ac60685a3e29538db5094259ea85c15906cbd0f74368733f4111eab6187c8f']
 
 moduleclass = 'system'

easybuild/easyconfigs/c/CUDA/CUDA-10.1.105-iccifort-2019.1.144-GCC-8.2.0-2.31.1.eb

@@ -2,7 +2,7 @@
 
 name = 'CUDA'
 version = '10.1.105'
-nv_version = '418.39'
+local_nv_version = '418.39'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
@@ -13,7 +13,7 @@ description = """CUDA (formerly Compute Unified Device Architecture) is a parall
 toolchain = {'name': 'iccifort', 'version': '2019.1.144-GCC-8.2.0-2.31.1'}
 
 source_urls = ['https://developer.nvidia.com/compute/%(namelower)s/%(version_major_minor)s/Prod/local_installers/']
-sources = ['%%(namelower)s_%%(version)s_%s_linux.run' % nv_version]
+sources = ['%%(namelower)s_%%(version)s_%s_linux.run' % local_nv_version]
 checksums = ['33ac60685a3e29538db5094259ea85c15906cbd0f74368733f4111eab6187c8f']
 
 moduleclass = 'system'

easybuild/easyconfigs/c/CUDA/CUDA-9.0.176-GCC-6.4.0-2.28.eb

@@ -1,6 +1,6 @@
 name = 'CUDA'
 version = '9.0.176'
-nv_version = '384.81'
+local_nv_version = '384.81'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
@@ -16,7 +16,7 @@ source_urls = [
     'https://developer.nvidia.com/compute/cuda/%(version_major_minor)s/Prod2/local_installers/',
     'https://developer.nvidia.com/compute/%(namelower)s/%(version_major_minor)s/Prod/local_installers/',
 ]
-sources = ['%%(namelower)s_%%(version)s_%s_linux-run' % nv_version]
+sources = ['%%(namelower)s_%%(version)s_%s_linux-run' % local_nv_version]
 checksums = ['96863423feaa50b5c1c5e1b9ec537ef7ba77576a3986652351ae43e66bcd080c']
 
 moduleclass = 'system'

easybuild/easyconfigs/c/CUDA/CUDA-9.0.176-iccifort-2017.4.196-GCC-6.4.0-2.28.eb

@@ -1,6 +1,6 @@
 name = 'CUDA'
 version = '9.0.176'
-nv_version = '384.81'
+local_nv_version = '384.81'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
@@ -16,7 +16,7 @@ source_urls = [
     'https://developer.nvidia.com/compute/cuda/%(version_major_minor)s/Prod2/local_installers/',
     'https://developer.nvidia.com/compute/%(namelower)s/%(version_major_minor)s/Prod/local_installers/',
 ]
-sources = ['%%(namelower)s_%%(version)s_%s_linux-run' % nv_version]
+sources = ['%%(namelower)s_%%(version)s_%s_linux-run' % local_nv_version]
 checksums = ['96863423feaa50b5c1c5e1b9ec537ef7ba77576a3986652351ae43e66bcd080c']
 
 moduleclass = 'system'

easybuild/easyconfigs/c/CUDA/CUDA-9.2.148.1.eb

@@ -1,9 +1,9 @@
 # This file is an EasyBuild reciPY as per https://github.com/easybuilders/easybuild
 
 name = 'CUDA'
-cudaversion = '9.2.148'
-patchversion = '1'
-version = '%s.%s' % (cudaversion, patchversion)
+local_cudaversion = '9.2.148'
+local_patchver = '1'
+version = '%s.%s' % (local_cudaversion, local_patchver)
 
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
@@ -16,11 +16,11 @@ toolchain = SYSTEM
 
 source_urls = [
     'https://developer.nvidia.com/compute/%(namelower)s/%(version_major_minor)s/Prod2/local_installers/',
-    'https://developer.nvidia.com/compute/%%(namelower)s/%%(version_major_minor)s/Prod2/patches/%s/' % patchversion,
+    'https://developer.nvidia.com/compute/%%(namelower)s/%%(version_major_minor)s/Prod2/patches/%s/' % local_patchver,
 ]
 sources = [
-    '%%(namelower)s_%s_396.37_linux' % cudaversion,
-    '%%(namelower)s_%s.%s_linux' % (cudaversion, patchversion),
+    '%%(namelower)s_%s_396.37_linux' % local_cudaversion,
+    '%%(namelower)s_%s.%s_linux' % (local_cudaversion, local_patchver),
 ]
 checksums = [
     'f5454ec2cfdf6e02979ed2b1ebc18480d5dded2ef2279e9ce68a505056da8611',

easybuild/easyconfigs/c/CUDA/CUDA-9.2.88-GCC-7.3.0-2.30.eb

@@ -1,6 +1,6 @@
 name = 'CUDA'
 version = '9.2.88'
-nv_version = '396.26'
+local_nv_version = '396.26'
 
 homepage = 'https://developer.nvidia.com/cuda-toolkit'
 description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
@@ -16,7 +16,7 @@ source_urls = [
     'https://developer.nvidia.com/compute/cuda/%(version_major_minor)s/Prod2/local_installers/',
     'https://developer.nvidia.com/compute/%(namelower)s/%(version_major_minor)s/Prod/local_installers/',
 ]
-sources = ['%%(namelower)s_%%(version)s_%s_linux' % nv_version]
+sources = ['%%(namelower)s_%%(version)s_%s_linux' % local_nv_version]
 checksums = ['8d02cc2a82f35b456d447df463148ac4cc823891be8820948109ad6186f2667c']
 
 moduleclass = 'system'

easybuild/easyconfigs/g/GNU/GNU-4.9.2-2.25.eb

@@ -1,9 +1,9 @@
 easyblock = 'Toolchain'
 
 name = 'GNU'
-gccver = '4.9.2'
-binutilsver = '2.25'
-version = '%s-%s' % (gccver, binutilsver)
+local_gccver = '4.9.2'
+local_binutilsver = '2.25'
+version = '%s-%s' % (local_gccver, local_binutilsver)
 
 homepage = 'http://www.gnu.org/software/'
 description = "Compiler-only toolchain with GCC and binutils."
@@ -12,9 +12,9 @@ toolchain = SYSTEM
 
 dependencies = [
     # GCC built on top of (dummy-built) binutils
-    ('GCC', gccver, '-binutils-%s' % binutilsver),
+    ('GCC', local_gccver, '-binutils-%s' % local_binutilsver),
     # binutils built on top of GCC, which was built on top of (dummy-built) binutils
-    ('binutils', binutilsver, '', ('GCC', '%s-binutils-%s' % (gccver, binutilsver))),
+    ('binutils', local_binutilsver, '', ('GCC', '%s-binutils-%s' % (local_gccver, local_binutilsver))),
 ]
 
 moduleclass = 'toolchain'

easybuild/easyconfigs/g/GNU/GNU-4.9.3-2.25.eb

@@ -1,9 +1,9 @@
 easyblock = 'Toolchain'
 
 name = 'GNU'
-gccver = '4.9.3'
-binutilsver = '2.25'
-version = '%s-%s' % (gccver, binutilsver)
+local_gccver = '4.9.3'
+local_binutilsver = '2.25'
+version = '%s-%s' % (local_gccver, local_binutilsver)
 
 homepage = 'http://www.gnu.org/software/'
 description = "Compiler-only toolchain with GCC and binutils."
@@ -12,9 +12,9 @@ toolchain = SYSTEM
 
 dependencies = [
     # GCC built on top of (dummy-built) binutils
-    ('GCC', gccver, '-binutils-%s' % binutilsver),
+    ('GCC', local_gccver, '-binutils-%s' % local_binutilsver),
     # binutils built on top of GCC, which was built on top of (dummy-built) binutils
-    ('binutils', binutilsver, '', ('GCC', '%s-binutils-%s' % (gccver, binutilsver))),
+    ('binutils', local_binutilsver, '', ('GCC', '%s-binutils-%s' % (local_gccver, local_binutilsver))),
 ]
 
 moduleclass = 'toolchain'

easybuild/easyconfigs/g/GNU/GNU-5.1.0-2.25.eb

@@ -1,9 +1,9 @@
 easyblock = 'Toolchain'
 
 name = 'GNU'
-gccver = '5.1.0'
-binutilsver = '2.25'
-version = '%s-%s' % (gccver, binutilsver)
+local_gccver = '5.1.0'
+local_binutilsver = '2.25'
+version = '%s-%s' % (local_gccver, local_binutilsver)
 
 homepage = 'http://www.gnu.org/software/'
 description = "Compiler-only toolchain with GCC and binutils."
@@ -12,9 +12,9 @@ toolchain = SYSTEM
 
 dependencies = [
     # GCC built on top of (dummy-built) binutils
-    ('GCC', gccver, '-binutils-%s' % binutilsver),
+    ('GCC', local_gccver, '-binutils-%s' % local_binutilsver),
     # binutils built on top of GCC, which was built on top of (dummy-built) binutils
-    ('binutils', binutilsver, '', ('GCC', '%s-binutils-%s' % (gccver, binutilsver))),
+    ('binutils', local_binutilsver, '', ('GCC', '%s-binutils-%s' % (local_gccver, local_binutilsver))),
 ]
 
 moduleclass = 'toolchain'

easybuild/easyconfigs/g/gcccuda/gcccuda-2016.08.eb

@@ -8,14 +8,12 @@ description = """GNU Compiler Collection (GCC) based compiler toolchain, along w
 
 toolchain = SYSTEM
 
-comp_name = 'GCC'
-comp_ver = '4.9.4-2.25'
-comp = (comp_name, comp_ver)
+local_comp = ('GCC', '4.9.4-2.25')
 
 # compiler toolchain dependencies
 dependencies = [
-    comp,
-    ('CUDA', '7.5.18', '', comp),
+    local_comp,
+    ('CUDA', '7.5.18', '', local_comp),
 ]
 
 moduleclass = 'toolchain'

easybuild/easyconfigs/g/gcccuda/gcccuda-2017b.eb

@@ -8,14 +8,12 @@ description = """GNU Compiler Collection (GCC) based compiler toolchain, along w
 
 toolchain = SYSTEM
 
-comp_name = 'GCC'
-comp_ver = '6.4.0-2.28'
-comp = (comp_name, comp_ver)
+local_comp = ('GCC', '6.4.0-2.28')
 
 # compiler toolchain dependencies
 dependencies = [
-    comp,
-    ('CUDA', '9.0.176', '', comp),
+    local_comp,
+    ('CUDA', '9.0.176', '', local_comp),
 ]
 
 moduleclass = 'toolchain'

easybuild/easyconfigs/g/gcccuda/gcccuda-2018a.eb

@@ -8,14 +8,12 @@ description = """GNU Compiler Collection (GCC) based compiler toolchain, along w
 
 toolchain = SYSTEM
 
-comp_name = 'GCC'
-comp_ver = '6.4.0-2.28'
-comp = (comp_name, comp_ver)
+local_comp = ('GCC', '6.4.0-2.28')
 
 # compiler toolchain dependencies
 dependencies = [
-    comp,
-    ('CUDA', '9.1.85', '', comp),
+    local_comp,
+    ('CUDA', '9.1.85', '', local_comp),
 ]
 
 moduleclass = 'toolchain'

easybuild/easyconfigs/g/gcccuda/gcccuda-2018b.eb

@@ -8,14 +8,12 @@ description = """GNU Compiler Collection (GCC) based compiler toolchain, along w
 
 toolchain = SYSTEM
 
-comp_name = 'GCC'
-comp_ver = '7.3.0-2.30'
-comp = (comp_name, comp_ver)
+local_comp = ('GCC', '7.3.0-2.30')
 
 # compiler toolchain dependencies
 dependencies = [
-    comp,
-    ('CUDA', '9.2.88', '', comp),
+    local_comp,
+    ('CUDA', '9.2.88', '', local_comp),
 ]
 
 moduleclass = 'toolchain'

easybuild/easyconfigs/g/gcccuda/gcccuda-2019a.eb

@@ -8,14 +8,12 @@ description = """GNU Compiler Collection (GCC) based compiler toolchain, along w
 
 toolchain = SYSTEM
 
-comp_name = 'GCC'
-comp_ver = '8.2.0-2.31.1'
-comp = (comp_name, comp_ver)
+local_comp = ('GCC', '8.2.0-2.31.1')
 
 # compiler toolchain dependencies
 dependencies = [
-    comp,
-    ('CUDA', '10.1.105', '', comp),
+    local_comp,
+    ('CUDA', '10.1.105', '', local_comp),
 ]
 
 moduleclass = 'toolchain'