Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

onnxruntime: add version 1.19.2 #25039

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

onnxruntime: add version 1.19.2 #25039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4195022
onnxruntime: add version 1.19.0
mayeut Aug 25, 2024
3809491
move onnx version lookup back into conanfile.py
mayeut Aug 25, 2024
5bd2398
Merge branch 'master' of https://github.com/conan-io/conan-center-ind…
czoido Sep 5, 2024
4dd76f2
revert versions change
czoido Sep 5, 2024
94caef3
update patches
czoido Sep 5, 2024
9a7674c
Merge branch 'master' into onnxruntime-1.19
mayeut Oct 2, 2024
5f53e91
onnxruntime: add version 1.19.2
mayeut Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion recipes/onnxruntime/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.19.2":
url: "https://github.com/microsoft/onnxruntime/archive/refs/tags/v1.19.2.tar.gz"
sha256: "870ee3772d265d1c7b0799ac7280071f8ecd55b11ee3f11868a3e79c7f4cab0f"
"1.18.1":
url: "https://github.com/microsoft/onnxruntime/archive/refs/tags/v1.18.1.tar.gz"
sha256: "480ff5d2450ff18d02db48908c9c0c6a602993942cb47866b8effe32d0469a2c"
Expand All @@ -15,6 +18,16 @@
url: "https://github.com/microsoft/onnxruntime/archive/refs/tags/v1.14.1.tar.gz"
sha256: "f998352b131bb89fa7dd1f1d87ddbafe647dfaddd11929b6b5168b3f4ef857de"
patches:
"1.19.2":
- patch_file: "patches/1.17.3-0002-missing-include.patch"
patch_description: "add missing '<optional>' include when abseil is built without c++17 support"
patch_type: "portability"
- patch_file: "patches/1.18.0-0004-abseil-no-string-view.patch"
patch_description: "allow to build with abseil built without c++17 support"
patch_type: "portability"
- patch_file: "patches/1.19.0-0005-fix-cutlass-cuda-provider.patch"
patch_description: "use cutlass from Conan"
patch_type: "portability"
"1.18.1":
- patch_file: "patches/1.17.3-0002-missing-include.patch"
patch_description: "add missing '<optional>' include when abseil is built without c++17 support"
Expand Down Expand Up @@ -52,8 +65,8 @@
patch_source: "https://github.com/microsoft/onnxruntime/pull/15983"
patch_type: "backport"
"1.14.1":
- patch_file: "patches/1.14.1-0001-cmake-dependencies.patch"
patch_description: "CMake: ensure conan dependencies are used (upstreamed future versions)"

Check warning on line 69 in recipes/onnxruntime/all/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

found arbitrary text in 
        patch_type: backport
    ^ (line: 69)
patch_type: "conan"
- patch_file: "patches/1.14.1-0003-amx-gas-version.patch"
patch_description: "Check GNU AS supports AMX before enabling it"
Expand All @@ -66,10 +79,11 @@
patch_description: "Ensures the forward compatibility with the newest versions of re2 library."
patch_type: "portability"
patch_source: "https://github.com/microsoft/onnxruntime/commit/126e7bf15fa4af8621814b82a3f7bd0d786f0239.patch"

# ONNX versions are based on the minor version used at
# https://github.com/microsoft/onnxruntime/tree/main/cmake/external
onnx_version_map:
"1.19.2": "1.16.2"
"1.18.1": "1.16.2"
"1.17.3": "1.15.0"
"1.16.3": "1.14.1"
Expand Down
2 changes: 1 addition & 1 deletion recipes/onnxruntime/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def _patch_sources(self):
if Version(self.version) >= "15.0":
replace_in_file(self, os.path.join(self.source_folder, "cmake", "CMakeLists.txt"),
"if (Git_FOUND)", "if (FALSE)")
if Version(self.version) >= "1.17":
if Version(self.version) >= "1.17" and Version(self.version) < "1.19":
# https://github.com/microsoft/onnxruntime/commit/5bfca1dc576720627f3af8f65e25af408271079b
replace_in_file(self, os.path.join(self.source_folder, "cmake", "onnxruntime_providers_cuda.cmake"),
'option(onnxruntime_NVCC_THREADS "Number of threads that NVCC can use for compilation." 1)',
Expand Down
15 changes: 15 additions & 0 deletions recipes/onnxruntime/all/patches/1.19.0-0005-fix-cutlass-cuda-provider.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/cmake/onnxruntime_providers_cuda.cmake b/cmake/onnxruntime_providers_cuda.cmake
index 0829be05a3..c16dfd9e52 100644
--- a/cmake/onnxruntime_providers_cuda.cmake
+++ b/cmake/onnxruntime_providers_cuda.cmake
@@ -217,8 +217,8 @@
target_link_libraries(${target} PRIVATE CUDA::cuda_driver)
endif()

- include(cutlass)
- target_include_directories(${target} PRIVATE ${cutlass_SOURCE_DIR}/include ${cutlass_SOURCE_DIR}/examples ${cutlass_SOURCE_DIR}/tools/util/include)
+ find_package(NvidiaCutlass)
+ target_link_libraries(${target} PRIVATE nvidia::cutlass::cutlass)

target_include_directories(${target} PRIVATE ${ONNXRUNTIME_ROOT} ${CMAKE_CURRENT_BINARY_DIR} ${eigen_INCLUDE_DIRS} ${TVM_INCLUDES}
PUBLIC ${CUDAToolkit_INCLUDE_DIRS})
2 changes: 2 additions & 0 deletions recipes/onnxruntime/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.19.2":
folder: all
"1.18.1":
folder: all
"1.17.3":
Expand Down
Loading