Skip to content

Commit 7f27d4a

Browse files
Changming Sunashrit-ms
authored andcommitted
Update ORT extension to the latest (#23314)
Update ORT extension to the latest, to include some build system fixes.
1 parent d14d848 commit 7f27d4a

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

cgmanifests/generated/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@
306306
"component": {
307307
"type": "git",
308308
"git": {
309-
"commitHash": "94142d8391c9791ec71c38336436319a2d4ac7a0",
309+
"commitHash": "f3f6caa6e8adb420e005ec41c6fefc8d75affb6e",
310310
"repositoryUrl": "https://github.com/microsoft/onnxruntime-extensions.git"
311311
},
312312
"comments": "extensions"

cmake/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,11 @@ if (onnxruntime_EXTENDED_MINIMAL_BUILD AND NOT onnxruntime_MINIMAL_BUILD)
534534
set(onnxruntime_MINIMAL_BUILD ON)
535535
endif()
536536

537+
set(REPO_ROOT ${PROJECT_SOURCE_DIR}/..)
538+
set(ONNXRUNTIME_ROOT ${PROJECT_SOURCE_DIR}/../onnxruntime)
539+
set(ORTTRAINING_ROOT ${PROJECT_SOURCE_DIR}/../orttraining)
540+
set(ORTTRAINING_SOURCE_DIR ${ORTTRAINING_ROOT}/orttraining)
541+
537542
include(adjust_global_compile_flags.cmake)
538543

539544
if (APPLE)
@@ -565,10 +570,6 @@ if (NOT MSVC AND NOT (CMAKE_SYSTEM_NAME STREQUAL "iOS"))
565570
set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
566571
endif()
567572

568-
set(REPO_ROOT ${PROJECT_SOURCE_DIR}/..)
569-
set(ONNXRUNTIME_ROOT ${PROJECT_SOURCE_DIR}/../onnxruntime)
570-
set(ORTTRAINING_ROOT ${PROJECT_SOURCE_DIR}/../orttraining)
571-
set(ORTTRAINING_SOURCE_DIR ${ORTTRAINING_ROOT}/orttraining)
572573

573574
file (STRINGS "${REPO_ROOT}/VERSION_NUMBER" ORT_VERSION)
574575

cmake/adjust_global_compile_flags.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,3 +369,7 @@ if (WIN32)
369369
elseif(LINUX)
370370
add_compile_definitions("_GNU_SOURCE")
371371
endif()
372+
373+
if (onnxruntime_USE_EXTENSIONS)
374+
include_directories(${REPO_ROOT}/include/onnxruntime/core/session)
375+
endif()

cmake/deps.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ safeint;https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.28.zip;23f252
5454
tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2493f0949dc4be6b6a45e81.zip;67b833913605a4f3f499894ab11528a702c2b381
5555
cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.5.1.zip;e49b2b964163d27765a5002d210a2f3c73771835
5656
utf8_range;https://github.com/protocolbuffers/utf8_range/archive/72c943dea2b9240cd09efde15191e144bc7c7d38.zip;9925739c9debc0efa2adcb194d371a35b6a03156
57-
extensions;https://github.com/microsoft/onnxruntime-extensions/archive/94142d8391c9791ec71c38336436319a2d4ac7a0.zip;4365ac5140338b4cb75a39944a4be276e3829b3c
57+
extensions;https://github.com/microsoft/onnxruntime-extensions/archive/f3f6caa6e8adb420e005ec41c6fefc8d75affb6e.zip;cec2e164f1a00e7d80fd94df65e4e8d2daead70d
5858
composable_kernel;https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/204da9c522cebec5220bba52cd3542ebcaf99e7a.zip;1827348efd47831c13074245274d41b7cae8a557
5959
directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e
6060
cudnn_frontend;https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v1.7.0.zip;d0753d8d5b39947ca0729d7773cb84653a129eb1

tools/ci_build/github/azure-pipelines/templates/download-deps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ steps:
1111
packageType: upack
1212
feed: '/7424c8e4-5c62-490e-95c4-79446f31017c'
1313
definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0'
14-
version: 1.0.203
14+
version: 1.0.206
1515
downloadPath: $(Build.BinariesDirectory)/deps
1616

1717
# The private ADO project
@@ -22,7 +22,7 @@ steps:
2222
packageType: upack
2323
feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325'
2424
definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a'
25-
version: 1.0.203
25+
version: 1.0.206
2626
downloadPath: $(Build.BinariesDirectory)/deps
2727

2828
# You can add more ADO accounts at here.

0 commit comments

Comments
 (0)