PyTorch: remove CUDA conflicts (#16136)

This commit is contained in:
Adam J. Stewart 2020-04-20 14:57:56 -05:00 committed by GitHub
parent de13ea2284
commit 0db2f00635
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -6,7 +6,6 @@
from spack import * from spack import *
# TODO: try switching to CMakePackage for more control over build
class PyTorch(PythonPackage, CudaPackage): class PyTorch(PythonPackage, CudaPackage):
"""Tensors and Dynamic neural networks in Python """Tensors and Dynamic neural networks in Python
with strong GPU acceleration.""" with strong GPU acceleration."""
@ -107,26 +106,9 @@ class PyTorch(PythonPackage, CudaPackage):
# see https://github.com/pytorch/pytorch/issues/35149 # see https://github.com/pytorch/pytorch/issues/35149
conflicts('+fbgemm', when='@1.4.0') conflicts('+fbgemm', when='@1.4.0')
cuda_arch_conflict = ('This version of Torch/Caffe2 only supports compute '
'capabilities ')
conflicts('cuda_arch=none', when='+cuda', conflicts('cuda_arch=none', when='+cuda',
msg='Must specify CUDA compute capabilities of your GPU, see ' msg='Must specify CUDA compute capabilities of your GPU, see '
'https://developer.nvidia.com/cuda-gpus') 'https://developer.nvidia.com/cuda-gpus')
conflicts('cuda_arch=52', when='@1.3.0:+cuda',
msg=cuda_arch_conflict + '>=5.3')
conflicts('cuda_arch=50', when='@1.3.0:+cuda',
msg=cuda_arch_conflict + '>=5.3')
conflicts('cuda_arch=35', when='@1.3.0:+cuda',
msg=cuda_arch_conflict + '>=5.3')
conflicts('cuda_arch=32', when='@1.3.0:+cuda',
msg=cuda_arch_conflict + '>=5.3')
conflicts('cuda_arch=30', when='@1.3.0:+cuda',
msg=cuda_arch_conflict + '>=5.3')
conflicts('cuda_arch=30', when='@1.2.0:+cuda',
msg=cuda_arch_conflict + '>=3.2')
conflicts('cuda_arch=20', when='@1.0.0:+cuda',
msg=cuda_arch_conflict + '>=3.0')
# Required dependencies # Required dependencies
depends_on('cmake@3.5:', type='build') depends_on('cmake@3.5:', type='build')