From ce0eb4862faabdcce076dddd1fbcc69d7e6d537a Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 16 Jun 2021 07:57:37 -0500 Subject: QNNPACK: add py-torch submodule commits (#24329) --- .../repos/builtin/packages/qnnpack/package.py | 35 +++++++++++++--------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/var/spack/repos/builtin/packages/qnnpack/package.py b/var/spack/repos/builtin/packages/qnnpack/package.py index eb2110d5dd..379af6e8f0 100644 --- a/var/spack/repos/builtin/packages/qnnpack/package.py +++ b/var/spack/repos/builtin/packages/qnnpack/package.py @@ -16,8 +16,13 @@ class Qnnpack(CMakePackage): git = "https://github.com/pytorch/QNNPACK.git" version('master', branch='master') + version('2019-08-28', commit='7d2a4e9931a82adc3814275b6219a03e24e36b4c') # py-torch@1.3:1.9 + version('2018-12-27', commit='6c62fddc6d15602be27e9e4cbb9e985151d2fa82') # py-torch@1.2 + version('2018-12-04', commit='ef05e87cef6b8e719989ce875b5e1c9fdb304c05') # py-torch@1.0:1.1 depends_on('cmake@3.5:', type='build') + depends_on('ninja', type='build') + depends_on('python', type='build') resource( name='cpuinfo', @@ -64,20 +69,22 @@ class Qnnpack(CMakePackage): placement='pthreadpool' ) + generator = 'Ninja' + def cmake_args(self): return [ - '-DCPUINFO_SOURCE_DIR={0}'.format( - join_path(self.stage.source_path, 'deps/cpuinfo')), - '-DFP16_SOURCE_DIR={0}'.format( - join_path(self.stage.source_path, 'deps/fp16')), - '-DFXDIV_SOURCE_DIR={0}'.format( - join_path(self.stage.source_path, 'deps/fxdiv')), - '-DPSIMD_SOURCE_DIR={0}'.format( - join_path(self.stage.source_path, 'deps/psimd')), - '-DPTHREADPOOL_SOURCE_DIR={0}'.format( - join_path(self.stage.source_path, 'deps/pthreadpool')), - '-DGOOGLEBENCHMARK_SOURCE_DIR={0}'.format( - join_path(self.stage.source_path, 'deps/googlebenchmark')), - '-DGOOGLETEST_SOURCE_DIR={0}'.format( - join_path(self.stage.source_path, 'deps/googletest')), + self.define('CPUINFO_SOURCE_DIR', + join_path(self.stage.source_path, 'deps', 'cpuinfo')), + self.define('FP16_SOURCE_DIR', + join_path(self.stage.source_path, 'deps', 'fp16')), + self.define('FXDIV_SOURCE_DIR', + join_path(self.stage.source_path, 'deps', 'fxdiv')), + self.define('PSIMD_SOURCE_DIR', + join_path(self.stage.source_path, 'deps', 'psimd')), + self.define('PTHREADPOOL_SOURCE_DIR', + join_path(self.stage.source_path, 'deps', 'pthreadpool')), + self.define('GOOGLEBENCHMARK_SOURCE_DIR', + join_path(self.stage.source_path, 'deps', 'googlebenchmark')), + self.define('GOOGLETEST_SOURCE_DIR', + join_path(self.stage.source_path, 'deps', 'googletest')), ] -- cgit v1.2.3-70-g09d2