Skip to content

Commit 730cc92

Browse files
Merge pull request #1170 from intel/sync_msft_29062026
Sync with Microsoft ONNX Runtime - 29062026
2 parents 28b6f4c + 5074086 commit 730cc92

129 files changed

Lines changed: 7520 additions & 1094 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ jobs:
7878
run: |
7979
set -e -x
8080
BINARY_SIZE_THRESHOLD_ARGS=""
81-
echo "Binary size threshold in bytes: 1436672"
82-
BINARY_SIZE_THRESHOLD_ARGS="--threshold_size_in_bytes 1436672"
81+
echo "Binary size threshold in bytes: 1440768"
82+
BINARY_SIZE_THRESHOLD_ARGS="--threshold_size_in_bytes 1440768"
8383
8484
# Ensure ANDROID_NDK_HOME is available and get its real path
8585
if [ -z "$ANDROID_NDK_HOME" ]; then

.github/workflows/linux_cuda_plugin_ci.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,31 @@ jobs:
141141
cd /onnxruntime_src/onnxruntime/test/python/transformers
142142
python test_cuda_plugin_ep.py
143143
"
144+
145+
# --- Run the CUDA plugin EP C++ GoogleTest binary ---
146+
# onnxruntime_provider_test is built into the artifact and links the plugin tests
147+
# (gated by ORT_UNIT_TEST_HAS_CUDA_PLUGIN_EP). These tests register the plugin .so via
148+
# GetSharedLibraryFileName("onnxruntime_providers_cuda_plugin"), which returns the
149+
# platform-specific filename without a directory component. Run from /build/Release/Release
150+
# so that filename resolves to the plugin .so built there.
151+
# The filter covers every CUDA plugin EP suite linked into this binary:
152+
# CudaPlugin* -> CudaPluginUserStreamGraphTest, CudaPluginArenaTest,
153+
# CudaPluginPartitioningTest, CudaPluginProfilingTest
154+
# CudaResourcePartitioning* -> CudaResourcePartitioningTest
155+
- name: Run CUDA Plugin EP C++ Tests
156+
run: |
157+
docker run --rm --gpus all \
158+
-v ${{ github.workspace }}:/onnxruntime_src \
159+
-v ${{ runner.temp }}/Release:/build/Release \
160+
-e NVIDIA_VISIBLE_DEVICES=all \
161+
${{ steps.build_docker_image_step.outputs.full-image-name }} \
162+
bash -c "
163+
set -ex
164+
export PATH=/opt/python/cp312-cp312/bin:\$PATH
165+
# Make libcudart.so.13 (and the plugin's CUDA deps) findable; see note above.
166+
export LD_LIBRARY_PATH=/build/Release/Release:/usr/local/cuda-13.0/lib64:\${LD_LIBRARY_PATH:-}
167+
168+
cd /build/Release/Release
169+
ls -la onnxruntime_provider_test libonnxruntime_providers_cuda_plugin.so
170+
./onnxruntime_provider_test --gtest_filter='CudaPlugin*:CudaResourcePartitioning*'
171+
"

.github/workflows/windows_cuda.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
DocUpdateNeeded: false
149149
ONNXRUNTIME_TEST_GPU_DEVICE_ID: '0'
150150
AZCOPY_AUTO_LOGIN_TYPE: MSI
151-
AZCOPY_MSI_CLIENT_ID: 63b63039-6328-442f-954b-5a64d124e5b4
151+
AZCOPY_MSI_CLIENT_ID: d712a4c7-a0cf-4e87-af75-31510eba0a8e
152152

153153
test:
154154
name: Windows GPU CUDA CI Pipeline Test Job
@@ -260,4 +260,4 @@ jobs:
260260
DocUpdateNeeded: false
261261
ONNXRUNTIME_TEST_GPU_DEVICE_ID: '0'
262262
AZCOPY_AUTO_LOGIN_TYPE: MSI
263-
AZCOPY_MSI_CLIENT_ID: 63b63039-6328-442f-954b-5a64d124e5b4
263+
AZCOPY_MSI_CLIENT_ID: d712a4c7-a0cf-4e87-af75-31510eba0a8e

.github/workflows/windows_cuda_plugin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
ALLOW_RELEASED_ONNX_OPSET_ONLY: '0'
119119
ONNXRUNTIME_TEST_GPU_DEVICE_ID: '0'
120120
AZCOPY_AUTO_LOGIN_TYPE: MSI
121-
AZCOPY_MSI_CLIENT_ID: 63b63039-6328-442f-954b-5a64d124e5b4
121+
AZCOPY_MSI_CLIENT_ID: d712a4c7-a0cf-4e87-af75-31510eba0a8e
122122

123123
test:
124124
name: Windows CUDA Plugin EP Test
@@ -214,4 +214,4 @@ jobs:
214214
ALLOW_RELEASED_ONNX_OPSET_ONLY: '0'
215215
ONNXRUNTIME_TEST_GPU_DEVICE_ID: '0'
216216
AZCOPY_AUTO_LOGIN_TYPE: MSI
217-
AZCOPY_MSI_CLIENT_ID: 63b63039-6328-442f-954b-5a64d124e5b4
217+
AZCOPY_MSI_CLIENT_ID: d712a4c7-a0cf-4e87-af75-31510eba0a8e

.github/workflows/windows_gpu_doc_gen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
setVcvars: true
4545
ALLOW_RELEASED_ONNX_OPSET_ONLY: '0'
4646
AZCOPY_AUTO_LOGIN_TYPE: MSI
47-
AZCOPY_MSI_CLIENT_ID: 63b63039-6328-442f-954b-5a64d124e5b4
47+
AZCOPY_MSI_CLIENT_ID: d712a4c7-a0cf-4e87-af75-31510eba0a8e
4848
runs-on: [
4949
"self-hosted",
5050
"1ES.Pool=onnxruntime-github-Win2022-GPU-A10",

.github/workflows/windows_openvino.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
timeout-minutes: 240
2727
env:
2828
AZCOPY_AUTO_LOGIN_TYPE: MSI
29-
AZCOPY_MSI_CLIENT_ID: 63b63039-6328-442f-954b-5a64d124e5b4
29+
AZCOPY_MSI_CLIENT_ID: d712a4c7-a0cf-4e87-af75-31510eba0a8e
3030
OnnxRuntimeBuildDirectory: ${{ github.workspace }}
3131
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
3232
ALLOW_RELEASED_ONNX_OPSET_ONLY: '1'

.github/workflows/windows_qnn_x64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
QnnLibKind: [shared_lib, static_lib]
3030
env:
3131
AZCOPY_AUTO_LOGIN_TYPE: MSI
32-
AZCOPY_MSI_CLIENT_ID: 63b63039-6328-442f-954b-5a64d124e5b4
32+
AZCOPY_MSI_CLIENT_ID: d712a4c7-a0cf-4e87-af75-31510eba0a8e
3333
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
3434
ALLOW_RELEASED_ONNX_OPSET_ONLY: '1'
3535

.github/workflows/windows_tensorrt.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
DocUpdateNeeded: false
155155
ONNXRUNTIME_TEST_GPU_DEVICE_ID: '0'
156156
AZCOPY_AUTO_LOGIN_TYPE: MSI
157-
AZCOPY_MSI_CLIENT_ID: 63b63039-6328-442f-954b-5a64d124e5b4
157+
AZCOPY_MSI_CLIENT_ID: d712a4c7-a0cf-4e87-af75-31510eba0a8e
158158

159159
test:
160160
name: Windows GPU TensorRT CI Pipeline Test Job
@@ -265,4 +265,4 @@ jobs:
265265
DocUpdateNeeded: false
266266
ONNXRUNTIME_TEST_GPU_DEVICE_ID: '0'
267267
AZCOPY_AUTO_LOGIN_TYPE: MSI
268-
AZCOPY_MSI_CLIENT_ID: 63b63039-6328-442f-954b-5a64d124e5b4
268+
AZCOPY_MSI_CLIENT_ID: d712a4c7-a0cf-4e87-af75-31510eba0a8e

cmake/deps.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protoc_mac_universal;https://github.com/protocolbuffers/protobuf/releases/downlo
5050
psimd;https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a900.zip;1f5454b01f06f9656b77e4a5e2e31d7422487013
5151
pthreadpool;https://github.com/google/pthreadpool/archive/dcc9f28589066af0dbd4555579281230abbf74dd.zip;533a77943203ef15ca608bcd9dbe2c94da7451d2
5252
pybind11;https://github.com/pybind/pybind11/archive/refs/tags/v3.0.2.zip;a064e663b4d7a337ac291d1bef7337ef4e60a1ae
53-
pytorch_cpuinfo;https://github.com/pytorch/cpuinfo/archive/403d652dca4c1046e8145950b1c0997a9f748b57.zip;30b2a07fe4bae8574f89176e56274cacdd6d135b
53+
pytorch_cpuinfo;https://github.com/pytorch/cpuinfo/archive/4628dc060ce4e82345dc166bbac875609db4ff69.zip;e58d4b47c16a982111c897e669ae4f1821a393d7
5454
re2;https://github.com/google/re2/archive/refs/tags/2024-07-02.zip;646e1728269cde7fcef990bf4a8e87b047882e88
5555
safeint;https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.28.zip;23f252040ff6cb9f1fd18575b32fa8fb5928daac
5656
tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2493f0949dc4be6b6a45e81.zip;67b833913605a4f3f499894ab11528a702c2b381

cmake/external/onnxruntime_external_deps.cmake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,7 @@ if (CPUINFO_SUPPORTED)
371371
PATCH_COMMAND
372372
${Patch_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/patches/cpuinfo/patch_cpuinfo_h_for_arm64ec.patch &&
373373
# https://github.com/pytorch/cpuinfo/pull/324
374-
${Patch_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/patches/cpuinfo/patch_vcpkg_arm64ec_support.patch &&
375-
# https://github.com/pytorch/cpuinfo/pull/348
376-
${Patch_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/patches/cpuinfo/win_arm_fp16_detection_fallback.patch
374+
${Patch_EXECUTABLE} -p1 < ${PROJECT_SOURCE_DIR}/patches/cpuinfo/patch_vcpkg_arm64ec_support.patch
377375
FIND_PACKAGE_ARGS NAMES cpuinfo
378376
)
379377
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")

0 commit comments

Comments
 (0)