diff options
| author | Jimmy Tang <jcftang@gmail.com> | 2017-07-25 13:53:33 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-07-25 07:53:33 -0500 |
| commit | 2b792f943f25a827257933d3a9f1b84e48f88c1a (patch) | |
| tree | ba77b98a8bab5bea0ef37ffdc9faef93b5fad3f2 /var | |
| parent | b0b86e5ffea5d11c75ae1946f23aa81ff899220c (diff) | |
| download | spack-2b792f943f25a827257933d3a9f1b84e48f88c1a.tar.gz spack-2b792f943f25a827257933d3a9f1b84e48f88c1a.tar.bz2 spack-2b792f943f25a827257933d3a9f1b84e48f88c1a.tar.xz spack-2b792f943f25a827257933d3a9f1b84e48f88c1a.zip | |
Rename the gpu variant to cuda, this is to be consistent with other (#4890)
packages.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/caffe/package.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/caffe/package.py b/var/spack/repos/builtin/packages/caffe/package.py index 4e2ef26dbb..021814c7fd 100644 --- a/var/spack/repos/builtin/packages/caffe/package.py +++ b/var/spack/repos/builtin/packages/caffe/package.py @@ -39,7 +39,7 @@ class Caffe(CMakePackage): version('rc3', '84e39223115753b48312a8bf48c31f59') version('rc2', 'c331932e34b5e2f5022fcc34c419080f') - variant('gpu', default=False, + variant('cuda', default=False, description='Builds with support for GPUs via CUDA and cuDNN') variant('opencv', default=True, description='Build with OpenCV support') @@ -54,7 +54,7 @@ class Caffe(CMakePackage): depends_on('boost') depends_on('boost +python', when='+python') - depends_on('cuda', when='+gpu') + depends_on('cuda', when='+cuda') depends_on('blas') depends_on('protobuf') depends_on('glog') @@ -75,8 +75,8 @@ class Caffe(CMakePackage): spec = self.spec args = ['-DBLAS={0}'.format('open' if spec['blas'].name == 'openblas' else spec['blas'].name), - '-DCPU_ONLY=%s' % ('~gpu' in spec), - '-DUSE_CUDNN=%s' % ('+gpu' in spec), + '-DCPU_ONLY=%s' % ('~cuda' in spec), + '-DUSE_CUDNN=%s' % ('+cuda' in spec), '-DBUILD_python=%s' % ('+python' in spec), '-DBUILD_python_layer=%s' % ('+python' in spec), '-DBUILD_matlab=%s' % ('+matlab' in spec), |