From f9f99749715cefc6ccdba42a37b7a2b7252e9a8a Mon Sep 17 00:00:00 2001 From: Hyeongseok Oh Date: Mon, 16 Dec 2024 14:52:26 +0900 Subject: [PATCH] [infra/onert] Disable ACL build as default (#14453) This commit disables ACL build as default. It will be enabled when target is aarch32/64 and OS is android or linux. ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh --- infra/nnfw/cmake/CfgOptionFlags.cmake | 4 ++-- infra/nnfw/cmake/options/options_aarch64-android.cmake | 3 +++ infra/nnfw/cmake/options/options_aarch64-linux.cmake | 3 +++ infra/nnfw/cmake/options/options_aarch64-tizen.cmake | 2 -- infra/nnfw/cmake/options/options_armv7hl-tizen.cmake | 2 -- infra/nnfw/cmake/options/options_armv7l-linux.cmake | 3 +++ infra/nnfw/cmake/options/options_armv7l-tizen.cmake | 2 -- infra/nnfw/cmake/options/options_i686-tizen.cmake | 2 -- infra/nnfw/cmake/options/options_riscv64-tizen.cmake | 2 -- infra/nnfw/cmake/options/options_x86_64-darwin.cmake | 2 -- infra/nnfw/cmake/options/options_x86_64-linux.cmake | 2 -- infra/nnfw/cmake/options/options_x86_64-tizen.cmake | 2 -- 12 files changed, 11 insertions(+), 18 deletions(-) diff --git a/infra/nnfw/cmake/CfgOptionFlags.cmake b/infra/nnfw/cmake/CfgOptionFlags.cmake index fea23a805e8..996271a11f2 100644 --- a/infra/nnfw/cmake/CfgOptionFlags.cmake +++ b/infra/nnfw/cmake/CfgOptionFlags.cmake @@ -65,7 +65,7 @@ option(DOWNLOAD_FARMHASH "Download farmhash source" ON) option(DOWNLOAD_GEMMLOWP "Download GEMM low precesion library source" ON) option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" ON) option(DOWNLOAD_FLATBUFFERS "Download FlatBuffers source" ON) -option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" ON) +option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" OFF) option(DOWNLOAD_NONIUS "Download nonius source" ON) option(DOWNLOAD_RUY "Download ruy source" ON) option(DOWNLOAD_CPUINFO "Download cpuinfo source" ON) @@ -73,7 +73,7 @@ option(DOWNLOAD_OOURAFFT "Download Ooura FFT source" ON) option(DOWNLOAD_MLDTYPES "Download ml_dtypes source" ON) option(DOWNLOAD_GTEST "Download Google Test source and build Google Test" ON) option(BUILD_TENSORFLOW_LITE "Build TensorFlow Lite from the downloaded source" ON) -option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" ON) +option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(DEBUG_ARMCOMPUTE "Build ARM Compute as debug type" OFF) option(BUILD_RUY "Build ruy library from the downloaded source" ON) option(BUILD_CPUINFO "Build cpuinfo library from the downloaded source" ON) diff --git a/infra/nnfw/cmake/options/options_aarch64-android.cmake b/infra/nnfw/cmake/options/options_aarch64-android.cmake index affbb179d75..18e9c33005c 100644 --- a/infra/nnfw/cmake/options/options_aarch64-android.cmake +++ b/infra/nnfw/cmake/options/options_aarch64-android.cmake @@ -1,4 +1,7 @@ # aarch64 android cmake options # +option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" ON) +option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" ON) + option(BUILD_ANDROID_BENCHMARK_APP "Enable Android Benchmark App" ON) option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF) diff --git a/infra/nnfw/cmake/options/options_aarch64-linux.cmake b/infra/nnfw/cmake/options/options_aarch64-linux.cmake index 20fd9f40e43..30a89310653 100644 --- a/infra/nnfw/cmake/options/options_aarch64-linux.cmake +++ b/infra/nnfw/cmake/options/options_aarch64-linux.cmake @@ -1,6 +1,9 @@ # # aarch64 linux cmake options # +option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" ON) +option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" ON) + option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF) option(DOWNLOAD_PYBIND11 "Download Pybind11 source" ON) option(BUILD_PYTHON_BINDING "Build python binding" ON) diff --git a/infra/nnfw/cmake/options/options_aarch64-tizen.cmake b/infra/nnfw/cmake/options/options_aarch64-tizen.cmake index af921d63037..6f75a20de92 100644 --- a/infra/nnfw/cmake/options/options_aarch64-tizen.cmake +++ b/infra/nnfw/cmake/options/options_aarch64-tizen.cmake @@ -1,9 +1,7 @@ # # aarch64 tizen cmake options # -option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(BUILD_TENSORFLOW_LITE "Build TensorFlow Lite from the downloaded source" OFF) -option(DOWNLOAD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF) option(DOWNLOAD_GTEST "Download Google Test source and build Google Test" OFF) diff --git a/infra/nnfw/cmake/options/options_armv7hl-tizen.cmake b/infra/nnfw/cmake/options/options_armv7hl-tizen.cmake index ff7e35de1ed..6e80d7f96bd 100644 --- a/infra/nnfw/cmake/options/options_armv7hl-tizen.cmake +++ b/infra/nnfw/cmake/options/options_armv7hl-tizen.cmake @@ -1,9 +1,7 @@ # # armv7hl tizen cmake options # -option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(BUILD_TENSORFLOW_LITE "Build TensorFlow Lite from the downloaded source" OFF) -option(DOWNLOAD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF) option(DOWNLOAD_GTEST "Download Google Test source and build Google Test" OFF) diff --git a/infra/nnfw/cmake/options/options_armv7l-linux.cmake b/infra/nnfw/cmake/options/options_armv7l-linux.cmake index 59fbb8a3c43..02e1d6fa3c3 100644 --- a/infra/nnfw/cmake/options/options_armv7l-linux.cmake +++ b/infra/nnfw/cmake/options/options_armv7l-linux.cmake @@ -1,6 +1,9 @@ # # armv7l linux cmake options # +option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" ON) +option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" ON) + option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF) option(BUILD_OPENCL_TOOL "Build OpenCL tool" ON) diff --git a/infra/nnfw/cmake/options/options_armv7l-tizen.cmake b/infra/nnfw/cmake/options/options_armv7l-tizen.cmake index 651cd0e99cc..a4c2473182e 100644 --- a/infra/nnfw/cmake/options/options_armv7l-tizen.cmake +++ b/infra/nnfw/cmake/options/options_armv7l-tizen.cmake @@ -1,9 +1,7 @@ # # armv7l tizen cmake options # -option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(BUILD_TENSORFLOW_LITE "Build TensorFlow Lite from the downloaded source" OFF) -option(DOWNLOAD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(DOWNLOAD_NEON2SSE "Download NEON2SSE library source" OFF) option(DOWNLOAD_GTEST "Download Google Test source and build Google Test" OFF) diff --git a/infra/nnfw/cmake/options/options_i686-tizen.cmake b/infra/nnfw/cmake/options/options_i686-tizen.cmake index 9205145f509..5fa0f103ee4 100644 --- a/infra/nnfw/cmake/options/options_i686-tizen.cmake +++ b/infra/nnfw/cmake/options/options_i686-tizen.cmake @@ -1,9 +1,7 @@ # # i686 tizen cmake options # -option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(BUILD_TENSORFLOW_LITE "Build TensorFlow Lite from the downloaded source" OFF) -option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" OFF) option(DOWNLOAD_GTEST "Download Google Test source and build Google Test" OFF) option(GENERATE_RUNTIME_NNAPI_TESTS "Generate NNAPI operation gtest" OFF) diff --git a/infra/nnfw/cmake/options/options_riscv64-tizen.cmake b/infra/nnfw/cmake/options/options_riscv64-tizen.cmake index 5cefbfbf8c0..eea106f10c5 100644 --- a/infra/nnfw/cmake/options/options_riscv64-tizen.cmake +++ b/infra/nnfw/cmake/options/options_riscv64-tizen.cmake @@ -1,9 +1,7 @@ # # riscv64 tizen cmake options # -option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(BUILD_TENSORFLOW_LITE "Build TensorFlow Lite from the downloaded source" OFF) -option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" OFF) option(DOWNLOAD_GTEST "Download Google Test source and build Google Test" OFF) option(GENERATE_RUNTIME_NNAPI_TESTS "Generate NNAPI operation gtest" OFF) diff --git a/infra/nnfw/cmake/options/options_x86_64-darwin.cmake b/infra/nnfw/cmake/options/options_x86_64-darwin.cmake index 135cfbf6e98..0edb89554b9 100644 --- a/infra/nnfw/cmake/options/options_x86_64-darwin.cmake +++ b/infra/nnfw/cmake/options/options_x86_64-darwin.cmake @@ -1,6 +1,4 @@ # # x86_64 linux cmake options # -option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) -option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" OFF) option(BUILD_XNNPACK "Build XNNPACK" OFF) diff --git a/infra/nnfw/cmake/options/options_x86_64-linux.cmake b/infra/nnfw/cmake/options/options_x86_64-linux.cmake index fb53fbae611..528e417cffb 100644 --- a/infra/nnfw/cmake/options/options_x86_64-linux.cmake +++ b/infra/nnfw/cmake/options/options_x86_64-linux.cmake @@ -1,8 +1,6 @@ # # x86_64 linux cmake options # -option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(BUILD_XNNPACK "Build XNNPACK" OFF) -option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" OFF) option(DOWNLOAD_PYBIND11 "Download Pybind11 source" ON) option(BUILD_PYTHON_BINDING "Build python binding" ON) diff --git a/infra/nnfw/cmake/options/options_x86_64-tizen.cmake b/infra/nnfw/cmake/options/options_x86_64-tizen.cmake index e24af9bfd9e..887f21a0aff 100644 --- a/infra/nnfw/cmake/options/options_x86_64-tizen.cmake +++ b/infra/nnfw/cmake/options/options_x86_64-tizen.cmake @@ -1,9 +1,7 @@ # # x86_64 linux cmake options # -option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(BUILD_TENSORFLOW_LITE "Build TensorFlow Lite from the downloaded source" OFF) -option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" OFF) option(DOWNLOAD_GTEST "Download Google Test source and build Google Test" OFF) option(GENERATE_RUNTIME_NNAPI_TESTS "Generate NNAPI operation gtest" OFF)