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

PyTorch: fix master and mkldnn builds (#16560)

Browse Source
This commit is contained in:
Adam J. Stewart 2020-05-10 19:40:00 -05:00 committed by GitHub
parent 7d3b40fba4
commit c03d4688e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,7 @@ def enable_or_disable(variant, keyword='USE', var=None, newer=False):
enable_or_disable('mkldnn') enable_or_disable('mkldnn')
if '@0.4:0.4.1+mkldnn' in self.spec: if '@0.4:0.4.1+mkldnn' in self.spec:
env.set('MKLDNN_HOME', self.spec['intel-mkl-dnn'].prefix) env.set('MKLDNN_HOME', self.spec['onednn'].prefix)
enable_or_disable('nnpack') enable_or_disable('nnpack')
enable_or_disable('qnnpack') enable_or_disable('qnnpack')
@ -270,8 +270,9 @@ def enable_or_disable(variant, keyword='USE', var=None, newer=False):
enable_or_disable('lmdb', newer=True) enable_or_disable('lmdb', newer=True)
enable_or_disable('binary', keyword='BUILD', newer=True) enable_or_disable('binary', keyword='BUILD', newer=True)
env.set('PYTORCH_BUILD_VERSION', self.version) if not self.spec.satisfies('@master'):
env.set('PYTORCH_BUILD_NUMBER', 0) env.set('PYTORCH_BUILD_VERSION', self.version)
env.set('PYTORCH_BUILD_NUMBER', 0)
# BLAS to be used by Caffe2 # BLAS to be used by Caffe2
if '^mkl' in self.spec: if '^mkl' in self.spec: