hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix MPI-CUDA bug

Browse source
This commit is contained in:
Adam J. Stewart 2016-03-30 11:46:58 -05:00
parent 4ddba5f7ed
commit 9519f3d988
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
var/spack/repos/builtin/packages/cuda/package.py
View file

@ -16,9 +16,12 @@ class Cuda(Package):
see http://software.llnl.gov/spack/mirrors.html""" see http://software.llnl.gov/spack/mirrors.html"""
homepage = "http://www.nvidia.com/object/cuda_home_new.html" homepage = "http://www.nvidia.com/object/cuda_home_new.html"
url = "file://%s/cuda_7.5.18_linux.run" % os.getcwd()
version('7.5.18', '4b3bcecf0dfc35928a0898793cf3e4c6', expand=False) version('7.5.18', '4b3bcecf0dfc35928a0898793cf3e4c6', expand=False,
url="file://%s/cuda_7.5.18_linux.run" % os.getcwd())
version('6.5.14', '90b1b8f77313600cc294d9271741f4da', expand=False,
url="file://%s/cuda_6.5.14_linux_64.run" % os.getcwd())
def install(self, spec, prefix): def install(self, spec, prefix):
runfile = glob(os.path.join(self.stage.path, 'cuda*.run'))[0] runfile = glob(os.path.join(self.stage.path, 'cuda*.run'))[0]
@ -27,15 +30,13 @@ def install(self, spec, prefix):
runfile = which(runfile) runfile = which(runfile)
# Note: NVIDIA does not officially support many newer versions of compilers. # Note: NVIDIA does not officially support many newer versions of compilers.
# For example, on CentOS 6, you must use GCC 4.4.7 or older. # For example, on CentOS 6, you must use GCC 4.4.7 or older. See:
# The --override flag disables these checks. See:
# http://docs.nvidia.com/cuda/cuda-installation-guide-linux/#system-requirements # http://docs.nvidia.com/cuda/cuda-installation-guide-linux/#system-requirements
# for details. # for details.
runfile( runfile(
'--silent', # disable interactive prompts '--silent', # disable interactive prompts
'--verbose', # create verbose log file '--verbose', # create verbose log file
'--override', # ignore compiler checks
'--toolkit', # install CUDA Toolkit '--toolkit', # install CUDA Toolkit
'--toolkitpath=%s' % prefix '--toolkitpath=%s' % prefix
) )

13
var/spack/repos/builtin/packages/hoomd-blue/package.py
View file

@ -49,10 +49,14 @@ def install(self, spec, prefix):
cmake_args.append('-DENABLE_CUDA=OFF') cmake_args.append('-DENABLE_CUDA=OFF')
# CUDA-aware MPI library support # CUDA-aware MPI library support
if '+cuda' in spec and '+mpi' in spec: #if '+cuda' in spec and '+mpi' in spec:
cmake_args.append('-DENABLE_MPI_CUDA=ON') # cmake_args.append('-DENABLE_MPI_CUDA=ON')
else: #else:
cmake_args.append('-DENABLE_MPI_CUDA=OFF') # cmake_args.append('-DENABLE_MPI_CUDA=OFF')
# There may be a bug in the MPI-CUDA code. See:
# https://groups.google.com/forum/#!msg/hoomd-users/2griTESmc5I/E69s_M5fDwAJ
cmake_args.append('-DENABLE_MPI_CUDA=OFF')
# Documentation # Documentation
if '+doc' in spec: if '+doc' in spec:
@ -64,4 +68,5 @@ def install(self, spec, prefix):
cmake('.', *cmake_args) cmake('.', *cmake_args)
make() make()
make("test")
make("install") make("install")