From 4537089a5cd17e49f5bb8d5e7f8374e451872387 Mon Sep 17 00:00:00 2001 From: David Svantesson Date: Wed, 22 Feb 2023 11:08:57 +0000 Subject: Fixes for CMake and Bazel builds, tests failing in scons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix 4 failing tests for multi_isa builds when experimental_fixed_format_kernels=1 - Fixes for CMake and Bazel builds to pass validation tests - Update documentation, remove “-DCPPTHREADS=1” flag from CMake build example Partially resolves: ONCPUML-1181 Signed-off-by: David Svantesson Change-Id: I7101676260a0adcb7b6ff6f4342ae36f921e7120 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9189 Tested-by: Arm Jenkins Reviewed-by: Gunes Bayir Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins --- cmake/Options.cmake | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'cmake/Options.cmake') diff --git a/cmake/Options.cmake b/cmake/Options.cmake index 20cf0e42c8..170dad9f69 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -50,7 +50,6 @@ endif() # --------------------------------------------------------------------- # Backends -# TODO Add help string for each setting (Should user be able to ) option(ENABLE_NEON "Enable Arm® Neon™ support" ON) option(ARM_COMPUTE_CPU_ENABLED "" ON) option(ARM_COMPUTE_ENABLE_NEON "" ON) @@ -65,11 +64,12 @@ option(ENABLE_INTEGER_KERNELS "" ON) option(ENABLE_NHWC_KERNELS "" ON) option(ENABLE_NCHW_KERNELS "" ON) option(ARM_COMPUTE_GRAPH_ENABLED "" ON) -option(ARM_COMPUTE_ENABLE_BF16 "" ON) option(ARM_COMPUTE_ENABLE_SVEF32MM "" ON) option(ARM_COMPUTE_ENABLE_FIXED_FORMAT_KERNELS "" ON) +option(ENABLE_SVE "" ON) +option(ARM_COMPUTE_ENABLE_SVE "" ON) +option(ENABLE_BF16_VALIDATION "" OFF) -# TODO Check if this is required if(ENABLE_NEON) add_definitions(-DENABLE_NEON) endif() @@ -121,3 +121,10 @@ endif() if(ARM_COMPUTE_ENABLE_FIXED_FORMAT_KERNELS) add_definitions(-DARM_COMPUTE_ENABLE_FIXED_FORMAT_KERNELS) endif() +if(ENABLE_SVE) + add_definitions(-DENABLE_SVE) +endif() +if(ARM_COMPUTE_ENABLE_SVE) + add_definitions(-DARM_COMPUTE_ENABLE_SVE) +endif() +add_definitions(-D_GLIBCXX_USE_NANOSLEEP) \ No newline at end of file -- cgit v1.2.1