From 096ab11961995ac8d69f7b177cbcadf618d3068e Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" <ajstewart426@gmail.com> Date: Sat, 21 Sep 2024 18:59:20 +0200 Subject: py-onnx: link to external protobuf (#46434) --- var/spack/repos/builtin/packages/py-onnx/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-onnx/package.py b/var/spack/repos/builtin/packages/py-onnx/package.py index c80bee5736..e8286c232e 100644 --- a/var/spack/repos/builtin/packages/py-onnx/package.py +++ b/var/spack/repos/builtin/packages/py-onnx/package.py @@ -45,6 +45,7 @@ class PyOnnx(PythonPackage): # requirements.txt depends_on("py-setuptools@64:", type="build") depends_on("py-setuptools", type="build") + depends_on("protobuf") depends_on("py-protobuf@3.20.2:", type=("build", "run"), when="@1.15:") depends_on("py-protobuf@3.20.2:3", type=("build", "run"), when="@1.13") depends_on("py-protobuf@3.12.2:3.20.1", type=("build", "run"), when="@1.12") @@ -56,7 +57,6 @@ class PyOnnx(PythonPackage): # https://github.com/protocolbuffers/protobuf/pull/8794, fixed in # https://github.com/onnx/onnx/pull/3112 depends_on("py-protobuf@:3.17", type=("build", "run"), when="@:1.8") - depends_on("py-protobuf+cpp", type=("build", "run")) 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:") -- cgit v1.2.3-70-g09d2