diff options
| author | jkelling <j.kelling@hzdr.de> | 2021-07-13 00:31:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 17:31:38 -0500 |
| commit | 81bad21d3a8d7eadb3afb6953698a564cbec8efd (patch) | |
| tree | e8f8216bbdf90a4880477bd61ef24de924af2d97 /var | |
| parent | f58b2e03ca5611a92f559f4b81eeae883c7b274a (diff) | |
| download | spack-81bad21d3a8d7eadb3afb6953698a564cbec8efd.tar.gz spack-81bad21d3a8d7eadb3afb6953698a564cbec8efd.tar.bz2 spack-81bad21d3a8d7eadb3afb6953698a564cbec8efd.tar.xz spack-81bad21d3a8d7eadb3afb6953698a564cbec8efd.zip | |
Update caffe package for cuda9 (#24831)
Add base CudaPackage, cuda_arch
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/caffe/package.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/caffe/package.py b/var/spack/repos/builtin/packages/caffe/package.py index 1dab412e95..b2f54a3d2d 100644 --- a/var/spack/repos/builtin/packages/caffe/package.py +++ b/var/spack/repos/builtin/packages/caffe/package.py @@ -6,7 +6,7 @@ from spack import * -class Caffe(CMakePackage): +class Caffe(CMakePackage, CudaPackage): """Caffe is a deep learning framework made with expression, speed, and modularity in mind. It is developed by the Berkeley Vision and Learning Center (BVLC) and by community contributors.""" @@ -43,7 +43,7 @@ class Caffe(CMakePackage): depends_on('hdf5 +hl +cxx') # Optional dependencies - depends_on('opencv@3.2.0+core+highgui+imgproc', when='+opencv') + depends_on('opencv@3.2.0:3.4.12+core+highgui+imgproc+imgcodecs', when='+opencv') depends_on('leveldb', when='+leveldb') depends_on('lmdb', when='+lmdb') depends_on('python@2.7:', when='+python') @@ -87,4 +87,10 @@ class Caffe(CMakePackage): '-DCMAKE_CXX_COMPILER={0}'.format(self.spec['mpi'].mpicxx) ]) + if '+cuda' in spec: + if spec.variants['cuda_arch'].value[0] != 'none': + cuda_arch = spec.variants['cuda_arch'].value + args.append(self.define('CUDA_ARCH_NAME', 'Manual')) + args.append(self.define('CUDA_ARCH_BIN', ' '.join(cuda_arch))) + return args |