Skip to content

Commit 45cc4ea

Browse files
committed
[ARMNN EP] Remove ArmNN Execution Provider
Align with release-note deprecation/removal of ArmNN EP.
1 parent 19c9efc commit 45cc4ea

Some content is hidden

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

58 files changed

+23
-2147
lines changed

.github/ISSUE_TEMPLATE/05-performance.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ body:
113113
- TensorRT
114114
- NNAPI
115115
- ACL
116-
- ArmNN
117116
- MIGraphX
118117
- Rockchip NPU
119118
- SNPE

.github/ISSUE_TEMPLATE/08-general.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ body:
111111
- TensorRT
112112
- NNAPI
113113
- ACL
114-
- ArmNN
115114
- MIGraphX
116115
- Rockchip NPU
117116
- SNPE

.github/labeler.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ api:CSharp: '/(\bc\s*sharp\b|\bc#)/i'
22
api:java: '/\bjava\b/i'
33
api:javascript: '/\bjavascript\b/i'
44
ep:ACL: '/\bacl\b/i'
5-
ep:ArmNN: '/\barmnn\b/i'
65
ep:CANN: '/\bcann\b/i'
76
ep:CoreML: '/\bcore\s*ml\b/i'
87
ep:DML: '/(\bdirect\s*ml\b|\bdml\b)/i'

cmake/CMakeLists.txt

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@ option(onnxruntime_USE_DML "Build with DirectML support" OFF)
136136
option(onnxruntime_USE_MIGRAPHX "Build with AMDMIGraphX support" OFF)
137137
option(onnxruntime_USE_WINML "Build with WinML support" OFF)
138138
option(onnxruntime_USE_ACL "Build with ACL support" OFF)
139-
option(onnxruntime_USE_ARMNN "Build with ArmNN support" OFF)
140-
option(onnxruntime_ARMNN_RELU_USE_CPU "Use the CPU implementation for the Relu operator for the ArmNN EP" ON)
141-
option(onnxruntime_ARMNN_BN_USE_CPU "Use the CPU implementation for the Batch Normalization operator for the ArmNN EP" ON)
142139
option(onnxruntime_ENABLE_INSTRUMENT "Enable Instrument with Event Tracing for Windows (ETW)" OFF)
143140
option(onnxruntime_USE_TELEMETRY "Build with Telemetry" OFF)
144141
cmake_dependent_option(onnxruntime_USE_MIMALLOC "Override new/delete and arena allocator with mimalloc" OFF "WIN32;NOT onnxruntime_USE_CUDA;NOT onnxruntime_USE_OPENVINO" OFF)
@@ -932,10 +929,6 @@ if (onnxruntime_USE_MIGRAPHX_INTERFACE AND (NOT onnxruntime_USE_MIGRAPHX))
932929
list(APPEND ORT_PROVIDER_FLAGS -DUSE_MIGRAPHX_PROVIDER_INTERFACE=1)
933930
endif()
934931

935-
if (onnxruntime_USE_ARMNN)
936-
list(APPEND ORT_PROVIDER_FLAGS -DUSE_ARMNN=1)
937-
list(APPEND ONNXRUNTIME_PROVIDER_NAMES armnn)
938-
endif()
939932
if (onnxruntime_USE_COREML)
940933
list(APPEND ORT_PROVIDER_FLAGS -DUSE_COREML=1)
941934
list(APPEND ONNXRUNTIME_PROVIDER_NAMES coreml)
@@ -1310,37 +1303,6 @@ if (onnxruntime_USE_ACL)
13101303

13111304
endif()
13121305

1313-
# ArmNN
1314-
if (onnxruntime_USE_ARMNN)
1315-
if (NOT onnxruntime_ARMNN_RELU_USE_CPU)
1316-
add_definitions(-DRELU_ARMNN=1)
1317-
endif()
1318-
if (NOT onnxruntime_ARMNN_BN_USE_CPU)
1319-
add_definitions(-DBN_ARMNN=1)
1320-
endif()
1321-
1322-
if (NOT onnxruntime_USE_ACL AND NOT ${onnxruntime_ACL_LIBS} STREQUAL "")
1323-
add_library(arm_compute SHARED IMPORTED)
1324-
set_target_properties(arm_compute PROPERTIES
1325-
IMPORTED_NO_SONAME 1
1326-
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute.so")
1327-
1328-
add_library(arm_compute_graph SHARED IMPORTED)
1329-
set_target_properties(arm_compute_graph PROPERTIES
1330-
IMPORTED_NO_SONAME 1
1331-
IMPORTED_LOCATION "${onnxruntime_ACL_LIBS}/libarm_compute_graph.so")
1332-
endif()
1333-
1334-
if (NOT ${onnxruntime_ARMNN_LIBS} STREQUAL "")
1335-
add_library(armnn SHARED IMPORTED)
1336-
set_target_properties(armnn PROPERTIES
1337-
IMPORTED_NO_SONAME 1
1338-
IMPORTED_LOCATION "${onnxruntime_ARMNN_LIBS}/libarmnn.so")
1339-
endif()
1340-
1341-
list(APPEND onnxruntime_EXTERNAL_LIBRARIES armnn arm_compute arm_compute_graph)
1342-
endif()
1343-
13441306
if (onnxruntime_USE_DNNL)
13451307
include(dnnl)
13461308
add_compile_definitions(DNNL_OPENMP)

cmake/onnxruntime.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ endif()
218218

219219
set(onnxruntime_INTERNAL_PROVIDER_LIBRARIES
220220
${PROVIDERS_ACL}
221-
${PROVIDERS_ARMNN}
222221
${PROVIDERS_COREML}
223222
${PROVIDERS_DML}
224223
${PROVIDERS_NNAPI}

cmake/onnxruntime_providers.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ endif()
9292
if(onnxruntime_USE_ACL)
9393
set(PROVIDERS_ACL onnxruntime_providers_acl)
9494
endif()
95-
if(onnxruntime_USE_ARMNN)
96-
set(PROVIDERS_ARMNN onnxruntime_providers_armnn)
97-
endif()
98-
9995
if (onnxruntime_USE_XNNPACK)
10096
set(PROVIDERS_XNNPACK onnxruntime_providers_xnnpack)
10197
endif()
@@ -182,10 +178,6 @@ if (onnxruntime_USE_ACL)
182178
include(onnxruntime_providers_acl.cmake)
183179
endif()
184180

185-
if (onnxruntime_USE_ARMNN)
186-
include(onnxruntime_providers_armnn.cmake)
187-
endif()
188-
189181
if (onnxruntime_USE_VSINPU)
190182
include(onnxruntime_providers_vsinpu.cmake)
191183
endif()

cmake/onnxruntime_providers_armnn.cmake

Lines changed: 0 additions & 33 deletions
This file was deleted.

cmake/onnxruntime_python.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ set(onnxruntime_pybind11_state_static_providers
193193
${PROVIDERS_RKNPU}
194194
${PROVIDERS_DML}
195195
${PROVIDERS_ACL}
196-
${PROVIDERS_ARMNN}
197196
${PROVIDERS_XNNPACK}
198197
${PROVIDERS_AZURE}
199198
)

cmake/onnxruntime_unittests.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -673,10 +673,6 @@ if(onnxruntime_USE_ACL)
673673
list(APPEND onnxruntime_test_providers_dependencies onnxruntime_providers_acl)
674674
endif()
675675

676-
if(onnxruntime_USE_ARMNN)
677-
list(APPEND onnxruntime_test_providers_dependencies onnxruntime_providers_armnn)
678-
endif()
679-
680676
set(ONNXRUNTIME_TEST_STATIC_PROVIDER_LIBS
681677
# CUDA, TENSORRT, MIGRAPHX, DNNL, and OpenVINO are dynamically loaded at runtime.
682678
# QNN EP can be built as either a dynamic and static libs.
@@ -687,7 +683,6 @@ set(ONNXRUNTIME_TEST_STATIC_PROVIDER_LIBS
687683
${PROVIDERS_RKNPU}
688684
${PROVIDERS_DML}
689685
${PROVIDERS_ACL}
690-
${PROVIDERS_ARMNN}
691686
${PROVIDERS_COREML}
692687
${PROVIDERS_XNNPACK}
693688
${PROVIDERS_AZURE}

include/onnxruntime/core/graph/constants.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ constexpr const char* kRknpuExecutionProvider = "RknpuExecutionProvider";
4343
constexpr const char* kDmlExecutionProvider = "DmlExecutionProvider";
4444
constexpr const char* kMIGraphXExecutionProvider = "MIGraphXExecutionProvider";
4545
constexpr const char* kAclExecutionProvider = "ACLExecutionProvider";
46-
constexpr const char* kArmNNExecutionProvider = "ArmNNExecutionProvider";
4746
constexpr const char* kCoreMLExecutionProvider = "CoreMLExecutionProvider";
4847
constexpr const char* kJsExecutionProvider = "JsExecutionProvider";
4948
constexpr const char* kSnpeExecutionProvider = "SNPEExecutionProvider";

0 commit comments

Comments
 (0)