diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2024-09-08 23:47:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-09 06:47:45 +0200 |
| commit | c4f3348af127f2579d717d4ac6eb4eb4e8e01a2e (patch) | |
| tree | 9867ea9530ed600ce4267eb99313a6707ec60448 /var | |
| parent | fec2f30d5adaf5c4e44ff4899692bd160a9a24e9 (diff) | |
| download | spack-c4f3348af127f2579d717d4ac6eb4eb4e8e01a2e.tar.gz spack-c4f3348af127f2579d717d4ac6eb4eb4e8e01a2e.tar.bz2 spack-c4f3348af127f2579d717d4ac6eb4eb4e8e01a2e.tar.xz spack-c4f3348af127f2579d717d4ac6eb4eb4e8e01a2e.zip | |
(py-)onnx: add v1.16.2; onnx: enable testing (#46274)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/onnx/package.py | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-onnx/package.py | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/onnx/package.py b/var/spack/repos/builtin/packages/onnx/package.py index 3cc781463e..ec9602c14b 100644 --- a/var/spack/repos/builtin/packages/onnx/package.py +++ b/var/spack/repos/builtin/packages/onnx/package.py @@ -17,9 +17,10 @@ class Onnx(CMakePackage): url = "https://github.com/onnx/onnx/archive/refs/tags/v1.9.0.tar.gz" git = "https://github.com/onnx/onnx.git" - license("Apache-2.0") + license("Apache-2.0", checked_by="wdconinc") version("master", branch="master") + version("1.16.2", sha256="84fc1c3d6133417f8a13af6643ed50983c91dacde5ffba16cc8bb39b22c2acbb") version("1.16.1", sha256="0e6aa2c0a59bb2d90858ad0040ea1807117cc2f05b97702170f18e6cd6b66fb3") version("1.16.0", sha256="0ce153e26ce2c00afca01c331a447d86fbf21b166b640551fe04258b4acfc6a4") version("1.15.0", sha256="c757132e018dd0dd171499ef74fca88b74c5430a20781ec53da19eb7f937ef68") @@ -61,7 +62,7 @@ class Onnx(CMakePackage): "1.1.0_2018-04-19", commit="7e1bed51cc508a25b22130de459830b5d5063c41" ) # py-torch@0.4.0 - depends_on("cxx", type="build") # generated + depends_on("cxx", type="build") generator("ninja") depends_on("cmake@3.1:", type="build") @@ -73,6 +74,9 @@ class Onnx(CMakePackage): filter_file("CMAKE_CXX_STANDARD 11", "CMAKE_CXX_STANDARD 14", "CMakeLists.txt") def cmake_args(self): - # Try to get ONNX to use the same version of python as the spec is using - args = ["-DPY_VERSION={0}".format(self.spec["python"].version.up_to(2))] + args = [ + # Try to get ONNX to use the same version of python as the spec is using + self.define("PY_VERSION", self.spec["python"].version.up_to(2)), + self.define("ONNX_BUILD_TESTS", self.run_tests), + ] return args diff --git a/var/spack/repos/builtin/packages/py-onnx/package.py b/var/spack/repos/builtin/packages/py-onnx/package.py index 63f3869b94..c80bee5736 100644 --- a/var/spack/repos/builtin/packages/py-onnx/package.py +++ b/var/spack/repos/builtin/packages/py-onnx/package.py @@ -19,8 +19,9 @@ class PyOnnx(PythonPackage): homepage = "https://github.com/onnx/onnx" pypi = "Onnx/onnx-1.6.0.tar.gz" - license("Apache-2.0") + license("Apache-2.0", checked_by="wdconinc") + version("1.16.2", sha256="b33a282b038813c4b69e73ea65c2909768e8dd6cc10619b70632335daf094646") version("1.16.1", sha256="8299193f0f2a3849bfc069641aa8e4f93696602da8d165632af8ee48ec7556b6") version("1.16.0", sha256="237c6987c6c59d9f44b6136f5819af79574f8d96a760a1fa843bede11f3822f7") version("1.15.0", sha256="b18461a7d38f286618ca2a6e78062a2a9c634ce498e631e708a8041b00094825") @@ -59,6 +60,8 @@ class PyOnnx(PythonPackage): depends_on("py-numpy", type=("build", "run")) depends_on("py-numpy@1.16.6:", type=("build", "run"), when="@1.8.1:1.13") depends_on("py-numpy@1.20:", type=("build", "run"), when="@1.16.0:") + depends_on("py-numpy@1.21:", type=("build", "run"), when="@1.16.2:") + depends_on("py-numpy@:1", type=("build", "run"), when="@:1.16") # Historical dependencies depends_on("py-six", type=("build", "run"), when="@:1.8.1") |