From c03d4688e42b30bb7a9299d1a523bcf7ac55c080 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Sun, 10 May 2020 19:40:00 -0500 Subject: [PATCH] PyTorch: fix master and mkldnn builds (#16560) --- var/spack/repos/builtin/packages/py-torch/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py index 024e0d95b23..ce69a5581c6 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -247,7 +247,7 @@ def enable_or_disable(variant, keyword='USE', var=None, newer=False): enable_or_disable('mkldnn') 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('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('binary', keyword='BUILD', newer=True) - env.set('PYTORCH_BUILD_VERSION', self.version) - env.set('PYTORCH_BUILD_NUMBER', 0) + if not self.spec.satisfies('@master'): + env.set('PYTORCH_BUILD_VERSION', self.version) + env.set('PYTORCH_BUILD_NUMBER', 0) # BLAS to be used by Caffe2 if '^mkl' in self.spec: