-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into fs-eire/webgpu-ep
- Loading branch information
Showing
167 changed files
with
3,986 additions
and
3,592 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
# Copyright (c) Microsoft Corporation. All rights reserved. | ||
# SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates <[email protected]> | ||
# Licensed under the MIT License. | ||
|
||
# Minimum CMake required | ||
|
@@ -132,11 +133,6 @@ option(onnxruntime_USE_DML "Build with DirectML support" OFF) | |
option(onnxruntime_USE_MIGRAPHX "Build with AMDMIGraphX support" OFF) | ||
option(onnxruntime_USE_WINML "Build with WinML support" OFF) | ||
option(onnxruntime_USE_ACL "Build with ACL support" OFF) | ||
option(onnxruntime_USE_ACL_1902 "Build with ACL version 1902 support" OFF) | ||
option(onnxruntime_USE_ACL_1905 "Build with ACL version 1905 support" OFF) | ||
option(onnxruntime_USE_ACL_1908 "Build with ACL version 1908 support" OFF) | ||
option(onnxruntime_USE_ACL_2002 "Build with ACL version 2002 support" OFF) | ||
option(onnxruntime_USE_ACL_2308 "Build with ACL version 2308 support" OFF) | ||
option(onnxruntime_USE_ARMNN "Build with ArmNN support" OFF) | ||
option(onnxruntime_ARMNN_RELU_USE_CPU "Use the CPU implementation for the Relu operator for the ArmNN EP" ON) | ||
option(onnxruntime_ARMNN_BN_USE_CPU "Use the CPU implementation for the Batch Normalization operator for the ArmNN EP" ON) | ||
|
@@ -1213,44 +1209,22 @@ function(onnxruntime_add_include_to_target dst_target) | |
endfunction() | ||
|
||
# ACL | ||
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) | ||
if (onnxruntime_USE_ACL) | ||
set(onnxruntime_USE_ACL ON) | ||
if (onnxruntime_USE_ACL_1902) | ||
add_definitions(-DACL_1902=1) | ||
else() | ||
if (onnxruntime_USE_ACL_1908) | ||
add_definitions(-DACL_1908=1) | ||
else() | ||
if (onnxruntime_USE_ACL_2002) | ||
add_definitions(-DACL_2002=1) | ||
else() | ||
if (onnxruntime_USE_ACL_2308) | ||
add_definitions(-DACL_2308=1) | ||
else() | ||
add_definitions(-DACL_1905=1) | ||
endif() | ||
endif() | ||
endif() | ||
endif() | ||
|
||
if (NOT ${onnxruntime_ACL_LIBS} STREQUAL "") | ||
add_library(arm_compute SHARED IMPORTED) | ||
set_target_properties(arm_compute PROPERTIES | ||
IMPORTED_NO_SONAME 1 | ||
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute.so") | ||
|
||
add_library(arm_compute_core SHARED IMPORTED) | ||
set_target_properties(arm_compute_core PROPERTIES | ||
IMPORTED_NO_SONAME 1 | ||
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute_core.so") | ||
|
||
add_library(arm_compute_graph SHARED IMPORTED) | ||
set_target_properties(arm_compute_graph PROPERTIES | ||
IMPORTED_NO_SONAME 1 | ||
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute_graph.so") | ||
endif() | ||
|
||
list(APPEND onnxruntime_EXTERNAL_LIBRARIES arm_compute arm_compute_core arm_compute_graph) | ||
list(APPEND onnxruntime_EXTERNAL_LIBRARIES arm_compute arm_compute_graph) | ||
|
||
endif() | ||
|
||
|
@@ -1269,11 +1243,6 @@ if (onnxruntime_USE_ARMNN) | |
IMPORTED_NO_SONAME 1 | ||
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute.so") | ||
|
||
add_library(arm_compute_core SHARED IMPORTED) | ||
set_target_properties(arm_compute_core PROPERTIES | ||
IMPORTED_NO_SONAME 1 | ||
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute_core.so") | ||
|
||
add_library(arm_compute_graph SHARED IMPORTED) | ||
set_target_properties(arm_compute_graph PROPERTIES | ||
IMPORTED_NO_SONAME 1 | ||
|
@@ -1287,7 +1256,7 @@ if (onnxruntime_USE_ARMNN) | |
IMPORTED_LOCATION "${onnxruntime_ARMNN_LIBS}/libarmnn.so") | ||
endif() | ||
|
||
list(APPEND onnxruntime_EXTERNAL_LIBRARIES armnn arm_compute arm_compute_core arm_compute_graph) | ||
list(APPEND onnxruntime_EXTERNAL_LIBRARIES armnn arm_compute arm_compute_graph) | ||
endif() | ||
|
||
if (onnxruntime_USE_DNNL) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
// Copyright (c) Microsoft Corporation. All rights reserved. | ||
// SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates <[email protected]> | ||
// Licensed under the MIT License. | ||
|
||
#include "onnxruntime_c_api.h" | ||
|
@@ -10,7 +11,8 @@ extern "C" { | |
/** | ||
* \param use_arena zero: false. non-zero: true. | ||
*/ | ||
ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_ACL, _In_ OrtSessionOptions* options, int use_arena) | ||
ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_ACL, _In_ OrtSessionOptions* options, | ||
bool enable_fast_math) | ||
ORT_ALL_ARGS_NONNULL; | ||
|
||
#ifdef __cplusplus | ||
|
Oops, something went wrong.