aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SConscript5
-rw-r--r--SConstruct4
2 files changed, 5 insertions, 4 deletions
diff --git a/SConscript b/SConscript
index 31e7a5b4f4..6ad4c78aff 100644
--- a/SConscript
+++ b/SConscript
@@ -86,9 +86,10 @@ def build_multiisa_lib_objects():
lib_static_objs = [] # static objects
lib_shared_objs = [] # shared objects
+ # note that ARM_COMPUTE_ENABLE_FP16 is enabled in update_data_type_layout_flags() to make
+ # sure the environment is progated to the validation suite
arm_compute_env.Append(CPPDEFINES = ['ENABLE_NEON', 'ARM_COMPUTE_ENABLE_NEON',
- 'ENABLE_SVE', 'ARM_COMPUTE_ENABLE_SVE',
- 'ARM_COMPUTE_ENABLE_FP16', 'ARM_COMPUTE_ENABLE_BF16',
+ 'ENABLE_SVE', 'ARM_COMPUTE_ENABLE_SVE','ARM_COMPUTE_ENABLE_BF16',
'ARM_COMPUTE_ENABLE_I8MM', 'ARM_COMPUTE_ENABLE_SVEF32MM'])
# Build all the common files for the base architecture
diff --git a/SConstruct b/SConstruct
index 746d4a6afe..cf8fb52bd6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -64,11 +64,11 @@ def update_data_type_layout_flags(env, data_types, data_layouts):
# Manage data-types
if env['multi_isa']:
if any(i in data_types for i in ['all', 'fp16']):
- env.Append(CXXFLAGS = ['-DENABLE_FP16_KERNELS'])
+ env.Append(CXXFLAGS = ['-DENABLE_FP16_KERNELS', '-DARM_COMPUTE_ENABLE_FP16'])
else:
if not 'v8a' in env['arch'] and not 'v7a' in env['arch'] and not 'armv8r64' in env['arch']:
if any(i in data_types for i in ['all', 'fp16']):
- env.Append(CXXFLAGS = ['-DENABLE_FP16_KERNELS'])
+ env.Append(CXXFLAGS = ['-DENABLE_FP16_KERNELS','-DARM_COMPUTE_ENABLE_FP16'])
if any(i in data_types for i in ['all', 'fp32']):
env.Append(CXXFLAGS = ['-DENABLE_FP32_KERNELS'])