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

PyTorch: avoid use of third party vendored deps (#13588)

Browse Source 
* PyTorch: avoid use of third party vendored deps

* Flake8 fix
This commit is contained in:
Adam J. Stewart 2019-11-05 13:19:07 -06:00 committed by GitHub
parent 7a0bed7893
commit 27ab045dc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@
from spack import * from spack import *
# TODO: try switching to CMakePackage for more control over build
class PyTorch(PythonPackage): class PyTorch(PythonPackage):
"""Tensors and Dynamic neural networks in Python """Tensors and Dynamic neural networks in Python
with strong GPU acceleration.""" with strong GPU acceleration."""
@ -102,12 +103,16 @@ class PyTorch(PythonPackage):
depends_on('cmake@3.5:', type='build') depends_on('cmake@3.5:', type='build')
depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) depends_on('python@2.7:2.8,3.5:', type=('build', 'run'))
depends_on('py-setuptools', type='build') depends_on('py-setuptools', type='build')
depends_on('py-numpy', type=('run', 'build')) depends_on('py-numpy', type=('build', 'run'))
depends_on('py-future', when='@1.1: ^python@:2', type='build') depends_on('py-future', when='@1.1: ^python@:2', type='build')
depends_on('py-pyyaml', type=('run', 'build')) depends_on('py-pyyaml', type=('build', 'run'))
depends_on('py-typing', when='@0.4: ^python@:3.4', type=('run', 'build')) 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('blas') depends_on('blas')
depends_on('lapack') depends_on('lapack')
depends_on('protobuf', when='@0.4:')
depends_on('eigen', when='@0.4:')
# TODO: replace all third_party packages with Spack packages
# Optional dependencies # Optional dependencies
depends_on('cuda@7.5:', when='+cuda', type=('build', 'link', 'run')) depends_on('cuda@7.5:', when='+cuda', type=('build', 'link', 'run'))
@ -175,6 +180,14 @@ def enable_or_disable(variant, keyword='USE', var=None, newer=False):
env.set('MAX_JOBS', make_jobs) env.set('MAX_JOBS', make_jobs)
# Don't use vendored third-party libraries
env.set('BUILD_CUSTOM_PROTOBUF', 'OFF')
env.set('USE_PYTORCH_QNNPACK', 'OFF')
env.set('USE_SYSTEM_EIGEN_INSTALL', 'ON')
env.set('pybind11_DIR', self.spec['py-pybind11'].prefix)
env.set('pybind11_INCLUDE_DIR',
self.spec['py-pybind11'].prefix.include)
enable_or_disable('cuda') enable_or_disable('cuda')
if '+cuda' in self.spec: if '+cuda' in self.spec:
env.set('CUDA_HOME', self.spec['cuda'].prefix) env.set('CUDA_HOME', self.spec['cuda'].prefix)
@ -200,8 +213,6 @@ def enable_or_disable(variant, keyword='USE', var=None, newer=False):
enable_or_disable('nnpack') enable_or_disable('nnpack')
enable_or_disable('qnnpack') enable_or_disable('qnnpack')
# Never use vendored copy of QNNPACK
env.set('USE_PYTORCH_QNNPACK=OFF')
enable_or_disable('distributed') enable_or_disable('distributed')
enable_or_disable('nccl') enable_or_disable('nccl')