diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json index ced418e0f4..da79918310 100644 --- a/cgmanifests/generated/cgmanifest.json +++ b/cgmanifests/generated/cgmanifest.json @@ -306,7 +306,7 @@ "component": { "type": "git", "git": { - "commitHash": "94142d8391c9791ec71c38336436319a2d4ac7a0", + "commitHash": "f3f6caa6e8adb420e005ec41c6fefc8d75affb6e", "repositoryUrl": "https://github.com/microsoft/onnxruntime-extensions.git" }, "comments": "extensions" diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index febefff675..3b560166d8 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -534,6 +534,11 @@ if (onnxruntime_EXTENDED_MINIMAL_BUILD AND NOT onnxruntime_MINIMAL_BUILD) set(onnxruntime_MINIMAL_BUILD ON) endif() +set(REPO_ROOT ${PROJECT_SOURCE_DIR}/..) +set(ONNXRUNTIME_ROOT ${PROJECT_SOURCE_DIR}/../onnxruntime) +set(ORTTRAINING_ROOT ${PROJECT_SOURCE_DIR}/../orttraining) +set(ORTTRAINING_SOURCE_DIR ${ORTTRAINING_ROOT}/orttraining) + include(adjust_global_compile_flags.cmake) if (APPLE) @@ -565,10 +570,6 @@ if (NOT MSVC AND NOT (CMAKE_SYSTEM_NAME STREQUAL "iOS")) set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) endif() -set(REPO_ROOT ${PROJECT_SOURCE_DIR}/..) -set(ONNXRUNTIME_ROOT ${PROJECT_SOURCE_DIR}/../onnxruntime) -set(ORTTRAINING_ROOT ${PROJECT_SOURCE_DIR}/../orttraining) -set(ORTTRAINING_SOURCE_DIR ${ORTTRAINING_ROOT}/orttraining) file (STRINGS "${REPO_ROOT}/VERSION_NUMBER" ORT_VERSION) diff --git a/cmake/adjust_global_compile_flags.cmake b/cmake/adjust_global_compile_flags.cmake index a779f73ed1..8b5a744e49 100644 --- a/cmake/adjust_global_compile_flags.cmake +++ b/cmake/adjust_global_compile_flags.cmake @@ -369,3 +369,7 @@ if (WIN32) elseif(LINUX) add_compile_definitions("_GNU_SOURCE") endif() + +if (onnxruntime_USE_EXTENSIONS) + include_directories(${REPO_ROOT}/include/onnxruntime/core/session) +endif() \ No newline at end of file diff --git a/cmake/deps.txt b/cmake/deps.txt index cb5a5910fb..1082331974 100644 --- a/cmake/deps.txt +++ b/cmake/deps.txt @@ -54,7 +54,7 @@ safeint;https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.28.zip;23f252 tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2493f0949dc4be6b6a45e81.zip;67b833913605a4f3f499894ab11528a702c2b381 cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.5.1.zip;e49b2b964163d27765a5002d210a2f3c73771835 utf8_range;https://github.com/protocolbuffers/utf8_range/archive/72c943dea2b9240cd09efde15191e144bc7c7d38.zip;9925739c9debc0efa2adcb194d371a35b6a03156 -extensions;https://github.com/microsoft/onnxruntime-extensions/archive/94142d8391c9791ec71c38336436319a2d4ac7a0.zip;4365ac5140338b4cb75a39944a4be276e3829b3c +extensions;https://github.com/microsoft/onnxruntime-extensions/archive/f3f6caa6e8adb420e005ec41c6fefc8d75affb6e.zip;cec2e164f1a00e7d80fd94df65e4e8d2daead70d composable_kernel;https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/204da9c522cebec5220bba52cd3542ebcaf99e7a.zip;1827348efd47831c13074245274d41b7cae8a557 directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e cudnn_frontend;https://github.com/NVIDIA/cudnn-frontend/archive/refs/tags/v1.7.0.zip;d0753d8d5b39947ca0729d7773cb84653a129eb1 diff --git a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml index 344aaa4aaf..7e7ab29e3e 100644 --- a/tools/ci_build/github/azure-pipelines/templates/download-deps.yml +++ b/tools/ci_build/github/azure-pipelines/templates/download-deps.yml @@ -11,7 +11,7 @@ steps: packageType: upack feed: '/7424c8e4-5c62-490e-95c4-79446f31017c' definition: '517c4f6f-5437-4392-a70d-4f15ec5be2f0' - version: 1.0.203 + version: 1.0.206 downloadPath: $(Build.BinariesDirectory)/deps # The private ADO project @@ -22,7 +22,7 @@ steps: packageType: upack feed: '/4c7631f5-24c0-4307-8822-1aa8f180c325' definition: 'fd9dd5ad-b73e-4678-890e-edcf680dbc1a' - version: 1.0.203 + version: 1.0.206 downloadPath: $(Build.BinariesDirectory)/deps # You can add more ADO accounts at here.