Merge pull request #9178 from akesandgren/20191017161611_new_pr_fossc…

…uda2019b fix definition of fosscuda/2019b to make sure it works with hierarchical MNS
easybuilders · Nov 12, 2019 · 3125664 · 3125664
2 parents 13dba2d + 3da64a2
commit 3125664
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/easybuild/easyconfigs/c/CUDA/CUDA-10.1.243-GCC-8.3.0.eb b/easybuild/easyconfigs/c/CUDA/CUDA-10.1.243-GCC-8.3.0.eb
@@ -0,0 +1,19 @@
+# Contribution from the Crick HPC team
+# uploaded by J. Sassmannshausen
+
+name = 'CUDA'
+version = '10.1.243'
+
+homepage = 'https://developer.nvidia.com/cuda-toolkit'
+description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
+ computing platform and programming model created by NVIDIA and implemented by the
+ graphics processing units (GPUs) that they produce. CUDA gives developers access
+ to the virtual instruction set and memory of the parallel computational elements in CUDA GPUs."""
+
+toolchain = {'name': 'GCC', 'version': '8.3.0'}
+
+source_urls = ['https://developer.download.nvidia.com/compute/cuda/%(version_major_minor)s/Prod/local_installers/']
+sources = ['%(namelower)s_%(version)s_418.87.00_linux.run']
+checksums = ['e7c22dc21278eb1b82f34a60ad7640b41ad3943d929bebda3008b72536855d31']
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/f/fosscuda/fosscuda-2019b.eb b/easybuild/easyconfigs/f/fosscuda/fosscuda-2019b.eb
@@ -19,8 +19,8 @@ local_comp_mpi_tc = ('gompic', version)
 # gompic toolchain because of toolchain preperation functions.
 dependencies = [
     ('GCC', local_gccver),  # part of gompic
+    ('CUDA', '10.1.243', '', ('GCC', local_gccver)),  # part of gompic
     ('OpenMPI', '3.1.4', '', ('gcccuda', version)),  # part of gompic
-    ('CUDA', '10.1.243', '', True),
     ('OpenBLAS', '0.3.7', '', ('GCC', local_gccver)),
     ('FFTW', '3.3.8', '', local_comp_mpi_tc),
     ('ScaLAPACK', '2.0.2', '', local_comp_mpi_tc),

diff --git a/easybuild/easyconfigs/g/gcccuda/gcccuda-2019b.eb b/easybuild/easyconfigs/g/gcccuda/gcccuda-2019b.eb
@@ -8,10 +8,12 @@ description = """GNU Compiler Collection (GCC) based compiler toolchain, along w
 
 toolchain = SYSTEM
 
+local_gcc_version = '8.3.0'
+
 # compiler toolchain dependencies
 dependencies = [
-    ('GCC', '8.3.0'),
-    ('CUDA', '10.1.243', '', True),
+    ('GCC', local_gcc_version),
+    ('CUDA', '10.1.243', '', ('GCC', local_gcc_version)),
 ]
 
 moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gompic/gompic-2019b.eb b/easybuild/easyconfigs/g/gompic/gompic-2019b.eb
@@ -14,8 +14,8 @@ local_gccver = '8.3.0'
 # compiler toolchain dependencies
 dependencies = [
     ('GCC', local_gccver),  # part of gcccuda
+    ('CUDA', '10.1.243', '', ('GCC', local_gccver)),  # part of gcccuda
     ('OpenMPI', '3.1.4', '', ('gcccuda', version)),
-    ('CUDA', '10.1.243', '', True),
 ]
 
 moduleclass = 'toolchain'