From b5d6c28d41c4228c5bfaf06e451c21c387b3ce5f Mon Sep 17 00:00:00 2001 From: David Svantesson Date: Mon, 24 Apr 2023 16:47:04 +0000 Subject: Bazel and CMake updates Updates to CMake and Bazel builds addressing: * Cmake options are named too generic * Use CMAKE_CXX_FLAGS_DEBUG instead of DEBUG option * Option to disable tests * Bazel: rename "arm_compute" to "arm_compute_core" Resolves: ONCPUML-1252 Signed-off-by: David Svantesson Change-Id: If65b0cfcca77e2423777b0b901a5b733cfca6bfc Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9501 Tested-by: Arm Jenkins Reviewed-by: SiCong Li Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- cmake/Options.cmake | 27 ++++++++++++--------------- cmake/Version.cmake | 2 -- 2 files changed, 12 insertions(+), 17 deletions(-) (limited to 'cmake') diff --git a/cmake/Options.cmake b/cmake/Options.cmake index e2aa2bfbff..a4ef135bdf 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -26,30 +26,29 @@ include(CMakeDependentOption) option(BUILD_SHARED_LIBS "Build shared libraries" ON) -option(DEBUG "Enable ['-O0','-g','-gdwarf-2'] compilation flags" OFF) -option(WERROR "Enable the -Werror compilation flag" OFF) -option(EXCEPTIONS "Enable C++ exception support" ON) -option(LOGGING "Enable logging" OFF) - -option(GEMM_TUNER "Build gemm_tuner programs" OFF) # Not used atm -option(BUILD_EXAMPLES "Build example programs" OFF) - -option(BUILD_TESTING "Build tests" OFF) -option(CPPTHREADS "Enable C++11 threads backend" OFF) -option(OPENMP "Enable OpenMP backend" ON) +option(ARM_COMPUTE_WERROR "Enable the -Werror compilation flag" OFF) +option(ARM_COMPUTE_EXCEPTIONS "Enable C++ exception support" ON) +option(ARM_COMPUTE_LOGGING "Enable logging" OFF) +option(ARM_COMPUTE_BUILD_EXAMPLES "Build example programs" OFF) +option(ARM_COMPUTE_BUILD_TESTING "Build tests" OFF) +option(ARM_COMPUTE_CPPTHREADS "Enable C++11 threads backend" OFF) +option(ARM_COMPUTE_OPENMP "Enable OpenMP backend" ON) # -if(CPPTHREADS) +if(ARM_COMPUTE_CPPTHREADS) add_definitions(-DARM_COMPUTE_CPP_SCHEDULER) endif() # -if(LOGGING) +if(ARM_COMPUTE_LOGGING) add_definitions(-DARM_COMPUTE_LOGGING_ENABLED) endif() # --------------------------------------------------------------------- # Backends +option(ARM_COMPUTE_ENABLE_BF16_VALIDATION "" OFF) +option(ARM_COMPUTE_ENABLE_SVE_VALIDATION "" OFF) + option(ENABLE_NEON "Enable Arm® Neon™ support" ON) option(ARM_COMPUTE_CPU_ENABLED "" ON) option(ARM_COMPUTE_ENABLE_NEON "" ON) @@ -66,8 +65,6 @@ option(ENABLE_NCHW_KERNELS "" ON) option(ARM_COMPUTE_GRAPH_ENABLED "" ON) option(ARM_COMPUTE_ENABLE_SVEF32MM "" ON) option(ARM_COMPUTE_ENABLE_FIXED_FORMAT_KERNELS "" ON) -option(ENABLE_BF16_VALIDATION "" OFF) -option(ENABLE_SVE_VALIDATION "" OFF) if(ENABLE_NEON) add_definitions(-DENABLE_NEON) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index d01a588824..d10cd8e15d 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -36,5 +36,3 @@ if(NOT GIT_FOUND OR RESULT) endif() file(WRITE "arm_compute_version.embed" "\"${ACL_VERSION_SHA}\"") - -# TODO: List build options -- cgit v1.2.1