zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename the gpu variant to cuda, this is to be consistent with other (#4890)

Browse Source 
packages.
This commit is contained in:
Jimmy Tang
2017-07-25 13:53:33 +01:00
committed by Adam J. Stewart
parent b0b86e5ffe
commit 2b792f943f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/caffe/package.py
View File

@@ -39,7 +39,7 @@ class Caffe(CMakePackage):
version('rc3', '84e39223115753b48312a8bf48c31f59') version('rc3', '84e39223115753b48312a8bf48c31f59')
version('rc2', 'c331932e34b5e2f5022fcc34c419080f') version('rc2', 'c331932e34b5e2f5022fcc34c419080f')
variant('gpu', default=False, variant('cuda', default=False,
description='Builds with support for GPUs via CUDA and cuDNN') description='Builds with support for GPUs via CUDA and cuDNN')
variant('opencv', default=True, variant('opencv', default=True,
description='Build with OpenCV support') description='Build with OpenCV support')
@@ -54,7 +54,7 @@ class Caffe(CMakePackage):
depends_on('boost') depends_on('boost')
depends_on('boost +python', when='+python') depends_on('boost +python', when='+python')
depends_on('cuda', when='+gpu') depends_on('cuda', when='+cuda')
depends_on('blas') depends_on('blas')
depends_on('protobuf') depends_on('protobuf')
depends_on('glog') depends_on('glog')
@@ -75,8 +75,8 @@ def cmake_args(self):
spec = self.spec spec = self.spec
args = ['-DBLAS={0}'.format('open' if spec['blas'].name == 'openblas' args = ['-DBLAS={0}'.format('open' if spec['blas'].name == 'openblas'
else spec['blas'].name), else spec['blas'].name),
'-DCPU_ONLY=%s' % ('~gpu' in spec), '-DCPU_ONLY=%s' % ('~cuda' in spec),
'-DUSE_CUDNN=%s' % ('+gpu' in spec), '-DUSE_CUDNN=%s' % ('+cuda' in spec),
'-DBUILD_python=%s' % ('+python' in spec), '-DBUILD_python=%s' % ('+python' in spec),
'-DBUILD_python_layer=%s' % ('+python' in spec), '-DBUILD_python_layer=%s' % ('+python' in spec),
'-DBUILD_matlab=%s' % ('+matlab' in spec), '-DBUILD_matlab=%s' % ('+matlab' in spec),