From f8201f4acc53bbb7efcde77a369546181b802d19 Mon Sep 17 00:00:00 2001 From: iarspider Date: Thu, 24 Mar 2022 20:23:52 +0100 Subject: Fix py-onnx-runtime recipe (#29646) * Fix py-onnx-runtime recipe * Add missing dependencies * Update var/spack/repos/builtin/packages/py-cerberus/package.py Co-authored-by: Adam J. Stewart * Update package.py * Better fix for py-onnx-runtime Co-authored-by: Adam J. Stewart --- .../repos/builtin/packages/py-cerberus/package.py | 19 +++++++++++++++++++ .../repos/builtin/packages/py-onnx-runtime/package.py | 16 +++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-cerberus/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cerberus/package.py b/var/spack/repos/builtin/packages/py-cerberus/package.py new file mode 100644 index 0000000000..3ac18eb435 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cerberus/package.py @@ -0,0 +1,19 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class PyCerberus(PythonPackage): + """Lightweight, extensible schema and data validation + tool for Python dictionaries""" + + homepage = "http://docs.python-cerberus.org/" + pypi = "Cerberus/Cerberus-1.3.4.tar.gz" + + version('1.3.4', sha256='d1b21b3954b2498d9a79edf16b3170a3ac1021df88d197dc2ce5928ba519237c') + + depends_on('python@2.7:', type=('build', 'run')) + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-onnx-runtime/package.py b/var/spack/repos/builtin/packages/py-onnx-runtime/package.py index b79c919700..d2eef4d69c 100644 --- a/var/spack/repos/builtin/packages/py-onnx-runtime/package.py +++ b/var/spack/repos/builtin/packages/py-onnx-runtime/package.py @@ -30,6 +30,9 @@ class PyOnnxRuntime(CMakePackage, PythonPackage): depends_on('py-protobuf', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy@1.16.6:', type=('build', 'run')) + depends_on('py-sympy@1.1:', type=('build', 'run')) + depends_on('py-packaging', type=('build', 'run')) + depends_on('py-cerberus', type=('build', 'run')) depends_on('py-wheel', type='build') depends_on('py-onnx', type=('build', 'run')) depends_on('zlib') @@ -57,6 +60,7 @@ class PyOnnxRuntime(CMakePackage, PythonPackage): generator = 'Ninja' root_cmakelists_dir = 'cmake' + build_directory = '.' def setup_build_environment(self, env): value = self.spec.variants['dynamic_cpu_arch'].value @@ -106,16 +110,6 @@ class PyOnnxRuntime(CMakePackage, PythonPackage): return args - def setup_file(self): - return join_path(self.stage.source_path, 'setup.py') - - @run_after('build') - def build_python(self): - """Build everything needed to install.""" - with working_dir(self.stage.source_path): - PythonPackage.build(self, self.spec, self.prefix) - @run_after('install') def install_python(self): - with working_dir(self.stage.source_path): - PythonPackage.install(self, self.spec, self.prefix) + PythonPackage.install(self, self.spec, self.prefix) -- cgit v1.2.3-70-g09d2