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

PyTorch/Torchvision: fix deptype (#16495)

Browse Source
This commit is contained in:
Adam J. Stewart 2020-05-06 18:05:26 -05:00 committed by GitHub
parent d1983d7395
commit 74b3ae4803
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/py-torch/package.py
View File

@ -124,7 +124,7 @@ class PyTorch(PythonPackage, CudaPackage):
depends_on('py-future', when='@1.1: ^python@:2', type='build')
depends_on('py-pyyaml', type=('build', 'run'))
depends_on('py-typing', when='@0.4: ^python@:3.4', type=('build', 'run'))
depends_on('py-pybind11', when='@0.4:', type=('build', 'run'))
depends_on('py-pybind11', when='@0.4:', type=('build', 'link', 'run'))
depends_on('blas')
depends_on('lapack')
depends_on('protobuf', when='@0.4:')

6
var/spack/repos/builtin/packages/py-torchvision/package.py
View File

@ -32,9 +32,9 @@ class PyTorchvision(PythonPackage):
depends_on('py-setuptools', type='build')
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-six', when='@:0.5', type=('build', 'run'))
depends_on('py-torch@1.4:', when='@0.6:', type=('build', 'run'))
depends_on('py-torch@1.2:', when='@0.4:', type=('build', 'run'))
depends_on('py-torch@1.1:', type=('build', 'run'))
depends_on('py-torch@1.4:', when='@0.6:', type=('build', 'link', 'run'))
depends_on('py-torch@1.2:', when='@0.4:', type=('build', 'link', 'run'))
depends_on('py-torch@1.1:', type=('build', 'link', 'run'))
# https://github.com/pytorch/vision/issues/1712
depends_on('py-pillow@4.1.1:6', when='@:0.4', type=('build', 'run')) # or py-pillow-simd
depends_on('py-pillow@4.1.1:', when='@0.5:', type=('build', 'run')) # or py-pillow-simd