From e57256a07c1c39afec0e9355e8433ea01dcbd569 Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Fri, 20 Dec 2024 09:46:04 -0800 Subject: [PATCH 1/4] Extract archive in different location --- cmake/download_onnxruntime.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/download_onnxruntime.cmake b/cmake/download_onnxruntime.cmake index 0c09025..6401c2b 100644 --- a/cmake/download_onnxruntime.cmake +++ b/cmake/download_onnxruntime.cmake @@ -1,7 +1,7 @@ if(DEFINED TRITON_ONNXRUNTIME_PACKAGE_URL) set(DOWNLOAD_PATH "${CMAKE_BINARY_DIR}/_deps/downloads/onnxruntime.zip") - set(EXTRACT_DIR "${CMAKE_BINARY_DIR}/_deps/downloads/onnxruntime") + set(EXTRACT_DIR "${CMAKE_BINARY_DIR}/onnxruntime") message(NOTICE "Downloading onnxruntime: ${TRITON_ONNXRUNTIME_PACKAGE_URL}") From 59e24e48c6306990f8a59326164f3acef842b3c4 Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Thu, 2 Jan 2025 12:37:57 -0800 Subject: [PATCH 2/4] Revert "Extract archive in different location" This reverts commit e57256a07c1c39afec0e9355e8433ea01dcbd569. --- cmake/download_onnxruntime.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/download_onnxruntime.cmake b/cmake/download_onnxruntime.cmake index 6401c2b..0c09025 100644 --- a/cmake/download_onnxruntime.cmake +++ b/cmake/download_onnxruntime.cmake @@ -1,7 +1,7 @@ if(DEFINED TRITON_ONNXRUNTIME_PACKAGE_URL) set(DOWNLOAD_PATH "${CMAKE_BINARY_DIR}/_deps/downloads/onnxruntime.zip") - set(EXTRACT_DIR "${CMAKE_BINARY_DIR}/onnxruntime") + set(EXTRACT_DIR "${CMAKE_BINARY_DIR}/_deps/downloads/onnxruntime") message(NOTICE "Downloading onnxruntime: ${TRITON_ONNXRUNTIME_PACKAGE_URL}") From 75beb428781ed3d10be9d41c93ac32d09303ef97 Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Thu, 2 Jan 2025 12:38:46 -0800 Subject: [PATCH 3/4] Update installation instructions --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94d396d..3e450fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -418,7 +418,7 @@ install( # that tar file. We copy over the libraries and other requirements # prior to running this build and therefore these set of install # commands are not needed. -if(TRITON_ONNXRUNTIME_DOCKER_BUILD) +if(TRITON_ONNXRUNTIME_DOCKER_BUILD OR DEFINED TRITON_ONNXRUNTIME_PACKAGE_URL) install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/onnxruntime/ From 6172c67cee2cc1df247283f5ffa48491845f249b Mon Sep 17 00:00:00 2001 From: Misha Chornyi Date: Thu, 2 Jan 2025 14:22:17 -0800 Subject: [PATCH 4/4] Reapply "Extract archive in different location" This reverts commit 59e24e48c6306990f8a59326164f3acef842b3c4. --- cmake/download_onnxruntime.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/download_onnxruntime.cmake b/cmake/download_onnxruntime.cmake index 0c09025..6401c2b 100644 --- a/cmake/download_onnxruntime.cmake +++ b/cmake/download_onnxruntime.cmake @@ -1,7 +1,7 @@ if(DEFINED TRITON_ONNXRUNTIME_PACKAGE_URL) set(DOWNLOAD_PATH "${CMAKE_BINARY_DIR}/_deps/downloads/onnxruntime.zip") - set(EXTRACT_DIR "${CMAKE_BINARY_DIR}/_deps/downloads/onnxruntime") + set(EXTRACT_DIR "${CMAKE_BINARY_DIR}/onnxruntime") message(NOTICE "Downloading onnxruntime: ${TRITON_ONNXRUNTIME_PACKAGE_URL}")