From ab5afb949c1fc028b8230970797bf214f0da758d Mon Sep 17 00:00:00 2001 From: Fares Schulz Date: Fri, 6 Dec 2024 12:02:58 +0100 Subject: [PATCH] inference-backends rootpaths after download now contain also os and architecture --- cmake/SetupLibTorch.cmake | 2 +- cmake/SetupOnnxRuntime.cmake | 2 +- cmake/SetupTensorflowLite.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/SetupLibTorch.cmake b/cmake/SetupLibTorch.cmake index 0ff32ea..49ffc26 100644 --- a/cmake/SetupLibTorch.cmake +++ b/cmake/SetupLibTorch.cmake @@ -16,7 +16,7 @@ else() endif() option(LIBTORCH_ROOTDIR "libtorch root dir") -set(LIBTORCH_DIR_NAME "libtorch-${LIBTORCH_VERSION}${TORCH_BUILD_TYPE}") +set(LIBTORCH_DIR_NAME "libtorch-${LIBTORCH_VERSION}${TORCH_BUILD_TYPE}-${ANIRA_OPERATING_SYSTEM}-${CMAKE_SYSTEM_PROCESSOR}") set(LIBTORCH_ROOTDIR ${CMAKE_CURRENT_SOURCE_DIR}/modules/${LIBTORCH_DIR_NAME}) if(EXISTS ${LIBTORCH_ROOTDIR}/) diff --git a/cmake/SetupOnnxRuntime.cmake b/cmake/SetupOnnxRuntime.cmake index fb0ff9d..dce4ed2 100644 --- a/cmake/SetupOnnxRuntime.cmake +++ b/cmake/SetupOnnxRuntime.cmake @@ -1,7 +1,7 @@ set(LIBONNXRUNTIME_VERSION 1.19.2) option(ONNXRUNTIME_ROOTDIR "onnxruntime root dir") -set(ONNXRUNTIME_DIR_NAME "onnxruntime-${LIBONNXRUNTIME_VERSION}") +set(ONNXRUNTIME_DIR_NAME "onnxruntime-${LIBONNXRUNTIME_VERSION}-${ANIRA_OPERATING_SYSTEM}-${CMAKE_SYSTEM_PROCESSOR}") set(ONNXRUNTIME_ROOTDIR ${CMAKE_CURRENT_SOURCE_DIR}/modules/${ONNXRUNTIME_DIR_NAME}) if(EXISTS ${ONNXRUNTIME_ROOTDIR}/) diff --git a/cmake/SetupTensorflowLite.cmake b/cmake/SetupTensorflowLite.cmake index c1a1a61..2e6f5e8 100644 --- a/cmake/SetupTensorflowLite.cmake +++ b/cmake/SetupTensorflowLite.cmake @@ -5,7 +5,7 @@ else() endif() option(TENSORFLOWLITE_ROOTDIR "tensorflowlite root dir") -set(TENSORFLOWLITE_DIR_NAME "tensorflowlite-${LIBTENSORFLOWLITE_VERSION}") +set(TENSORFLOWLITE_DIR_NAME "tensorflowlite-${LIBTENSORFLOWLITE_VERSION}-${ANIRA_OPERATING_SYSTEM}-${CMAKE_SYSTEM_PROCESSOR}") set(TENSORFLOWLITE_ROOTDIR ${CMAKE_CURRENT_SOURCE_DIR}/modules/${TENSORFLOWLITE_DIR_NAME}) if(EXISTS ${TENSORFLOWLITE_ROOTDIR}/)