From 74b3ae4803eb899fe0da7f762b601dd00dd9c376 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 6 May 2020 18:05:26 -0500 Subject: PyTorch/Torchvision: fix deptype (#16495) --- var/spack/repos/builtin/packages/py-torch/package.py | 2 +- var/spack/repos/builtin/packages/py-torchvision/package.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py index b2b15c7dfc..024e0d95b2 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -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:') diff --git a/var/spack/repos/builtin/packages/py-torchvision/package.py b/var/spack/repos/builtin/packages/py-torchvision/package.py index faee2f087a..9d4c3a0efa 100644 --- a/var/spack/repos/builtin/packages/py-torchvision/package.py +++ b/var/spack/repos/builtin/packages/py-torchvision/package.py @@ -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 -- cgit v1.2.3-70-g09d2