Skip to content

Commit bc4d50b

Browse files
KaustubhIMGKaustubhIMG
authored
Merge branch 'microsoft:main' into img_patch1
2 parents d79b3ed + 6d7235b commit bc4d50b

File tree

141 files changed

+3939
-2027
lines changed

Some content is hidden

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

141 files changed

+3939
-2027
lines changed

‎cmake/CMakeLists.txt

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Copyright (c) Microsoft Corporation. All rights reserved.
2+
# SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
23
# Licensed under the MIT License.
34

45
# Minimum CMake required
@@ -132,11 +133,6 @@ option(onnxruntime_USE_DML "Build with DirectML support" OFF)
132133
option(onnxruntime_USE_MIGRAPHX "Build with AMDMIGraphX support" OFF)
133134
option(onnxruntime_USE_WINML "Build with WinML support" OFF)
134135
option(onnxruntime_USE_ACL "Build with ACL support" OFF)
135-
option(onnxruntime_USE_ACL_1902 "Build with ACL version 1902 support" OFF)
136-
option(onnxruntime_USE_ACL_1905 "Build with ACL version 1905 support" OFF)
137-
option(onnxruntime_USE_ACL_1908 "Build with ACL version 1908 support" OFF)
138-
option(onnxruntime_USE_ACL_2002 "Build with ACL version 2002 support" OFF)
139-
option(onnxruntime_USE_ACL_2308 "Build with ACL version 2308 support" OFF)
140136
option(onnxruntime_USE_ARMNN "Build with ArmNN support" OFF)
141137
option(onnxruntime_ARMNN_RELU_USE_CPU "Use the CPU implementation for the Relu operator for the ArmNN EP" ON)
142138
option(onnxruntime_ARMNN_BN_USE_CPU "Use the CPU implementation for the Batch Normalization operator for the ArmNN EP" ON)
@@ -1207,44 +1203,22 @@ function(onnxruntime_add_include_to_target dst_target)
12071203
endfunction()
12081204

12091205
# ACL
1210-
if (onnxruntime_USE_ACL OR onnxruntime_USE_ACL_1902 OR onnxruntime_USE_ACL_1905 OR onnxruntime_USE_ACL_1908 OR onnxruntime_USE_ACL_2002 OR onnxruntime_USE_ACL_2308)
1206+
if (onnxruntime_USE_ACL)
12111207
set(onnxruntime_USE_ACL ON)
1212-
if (onnxruntime_USE_ACL_1902)
1213-
add_definitions(-DACL_1902=1)
1214-
else()
1215-
if (onnxruntime_USE_ACL_1908)
1216-
add_definitions(-DACL_1908=1)
1217-
else()
1218-
if (onnxruntime_USE_ACL_2002)
1219-
add_definitions(-DACL_2002=1)
1220-
else()
1221-
if (onnxruntime_USE_ACL_2308)
1222-
add_definitions(-DACL_2308=1)
1223-
else()
1224-
add_definitions(-DACL_1905=1)
1225-
endif()
1226-
endif()
1227-
endif()
1228-
endif()
12291208

12301209
if (NOT ${onnxruntime_ACL_LIBS} STREQUAL "")
12311210
add_library(arm_compute SHARED IMPORTED)
12321211
set_target_properties(arm_compute PROPERTIES
12331212
IMPORTED_NO_SONAME 1
12341213
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute.so")
12351214

1236-
add_library(arm_compute_core SHARED IMPORTED)
1237-
set_target_properties(arm_compute_core PROPERTIES
1238-
IMPORTED_NO_SONAME 1
1239-
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute_core.so")
1240-
12411215
add_library(arm_compute_graph SHARED IMPORTED)
12421216
set_target_properties(arm_compute_graph PROPERTIES
12431217
IMPORTED_NO_SONAME 1
12441218
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute_graph.so")
12451219
endif()
12461220

1247-
list(APPEND onnxruntime_EXTERNAL_LIBRARIES arm_compute arm_compute_core arm_compute_graph)
1221+
list(APPEND onnxruntime_EXTERNAL_LIBRARIES arm_compute arm_compute_graph)
12481222

12491223
endif()
12501224

@@ -1263,11 +1237,6 @@ if (onnxruntime_USE_ARMNN)
12631237
IMPORTED_NO_SONAME 1
12641238
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute.so")
12651239

1266-
add_library(arm_compute_core SHARED IMPORTED)
1267-
set_target_properties(arm_compute_core PROPERTIES
1268-
IMPORTED_NO_SONAME 1
1269-
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute_core.so")
1270-
12711240
add_library(arm_compute_graph SHARED IMPORTED)
12721241
set_target_properties(arm_compute_graph PROPERTIES
12731242
IMPORTED_NO_SONAME 1
@@ -1281,7 +1250,7 @@ if (onnxruntime_USE_ARMNN)
12811250
IMPORTED_LOCATION "${onnxruntime_ARMNN_LIBS}/libarmnn.so")
12821251
endif()
12831252

1284-
list(APPEND onnxruntime_EXTERNAL_LIBRARIES armnn arm_compute arm_compute_core arm_compute_graph)
1253+
list(APPEND onnxruntime_EXTERNAL_LIBRARIES armnn arm_compute arm_compute_graph)
12851254
endif()
12861255

12871256
if (onnxruntime_USE_DNNL)

‎cmake/onnxruntime_fuzz_test.cmake

Lines changed: 100 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,24 @@
44
# Check that the options are properly set for
55
# the fuzzing project
66
if (onnxruntime_FUZZ_ENABLED)
7-
message(STATUS "Building dependency protobuf-mutator and libfuzzer")
8-
9-
# set the options used to control the protobuf-mutator build
10-
set(PROTOBUF_LIBRARIES ${PROTOBUF_LIB})
11-
set(LIB_PROTO_MUTATOR_TESTING OFF)
12-
13-
# include the protobuf-mutator CMakeLists.txt rather than the projects CMakeLists.txt to avoid target clashes
14-
# with google test
15-
add_subdirectory("external/libprotobuf-mutator/src")
16-
17-
# add the appropriate include directory and compilation flags
18-
# needed by the protobuf-mutator target and the libfuzzer
19-
set(PROTOBUF_MUT_INCLUDE_DIRS "external/libprotobuf-mutator")
20-
onnxruntime_add_include_to_target(protobuf-mutator ${PROTOBUF_LIB})
21-
onnxruntime_add_include_to_target(protobuf-mutator-libfuzzer ${PROTOBUF_LIB})
22-
target_include_directories(protobuf-mutator PRIVATE ${INCLUDE_DIRECTORIES} ${PROTOBUF_MUT_INCLUDE_DIRS})
23-
target_include_directories(protobuf-mutator-libfuzzer PRIVATE ${INCLUDE_DIRECTORIES} ${PROTOBUF_MUT_INCLUDE_DIRS})
7+
message(STATUS "Building dependency protobuf-mutator and libfuzzer")
8+
9+
# set the options used to control the protobuf-mutator build
10+
set(PROTOBUF_LIBRARIES ${PROTOBUF_LIB})
11+
set(LIB_PROTO_MUTATOR_TESTING OFF)
12+
13+
# include the protobuf-mutator CMakeLists.txt rather than the projects CMakeLists.txt to avoid target clashes
14+
# with google test
15+
add_subdirectory("external/libprotobuf-mutator/src")
16+
17+
# add the appropriate include directory and compilation flags
18+
# needed by the protobuf-mutator target and the libfuzzer
19+
set(PROTOBUF_MUT_INCLUDE_DIRS "external/libprotobuf-mutator")
20+
onnxruntime_add_include_to_target(protobuf-mutator ${PROTOBUF_LIB})
21+
onnxruntime_add_include_to_target(protobuf-mutator-libfuzzer ${PROTOBUF_LIB})
22+
target_include_directories(protobuf-mutator PRIVATE ${INCLUDE_DIRECTORIES} ${PROTOBUF_MUT_INCLUDE_DIRS})
23+
target_include_directories(protobuf-mutator-libfuzzer PRIVATE ${INCLUDE_DIRECTORIES} ${PROTOBUF_MUT_INCLUDE_DIRS})
24+
2425
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
2526
# MSVC-specific compiler options
2627
target_compile_options(protobuf-mutator PRIVATE "/wd4244" "/wd4245" "/wd4267" "/wd4100" "/wd4456")
@@ -44,42 +45,96 @@ if (onnxruntime_FUZZ_ENABLED)
4445
)
4546
endif()
4647

47-
# add Fuzzing Engine Build Configuration
48-
message(STATUS "Building Fuzzing engine")
48+
# add Fuzzing Engine Build Configuration
49+
message(STATUS "Building Fuzzing engine")
50+
51+
# set Fuzz root directory
52+
set(SEC_FUZZ_ROOT ${TEST_SRC_DIR}/fuzzing)
53+
54+
# Security fuzzing engine src file reference
55+
set(SEC_FUZ_SRC "${SEC_FUZZ_ROOT}/src/BetaDistribution.cpp"
56+
"${SEC_FUZZ_ROOT}/src/OnnxPrediction.cpp"
57+
"${SEC_FUZZ_ROOT}/src/testlog.cpp"
58+
"${SEC_FUZZ_ROOT}/src/test.cpp")
59+
60+
# compile the executables
61+
onnxruntime_add_executable(onnxruntime_security_fuzz ${SEC_FUZ_SRC})
62+
63+
# compile with c++17
64+
target_compile_features(onnxruntime_security_fuzz PUBLIC cxx_std_17)
4965

50-
# set Fuzz root directory
51-
set(SEC_FUZZ_ROOT ${TEST_SRC_DIR}/fuzzing)
66+
# Security fuzzing engine header file reference
67+
onnxruntime_add_include_to_target(onnxruntime_security_fuzz onnx onnxruntime)
5268

53-
# Security fuzzing engine src file reference
54-
set(SEC_FUZ_SRC "${SEC_FUZZ_ROOT}/src/BetaDistribution.cpp"
55-
"${SEC_FUZZ_ROOT}/src/OnnxPrediction.cpp"
56-
"${SEC_FUZZ_ROOT}/src/testlog.cpp"
57-
"${SEC_FUZZ_ROOT}/src/test.cpp")
69+
# Assign all include to one variable
70+
set(SEC_FUZ_INC "${SEC_FUZZ_ROOT}/include")
71+
set(INCLUDE_FILES ${SEC_FUZ_INC} "$<TARGET_PROPERTY:protobuf-mutator,INCLUDE_DIRECTORIES>")
5872

59-
# compile the executables
60-
onnxruntime_add_executable(onnxruntime_security_fuzz ${SEC_FUZ_SRC})
73+
# add all these include directory to the Fuzzing engine
74+
target_include_directories(onnxruntime_security_fuzz PRIVATE ${INCLUDE_FILES})
6175

62-
# compile with c++17
63-
target_compile_features(onnxruntime_security_fuzz PUBLIC cxx_std_17)
76+
# add link libraries to the project
77+
target_link_libraries(onnxruntime_security_fuzz onnx_proto onnxruntime protobuf-mutator ${PROTOBUF_LIB})
6478

65-
# Security fuzzing engine header file reference
66-
onnxruntime_add_include_to_target(onnxruntime_security_fuzz onnx onnxruntime)
79+
# add the dependencies
80+
add_dependencies(onnxruntime_security_fuzz onnx_proto onnxruntime protobuf-mutator ${PROTOBUF_LIB})
6781

68-
# Assign all include to one variable
69-
set(SEC_FUZ_INC "${SEC_FUZZ_ROOT}/include")
70-
set(INCLUDE_FILES ${SEC_FUZ_INC} "$<TARGET_PROPERTY:protobuf-mutator,INCLUDE_DIRECTORIES>")
82+
# copy the shared libraries (DLLs on Windows, SOs on Linux) to the execution directory
83+
add_custom_command(TARGET onnxruntime_security_fuzz POST_BUILD
84+
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:onnxruntime> $<TARGET_FILE_DIR:onnxruntime_security_fuzz>
85+
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${PROTOBUF_LIB}> $<TARGET_FILE_DIR:onnxruntime_security_fuzz>)
7186

72-
# add all these include directory to the Fuzzing engine
73-
target_include_directories(onnxruntime_security_fuzz PRIVATE ${INCLUDE_FILES})
87+
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
88+
# Add a second fuzzer that uses libFuzzer in fuzzer/libfuzzer
89+
message(STATUS "Building libProtoBufFuzzer-based fuzzer")
7490

75-
# add link libraries the project
76-
target_link_libraries(onnxruntime_security_fuzz onnx_proto onnxruntime protobuf-mutator ${PROTOBUF_LIB})
91+
# Set source files for the libFuzzer
92+
set(LIBFUZZER_SRC "${SEC_FUZZ_ROOT}/src/OnnxPrediction.cpp"
93+
"${SEC_FUZZ_ROOT}/src/testlog.cpp"
94+
"${SEC_FUZZ_ROOT}/ort_libfuzzer/OrtProtoLibfuzzer.cpp")
7795

78-
# add the dependencies
79-
add_dependencies(onnxruntime_security_fuzz onnx_proto onnxruntime protobuf-mutator ${PROTOBUF_LIB})
96+
# Compile the libFuzzer-based fuzzer
97+
onnxruntime_add_executable(onnxruntime_proto_libfuzzer ${LIBFUZZER_SRC})
98+
# Security fuzzing engine header file reference
99+
onnxruntime_add_include_to_target(onnxruntime_proto_libfuzzer onnx onnxruntime)
100+
# Set include directories for libFuzzer
101+
target_include_directories(onnxruntime_proto_libfuzzer PRIVATE ${INCLUDE_FILES})
80102

81-
# copy the dlls to the execution directory
82-
add_custom_command(TARGET onnxruntime_security_fuzz POST_BUILD
83-
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:onnxruntime> $<TARGET_FILE_DIR:onnxruntime_security_fuzz>
84-
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${PROTOBUF_LIB}> $<TARGET_FILE_DIR:onnxruntime_security_fuzz>)
103+
# Add link libraries for libFuzzer
104+
target_link_libraries(onnxruntime_proto_libfuzzer onnx_proto onnxruntime protobuf-mutator protobuf-mutator-libfuzzer -fsanitize=fuzzer,address ${PROTOBUF_LIB})
105+
106+
# Add the dependencies for libFuzzer
107+
add_dependencies(onnxruntime_proto_libfuzzer onnx_proto onnxruntime protobuf-mutator protobuf-mutator-libfuzzer ${PROTOBUF_LIB})
108+
109+
# Copy shared libraries for libFuzzer
110+
add_custom_command(TARGET onnxruntime_proto_libfuzzer POST_BUILD
111+
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:onnxruntime> $<TARGET_FILE_DIR:onnxruntime_proto_libfuzzer>
112+
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${PROTOBUF_LIB}> $<TARGET_FILE_DIR:onnxruntime_proto_libfuzzer>)
113+
# Add a second fuzzer that uses libFuzzer in fuzzer/libfuzzer
114+
message(STATUS "Building libBufFuzzer-based fuzzer")
115+
116+
# Set source files for the libFuzzer
117+
set(LIBFUZZER_SRC "${SEC_FUZZ_ROOT}/src/OnnxPrediction.cpp"
118+
"${SEC_FUZZ_ROOT}/src/testlog.cpp"
119+
"${SEC_FUZZ_ROOT}/ort_libfuzzer/OrtLibfuzzer.cpp")
120+
121+
# Compile the libFuzzer-based fuzzer
122+
onnxruntime_add_executable(onnxruntime_libfuzzer_fuzz ${LIBFUZZER_SRC})
123+
# Security fuzzing engine header file reference
124+
onnxruntime_add_include_to_target(onnxruntime_libfuzzer_fuzz onnx onnxruntime)
125+
# Set include directories for libFuzzer
126+
target_compile_definitions(onnxruntime_libfuzzer_fuzz PRIVATE GOOGLE_PROTOBUF_NO_LOGGING=1)
127+
target_include_directories(onnxruntime_libfuzzer_fuzz PRIVATE ${INCLUDE_FILES})
128+
129+
# Add link libraries for libFuzzer
130+
target_link_libraries(onnxruntime_libfuzzer_fuzz onnx_proto onnxruntime protobuf-mutator protobuf-mutator-libfuzzer -fsanitize=fuzzer,address ${PROTOBUF_LIB})
131+
132+
# Add the dependencies for libFuzzer
133+
add_dependencies(onnxruntime_libfuzzer_fuzz onnx_proto onnxruntime protobuf-mutator protobuf-mutator-libfuzzer ${PROTOBUF_LIB})
134+
135+
# Copy shared libraries for libFuzzer
136+
add_custom_command(TARGET onnxruntime_libfuzzer_fuzz POST_BUILD
137+
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:onnxruntime> $<TARGET_FILE_DIR:onnxruntime_libfuzzer_fuzz>
138+
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${PROTOBUF_LIB}> $<TARGET_FILE_DIR:onnxruntime_libfuzzer_fuzz>)
139+
endif()
85140
endif()

‎cmake/onnxruntime_mlas.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -578,12 +578,12 @@ else()
578578
message(STATUS "CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
579579
message(STATUS "CMAKE_CXX_COMPILER_VERSION: ${CMAKE_CXX_COMPILER_VERSION}")
580580

581-
if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "10")
581+
if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "11")
582582
message(STATUS "Using -mavx2 -mfma -mavxvnni flags")
583-
set_source_files_properties(${mlas_platform_srcs_avx2} PROPERTIES COMPILE_FLAGS "-mavx2 -mfma -mavxvnni")
583+
set_source_files_properties(${mlas_platform_srcs_avx2} PROPERTIES COMPILE_FLAGS "-mavx2 -mfma -mf16c -mavxvnni")
584584
else()
585585
message(STATUS "Using -mavx2 -mfma flags")
586-
set_source_files_properties(${mlas_platform_srcs_avx2} PROPERTIES COMPILE_FLAGS "-mavx2 -mfma")
586+
set_source_files_properties(${mlas_platform_srcs_avx2} PROPERTIES COMPILE_FLAGS "-mavx2 -mfma -mf16c")
587587
endif()
588588
set(mlas_platform_srcs_avx512f
589589
${MLAS_SRC_DIR}/x86_64/DgemmKernelAvx512F.S

‎cmake/onnxruntime_providers_openvino.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
message(FATAL_ERROR "OpenVINO 2024.0 and newer are supported. Please, use latest OpenVINO release")
2222
endif()
2323

24+
if(OpenVINO_VERSION VERSION_GREATER_EQUAL 2024.4)
25+
add_definitions(-DUSE_OVEP_NPU_MEMORY=1)
26+
endif()
27+
2428
if (WIN32)
2529
unset(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO)
2630
endif()

‎docs/ContribOperators.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2521,6 +2521,8 @@ This version of the operator has been available since version 1 of the 'com.micr
25212521
Only supports causal and local attention.
25222522
Supports rotary position embedding for CPU and CUDA.
25232523
Supports packed input for CPU and CUDA.
2524+
Supports continuous decoding for batch_size == 1 for CPU and CUDA.
2525+
25242526

25252527
#### Version
25262528

@@ -2561,9 +2563,9 @@ This version of the operator has been available since version 1 of the 'com.micr
25612563
<dt><tt>past_value</tt> (optional) : T</dt>
25622564
<dd>past state value with support for format BNSH. When past_value uses same tensor as present_value(k-v cache), it is of length max_sequence_length... otherwise of length past_sequence_length.</dd>
25632565
<dt><tt>seqlens_k</tt> : M</dt>
2564-
<dd>1d Tensor of shape (batch_size). Indicates past sequence lengths for token generation case.</dd>
2566+
<dd>1D Tensor of shape (batch_size). Equivalent to (total_sequence_lengths - 1).</dd>
25652567
<dt><tt>total_sequence_length</tt> : M</dt>
2566-
<dd>Scalar tensor of total sequence length (past + new).</dd>
2568+
<dd>Scalar tensor equivalent to the maximum total sequence length (past + new) of the batch. Used for checking inputs and determining prompt vs token generation case.</dd>
25672569
<dt><tt>cos_cache</tt> (optional) : T</dt>
25682570
<dd>2D tensor with shape (max_sequence_length, head_size / 2).</dd>
25692571
<dt><tt>sin_cache</tt> (optional) : T</dt>

‎docs/OperatorKernels.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ Do not modify directly.*
488488
|MatMulFpQ4|*in* A:**T1**<br> *in* B:**T2**<br> *in* B_shape:**T3**<br> *out* Y:**T1**|1+|**T1** = tensor(float)<br/> **T2** = tensor(uint8)<br/> **T3** = tensor(int64)|
489489
|MatMulInteger16|*in* A:**T1**<br> *in* B:**T2**<br> *out* Y:**T3**|1+|**T1** = tensor(int16)<br/> **T2** = tensor(int16)<br/> **T3** = tensor(int32)|
490490
|MatMulIntegerToFloat|*in* A:**T1**<br> *in* B:**T2**<br> *in* a_scale:**T3**<br> *in* b_scale:**T3**<br> *in* a_zero_point:**T1**<br> *in* b_zero_point:**T2**<br> *in* bias:**T3**<br> *out* Y:**T3**|1+|**T1** = tensor(int8), tensor(uint8)<br/> **T2** = tensor(int8), tensor(uint8)<br/> **T3** = tensor(float)|
491-
|MatMulNBits|*in* A:**T1**<br> *in* B:**T2**<br> *in* scales:**T1**<br> *in* zero_points:**T3**<br> *in* g_idx:**T4**<br> *in* bias:**T1**<br> *out* Y:**T1**|1+|**T1** = tensor(float)<br/> **T2** = tensor(uint8)<br/> **T3** = tensor(float), tensor(uint8)<br/> **T4** = tensor(int32)|
491+
|MatMulNBits|*in* A:**T1**<br> *in* B:**T2**<br> *in* scales:**T1**<br> *in* zero_points:**T3**<br> *in* g_idx:**T4**<br> *in* bias:**T1**<br> *out* Y:**T1**|1+|**T1** = tensor(float), tensor(float16)<br/> **T2** = tensor(uint8)<br/> **T3** = tensor(float), tensor(float16), tensor(uint8)<br/> **T4** = tensor(int32)|
492492
|MaxpoolWithMask|*in* X:**T**<br> *in* M:**tensor(int32)**<br> *out* Y:**T**|1+|**T** = tensor(float)|
493493
|MultiHeadAttention|*in* query:**T**<br> *in* key:**T**<br> *in* value:**T**<br> *in* bias:**T**<br> *in* key_padding_mask:**M**<br> *in* attention_bias:**T**<br> *in* past_key:**T**<br> *in* past_value:**T**<br> *out* output:**T**<br> *out* present_key:**T**<br> *out* present_value:**T**|1+|**T** = tensor(float)|
494494
|MurmurHash3|*in* X:**T1**<br> *out* Y:**T2**|1+|**T1** = tensor(double), tensor(float), tensor(int32), tensor(int64), tensor(string), tensor(uint32), tensor(uint64)<br/> **T2** = tensor(int32), tensor(uint32)|

‎include/onnxruntime/core/framework/allocator.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ constexpr const char* HIP = "Hip";
5050
constexpr const char* HIP_PINNED = "HipPinned";
5151
constexpr const char* OpenVINO_CPU = "OpenVINO_CPU";
5252
constexpr const char* OpenVINO_GPU = "OpenVINO_GPU";
53+
constexpr const char* OpenVINO_RT = "OpenVINO_RT";
54+
constexpr const char* OpenVINO_RT_NPU = "OpenVINO_RT_NPU";
5355
constexpr const char* WEBGPU_BUFFER = "WebGPU_Buffer";
5456

5557
constexpr size_t kAllocAlignment = 256;

‎include/onnxruntime/core/providers/acl/acl_provider_factory.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
23
// Licensed under the MIT License.
34

45
#include "onnxruntime_c_api.h"
@@ -10,7 +11,8 @@ extern "C" {
1011
/**
1112
* \param use_arena zero: false. non-zero: true.
1213
*/
13-
ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_ACL, _In_ OrtSessionOptions* options, int use_arena)
14+
ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_ACL, _In_ OrtSessionOptions* options,
15+
bool enable_fast_math)
1416
ORT_ALL_ARGS_NONNULL;
1517

1618
#ifdef __cplusplus

0 commit comments

Comments
 (0)