From 4dd76f275522e4eb1544751694072879fcb59d71 Mon Sep 17 00:00:00 2001 From: czoido Date: Thu, 5 Sep 2024 08:26:02 +0200 Subject: [PATCH] revert versions change --- recipes/onnxruntime/all/conanfile.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/recipes/onnxruntime/all/conanfile.py b/recipes/onnxruntime/all/conanfile.py index a0ccb1fc56844..ce3b31cb93581 100644 --- a/recipes/onnxruntime/all/conanfile.py +++ b/recipes/onnxruntime/all/conanfile.py @@ -79,22 +79,9 @@ def configure(self): def layout(self): cmake_layout(self, src_folder="src") - @property - def _onnx_version(self): - # ONNX versions are based on the minor version used at - # https://github.com/microsoft/onnxruntime/tree/main/cmake/external - version = Version(self.version) - return { - "1.14": "1.13.1", - "1.15": "1.14.1", - "1.16": "1.14.1", - "1.17": "1.15.0", - "1.18": "1.16.2", - "1.19": "1.16.2", - }[f"{version.major}.{version.minor}"] - def requirements(self): - self.requires(f"onnx/{self._onnx_version}") + required_onnx_version = self.conan_data["onnx_version_map"][self.version] + self.requires(f"onnx/{required_onnx_version}") self.requires("abseil/20240116.1") self.requires("protobuf/3.21.12") self.requires("date/3.0.1")